OK, how about the attached more-ambitious patch instead? I hope it helps 
clarify this confusing area.