Nit fixes after PR #6123