Further GV/CL cleanups.