Refactoring for swift systemd on Fedora 17/18.