More consistent use of `gherkin_statement`