Let me see if I can hunt these down more methodically.
i should have kept a helper function in, but was worried we'd never find the callsites.
This instance isn't updated yet, is it? We got that error still....
No, not updated yet.