Block Comment Improvements/Fixes

This is a remake of PR #3060 which greatly simplifies the search for Block Comments and fixes the issues of having line comments delimiters be a prefix of block comment delimiters and the issue when the block comment delimiters use the same string.