x: Minor cleanup.