[TASK] Rework completion expecting matching

[kurtlawrence]

Goal

If #169 gets merged, rework the completions code to match on whether the expecting contains a flag, rather than value matching with the flags themselves.