Push a little more into api.
A modest duplication reduction in type parameter info.

And all it cost me was the whole evening as I flailed around
trying to whittle SI-8223 down. Attempting to use scala as
anything other than java with slightly nicer syntax is the mark
of a madman.