Fixing some return values on ImmutableMap

This bug is a remnant of the last large refactor.