Simplified DoStmt (and friends) and ReturnStmt.
Added rule for opt-expr(expr) -> expr
Initial version.