Update JJ file
Regenerate Parser.java
Update tests
Refactor ReturnNode