client: refine annotations