More instrumentation of client AND server.