Keyboard tweaks

A few more tweaks after the Keyboard refactor, to clean up a couple of things and make the default bound functions more atomic and reusable.