[rules-dev] DSL expansion: ready for commit