Take the fix Steve made, whether it is in trunk now or not. I think trunk now has the right expressions.