Move to the same form as go does it, this would be to avoid infinite loops.
Adding more token readers