Little bit of systemd unit files polishing

Took a look at provided unit files and thought that those could be improved, so sending improvements back. Split into three patches as each of the changes can be a little bit controversial, so making it easy to cherry-pick whatever sounds good.