Using the new 'auto' keyword to cleanup in Map.