Minor cleanup for previous changes.