Just tidying up the last commit a little.