We have done similar things in our code base, and I may explore that option
here. Doing it in too many places gets to be icky, though, so I'll have to
look at it before deciding on the course of action.