Move a few comments around...