Confirmed that refactoring did not break protoHostPort hand-off in Mutators.