Minor layout cleanups.