Content/: Nuke remaining preprocessor conditionals
Content/: More style fixes