(core) Simplify the Client API a little.