Bug 916793 - DSL Generator rewrite