diff --git a/common/include/x86emitter/implement/jmpcall.h b/common/include/x86emitter/implement/jmpcall.h
index 4a1492f725..be62887a43 100644
--- a/common/include/x86emitter/implement/jmpcall.h
+++ b/common/include/x86emitter/implement/jmpcall.h
@@ -43,11 +43,8 @@ struct xImpl_JmpCall
 {
 	bool	isJmp;
 
-	void operator()( const xRegister32& absreg ) const;
-	void operator()( const xIndirect32& src ) const;
-
-	void operator()( const xRegister16& absreg ) const;
-	void operator()( const xIndirect16& src ) const;
+	void operator()( const xRegisterInt& absreg ) const;
+	void operator()( const xIndirect32orLess& src ) const;
 
 	// Special form for calling functions.  This form automatically resolves the
 	// correct displacement based on the size of the instruction being generated.
diff --git a/common/src/x86emitter/jmp.cpp b/common/src/x86emitter/jmp.cpp
index c56f0b1abc..d4f5b93ba9 100644
--- a/common/src/x86emitter/jmp.cpp
+++ b/common/src/x86emitter/jmp.cpp
@@ -33,11 +33,8 @@
 
 namespace x86Emitter {
 
-void xImpl_JmpCall::operator()( const xRegister32& absreg ) const	{ xOpWrite( 0x00, 0xff, isJmp ? 4 : 2, absreg ); }
-void xImpl_JmpCall::operator()( const xIndirect32& src ) const			{ xOpWrite( 0x00, 0xff, isJmp ? 4 : 2, src ); }
-
-void xImpl_JmpCall::operator()( const xRegister16& absreg ) const	{ xOpWrite( 0x66, 0xff, isJmp ? 4 : 2, absreg ); }
-void xImpl_JmpCall::operator()( const xIndirect16& src ) const			{ xOpWrite( 0x66, 0xff, isJmp ? 4 : 2, src ); }
+void xImpl_JmpCall::operator()( const xRegisterInt& absreg ) const	{ xOpWrite( 0, 0xff, isJmp ? 4 : 2, absreg ); }
+void xImpl_JmpCall::operator()( const xIndirect32orLess& src ) const			{ xOpWrite( 0, 0xff, isJmp ? 4 : 2, src ); }
 
 const xImpl_JmpCall xJMP	= { true };
 const xImpl_JmpCall xCALL	= { false };