Make class mutator more intelligent.