Reimplemented support for comments since replacing RemoveWhitespace()