I agree but I went with the safer approach of making it optional (in case som...

I agree but I went with the safer approach of making it optional (in case someone is directly calling it from outside token). I'm glad you think that this should be required instead and here's an updated patch. I am skipping the interdiff as it is a different approach.