Are changes to Ast.scala required? Please cleanup if not required.