Tidy up map browse code and qualify various global names to avoid