fix findbugs issue

* refactor map tokens to be a concrete type, as we already had a bad
null check in there