Improve obituary messages for NPCs again