Cleanup.
Final changes to new keytopper implementation.