Citra GLFW: Clean up some functions.
SQUASH Citra-qt: Fix another make_pair