Draft of DSL change to fix IDEA scopes.