Add more idiomatic comparisons.