[PATCH v2] Try and get overlapping cases fixed.

[Stefan Ring]

> except for the micro-opt suggested by Jeremy, no ACK/NACK for that
> version?

I'm not subscribed to the list and cannot reply properly therefore, but 
I'll try anyway.

I'm running 1.9.5 with this patch applied now, and as far as I can tell, 
everything works just fine. I'm the reporter of 
<https://bugzilla.redhat.com/show_bug.cgi?id=665320> where a change in 
the compiler flags (-Os to -O2) seems to have triggered this problem.

Stefan