Fix and simplify error messages for Map:new...