Expose expected_as_array for upgrade consistency

Counterpart to #448