Fixed collateral damage from simplifying arrays