Autotype Hotkey refactorings