Yeah, that is a problem in general. I fixed it in one or two places, but maybe not all (any that are not covered by tests would not have been uncovered). The line on this comment looks ok, but I'm not looking at the whole file right now.