Issue #2376581 by yched: Cleanup CommentManager::addDefaultField().