Minor cleanup. No functional changes intended.