Unreviewed nit fixes after r196466.