(fix) Fix for collections reform changes in typemap.