Comments and make NewClient feel less circular.