Tidy intelligent host selection

[MetRonnie]

WIP

Check List

• [x] I have read CONTRIBUTING.md and added my name as a Code Contributor.
• [ ] Contains logically grouped changes (else tidy your branch by rebase).
• [x] Does not contain off-topic changes (use other PRs for other changes).
• [x] No dependency changes
• [ ] Tests
• [x] Changelog entry not needed (invisible to users)
• [x] Docs n/a
• [x] If this is a bug fix, PR should be raised against the relevant ?.?.x branch.