STY: Minor cleanup.