I was too hasty in some of my changes in 3e5a42de.