Minor cleanup: &cpo guards and formatting.