I'm not a huge fan of this change, as I've made it known. However, this is semi-recommended by the style guide we've chosen to use and is a more common syntax. Fixes #692.
Thanks to @malikoth and @saoula for their input.