Thanks to everyone who reported and fixed this bug. I looked over the fix and 
this inspired me to improve on it. I installed the attached patch, which doesn't 
fix any functionality bugs, but does improve performance significantly in some 
cases.