Remove some more code out into a separate CL.