Consolidate code for setting call-scoped match options in the match and

sub methods.
.gitlab-ci.yml not found in this commit