[cvs-nhc98] patch applied (yhc): Move changes to the invariant library