Some arvo cleanups.