Tidy up whitespace to match that committed in the ports.