Changed passing of arguments to attaching type info to tokens