Change 2 ECASEs to array lookups