CA-140516: address review comments

Signed-off-by: Thanos Makatos <thanos.makatos@citrix.com>