Misc cleanup of the Io stuff.

I'd like another person to also confirm Keyboard/Mouse/Pad stuff still works as intended before merging this, so it isn't just a "seems ok" from me.