Wups, my first try wasn't quite right either.  Too focused on fixing
the existing bug, not enough on not introducing new ones.