Improve token handling.