Avoid unnecessary calls to Map::populate()