Agreed.  Mind if I do this in a separate commit?  It's going to involve some serious changes to tests.