[cvs-nhc98] patch applied (yhc): Minor changes to mutator