- also fixed bug when using tokens with no type (must be treated implicitly as String)