Fix some outstanding todo's re: tokenlib api

I went ahead and made the noted API change in tokenlib, this updates tokenserver to use the clearer API.