Bug 4896: Use HashMap instead of ImmutableMap.Builder in ChoiceModification