Fallout from full order testing on ArrayStructure.
Address all comments so far.