KeyedContainer can be further simplified at the price of breaking backward compatibility.
Fixes GAUDI-1138.