[cvs-nhc98] patch applied (yhc): Add lots more invariant stuff, including case default removal