Tidy up a few style issues.