diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm
index 234625a40f..0c8a199d5d 100644
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm
@@ -23,8 +23,8 @@ Joystick::Joystick(IOHIDDeviceRef device, std::string name, int index)
 {
 	// Buttons
 	NSDictionary *buttonDict = @{
-		@kIOHIDElementTypeKey      : [NSNumber numberWithInteger: kIOHIDElementTypeInput_Button],
-		@kIOHIDElementUsagePageKey : [NSNumber numberWithInteger: kHIDPage_Button]
+		@kIOHIDElementTypeKey      : @(kIOHIDElementTypeInput_Button),
+		@kIOHIDElementUsagePageKey : @(kHIDPage_Button)
 	};
 
 	CFArrayRef buttons = IOHIDDeviceCopyMatchingElements(m_device,
@@ -45,7 +45,7 @@ Joystick::Joystick(IOHIDDeviceRef device, std::string name, int index)
 
 	// Axes
 	NSDictionary *axisDict = @{
-		@kIOHIDElementTypeKey : [NSNumber numberWithInteger: kIOHIDElementTypeInput_Misc]
+		@kIOHIDElementTypeKey : @(kIOHIDElementTypeInput_Misc)
 	};
 
 	CFArrayRef axes = IOHIDDeviceCopyMatchingElements(m_device,
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm
index 9c5707bc5d..759e25b295 100644
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm
@@ -23,9 +23,9 @@ Keyboard::Keyboard(IOHIDDeviceRef device, std::string name, int index, void *win
 	// This class should only recieve Keyboard or Keypad devices
 	// Now, filter on just the buttons we can handle sanely
 	NSDictionary *matchingElements = @{
-		@kIOHIDElementTypeKey : [NSNumber numberWithInteger: kIOHIDElementTypeInput_Button],
-		@kIOHIDElementMinKey  : [NSNumber numberWithInteger: 0],
-		@kIOHIDElementMaxKey  : [NSNumber numberWithInteger: 1]
+		@kIOHIDElementTypeKey : @(kIOHIDElementTypeInput_Button),
+		@kIOHIDElementMinKey  : @0,
+		@kIOHIDElementMaxKey  : @1
 	};
 
 	CFArrayRef elements = IOHIDDeviceCopyMatchingElements(m_device,