Cleanup after removing the override array.

Minor cleanup.