fix(systemd): fix logic bug: break vs. return

Break only exits from the innermost for/select/switch.
Includes a couple minor style tweaks nearby also.