Please try to hold off on doing refactoring until we've shipped at least one iteration of a feature. I thought you were refactoring here because the inapp JWT feature already landed. I see that this refactor bug was a P2 so that's our fault; it should have been a P3 probably.