Minor cleanup (2).