Minor cleanup (no functionality changes).