Remove permissibly ambiguous generics

This goes through a 3 stage bootstrap with no warnings from the run-time.