Added some defensive code for generation of map related operators