Tidy up some CVS workarounds.