Add comment machinery.