Make code and docs more idiomatic.