I seem to be playing whack-a-mole; this has regressed since !328 (merged). Let's stop up the mole holes.