Move some comments around.