Some improvements to DSL syntax to make grammar clearer