This PR predates #437 by a month. Since #437 isn't merged yet, let's defer this kind of change. It's no fun chasing moving targets.