Tidy up use of main width a bit.