Refactor away mutator entry point