[cvs-nhc98] Minor wibbles.