And drop it where not necessary.
(as side-effect this also tests the new systemd-notify --exec switch)