Fix CVS-isms.