Use more idiomatic die constructions.

They are shorter and easier to read.
Merge pull request #17 from annulen/die_usage

Use more idiomatic die constructions.