r12185: Cosmetic cleanup