Fix up call_state_mutator and affected code