Actually, looking at the set of places that this is actually used, I like your suggestion better.