Ah, good point.  But this code is going away in another PR which I'll submit as soon as this one lands.