Simplified definition of death message regexes.
Adjusted code style a bit.