Better handling of multiline vs single line comments