Use lexer commands instead of actions where available