Bringing my development in line with CVS now that the repository is set up.