DSL Refactoring (part 1.9)