Update AstCreationVisitor for new grammar

Plus a little housekeeping