Reduced duplication in new comment code