Remove all final references to die!

review? @brson
Issue #4524