DSL: Fix formatting in multiline tags
DSL: Some more formatting fixes