Fix some bogus cell accesses in Map.