CLN: Minor cleanup.