(MESS) Removed old-style token processing. (nw)