New-style mutators API work, needs refactor inside.
Refactor mutator and mapimpl flows.