Update for 1.7.9
Clean up SimpleDeathMessageBuilder