Make some stuff a bit more idiomatic.