Reformulated as per your suggestion, and retested.

OK to commit?

--Douglas Rupp