ClientAgent: Perform just enough refactoring to make test_interest pass.