[cvs-nhc98] patch applied (yhc): The removing of defaults as invariants was forgetting to delete the default after adding new ones