Shorten names.
Drop intermediate types.