How about this much simpler patch? It's mostly functionally equivalent. I intentionally did not combine the if-statements together, in order to make it easier to understand. Also I separated out the removal of the bogus comment and pushed that, since it was unrelated. Rich.