Fix bad handling of block comments in order not to assume comment terminator as a part of comment content