changed representation of some tokens to be just interned strings rather than idents
cleanup of unused cxs, other stuff too...
cleanup, cleanup