Schemes as choices rather than strings. Fixes #42