CP-7398: Addressed 2nd round of review comments.

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