Clarify mutator code.. a bit. Still *very* limited macro support.