Imporove stripping of invalid comments added in r4483