More keyboard cleanup.