Tidy up a bit after shaun's merge...