Issue #2208849 by pcambra: Remove uses of MapArray.