World|Map: Maps are associated with their corresponding MapDef

Also addressed a couple more cases where map URIs were being used
without a "Maps" resource scheme.