Bring array formula support up-to-date with refactoring.