Array consolidation

Consolidated the array definitions to make it easier to tell how many
members are declared, add auto-determination of data size for associated
arrays.