Array cleanup

Some array support related cleanup.