eric, I don't know if you noticed it, but your diff doesn't solve
the problem.