Bug 1081948 - Don't use null as an EnumMap key. r=margaret