Cleanup and simplify null_terminated_array_t and its clients