SI-7088 Array crasher in erasure.

The usual business where half our pattern matches are missing
half the necessary cases.
Merge pull request #2592 from paulp/issue/7088

SI-7088 Array crasher in erasure.