A bit of cleanup of the array API.