Static properties dropped on non-static TokenStore classes

TokenStore classes were currently not programmed in accordance with the StyleGuide (mixed static and non-static members).

This release changes that and is potentially backwards breaking.