Seems like that problem is going to start sneaking up on us, now that other aspects of the design and impl seem to be settling down