Tidy up layout diagnostics.