A bit more faff, to deal with genuinely dying nodes.