Adjust some more stuff for the CVS->git switch.