Updated to adhere to the simplified lexer.