Primitive mutator.
Type mutator; some renaming and a bit of refactoring.