Pulled in enhancements from CommentCoreLibrary