Replace maps by arrays where possible for a gain in ACC

These maps provide no additional benefit while costing us performance.