diff --git a/Source/Core/InputCommon/ControllerInterface/Device.cpp b/Source/Core/InputCommon/ControllerInterface/Device.cpp
index e47b04de99..ddd7af075a 100644
--- a/Source/Core/InputCommon/ControllerInterface/Device.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Device.cpp
@@ -4,6 +4,7 @@
 
 #include <sstream>
 #include <string>
+#include <tuple>
 
 // For InputGateOn()
 // This is a really bad layering violation, but it's the cleanest
@@ -136,12 +137,7 @@ bool DeviceQualifier::operator==(const Device* const dev) const
 
 bool DeviceQualifier::operator==(const DeviceQualifier& devq) const
 {
-  if (cid == devq.cid)
-    if (name == devq.name)
-      if (source == devq.source)
-        return true;
-
-  return false;
+  return std::tie(cid, name, source) == std::tie(devq.cid, devq.name, devq.source);
 }
 
 std::shared_ptr<Device> DeviceContainer::FindDevice(const DeviceQualifier& devq) const