Instantiations of generic interfaces and components using multiple type arguments are now rewritten properly.