Unnecessary type parameters are completely gone by b229d12 and e6b2af1.