Improved commenting and robustness of ContentClient.