Refactor #5776 : use insert instead of operator[] in map conversion for performance