Minor refactoring of CInputHandler