Tidy up manual changes.