Be more consistent about comments.