More arvo cleanups.