[cvs-nhc98] Refactor hat-observe: