Remove some poor idioms for 1.0