Updates to make more idiomatic.