Add explicit return to grammar and AST.