Do not include redundant empty <> and ::<> in type expansions

Don't include these unless they were specified in the input.

This is not a breaking change since both syntaxes are valid (and the without-<> version is valid in more places).