Tweak use of arrays