Cleaning cruft and adding wrapper directives.
Simplifying settings markup.