More array benchmarking and reorganization.