Clean up attribute array construction.