When in doubt, tidy up.