Improved handling of DSL blocks.