Minor cleanup before PR.