Address various nits from PR 18