layout: Make some formatting cleanups.

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