Further CVS conversion adventures