Merge pull request #98 from vossad01/FixNondeterminismInWhich

Remove non-determinism in `Which`
A couple minor changes in response to code review.  Most significantly, changes exception type thrown on invalid use of `Which`.