Further token parsing magic