layout: Make some formatting cleanups.

These should have no effect on functionality.
auto merge of #3837 : pcwalton/servo/layout-formatting-cleanups, r=metajack

These should have no effect on functionality.

r? @metajack