See map.h changes to see why this makes this cleaner.
Attach a file by drag & drop or click to upload
