`@client` is at least consistent here, so I'll merge as is.