Greatly simplify AST::Builder code