Minor refactoring in CInputHandler