A couple minor changes in response to code review.  Most significantly, changes exception type thrown on invalid use of `Which`.
Merge pull request #99 from vossad01/FixNondeterminismInWhich

A couple minor changes in response to code review.