reformat
TokenMapper refactoring: handle prims separate from other token types