Move input management back into lexer