user/shairport.service: don't depend on Avahi as it runs in a system instance.
user/baloo@.service: use balooctl in ExecStop=.
xsession/Xsession: move in what was in .xinitrc.