Simplify standalone code.

- Only split once
- Don't join what is already there
- Clarify logic
Merge remote-tracking branch 'standalones'

from dmorrison42/standalones

Much simpler logic and removes some code that I didn't understand