If you change this line to what I have and fix it for the deleteToken call too, I'll go ahead on merge.  Sorry for the back and forth.