User token types should *not* be nested

user_token_info currently has:

function user_token_info() {
  $types['user'] = array(
    'name' => t('Users'),
    'description' => t('Tokens related to individual user accounts.'),
    'needs-data' => 'user',
  );
  $types['current-user'] = array(
    'name' => t('Current user'),
    'description' => t('Tokens related to the currently logged in user.'),
    'type' => 'user',
  );

  ...

  return array(
    'types' => array('user' => $types),
    'tokens' => array('user' => $user),
  );
}

Resulting in the 'types' of token_info() with:

Array
(
    [comment] => Array
        (
            [name] => Comments
            [description] => Tokens for comments posted on the site.
            [needs-data] => comment
        )
    [node] => Array
        (
            [name] => Nodes
            [description] => Tokens related to individual content items, or "nodes".
            [needs-data] => node
        )
    [site] => Array
        (
            [name] => Site information
            [description] => Tokens for site-wide settings and other global information.
        )
    [date] => Array
        (
            [name] => Dates
            [description] => Tokens related to times and dates.
        )
    [file] => Array
        (
            [name] => Files
            [description] => Tokens related to uploaded files.
            [needs-data] => file
        )
    [term] => Array
        (
            [name] => Taxonomy terms
            [description] => Tokens related to taxonomy terms.
            [needs-data] => term
        )
    [vocabulary] => Array
        (
            [name] => Vocabularies
            [description] => Tokens related to taxonomy vocabularies.
            [needs-data] => vocabulary
        )
    [user] => Array
        (
            [user] => Array
                (
                    [name] => Users
                    [description] => Tokens related to individual user accounts.
                    [needs-data] => user
                )
            [current-user] => Array
                (
                    [name] => Current user
                    [description] => Tokens related to the currently logged in user.
                    [type] => user
                )
        )
)

Which is just odd, and doesn't follow the documentation for hook_token_info, which mentions nothing about nesting:

An associative array of available tokens and token types, each containing the raw name of the token or type, its user-friendly name, and a verbose description.

So any time a module (like token in D7) wants to print out a listing of token types, we have to account for this weird nesting. This should just be flattened out.