[cvs-nhc98] patch applied (yhc): More a little bit of code arrond, and add a catch all clause from checkInvariant