Changes to DSL grammar after today's discussion with Cyrus.