Make program slightly more idiomatic.