The option is useful for simplifying parsing.

Also use the new option in fate, in order to fix the regression
introduced by the previous commit.