Removed dependence on 'Map'.