Tidy up Keymaps and KeymapValidator.