Moved some comments around.