EachTokenFactory minor refactor