Small code cleanup (2).