Improved the way we handle L2TP daemons.