Minor reordering of conditional.
Concatenate arrays when expanding.