Tweaks to usage text and super calls from PR review