Add Dana's changes to ast.scala