I would be interested in learning what your treated token(s) look like a year from now or more! Sometimes immediate fixes turn out to create long range problems.