Reworked the change a bit.

- I feel uncomfortable with a string field used as an enum.
- I feel uncomfortable with parameters that have some restrictions about
  the way they can be combined.

My change is bit more verbose but it uses less Jelly and I think it's
more in line with the architecture.