ClientAgent: Use client-state macros consistent with the names in the documentation.