Use more idiomatic die constructions.

They are shorter and easier to read.