Remove all final references to die!
auto merge of #4934 : nickdesaulniers/rust/issue4524cleanup, r=brson

review? @brson
Issue #4524