Coding style cleanups...
Allow some extra width as things shift around in their layouts...