Fix array_t to follow the previous commit
Merge branch 'agg'