Integrate new Selector and Alternative classes from Pipestone.
Integrate new Selector and Alternative classes from Pipestone.

Assorted cleanup to push back against the complaints that come out of a code analysis run.

Savrola/Pipestone