Updated to work with latest CVS.