Tidy up some recent commits: