dd7d5dfdb3
One of the uses can be avoided, the other remains. Special overrides are now generated for MutableMap.remove and getOrDefault when there is an intermediate Java class, same as in old backend.