added conversion to TokenType ... -sai