generic types unified in gw code. Further code size reduction