Token column definition cleanups, no effect