Fix more nits.