Adt-ify new-style tokens