Changed lexer to non-off-side parsing