[cvs-nhc98] patch applied (hat): Restructured interfaces to a better style.