More Array consolidation

Consolidates memory management in Array.

Fixes a couple more bugs too.