Add Attachment:DRY-141: Subsitute actual type arguments in return type of method invocations.