Merge "Removing some compiler-warning suppressions from EnumMap"