Client: Refactoring - All "this" state args are now the first.
Minor