[cvs-nhc98] Add type signatures.