Fixed some formatters following Apple's recommendations.

As reviewed in my last PR.