More robust comment stripping