Switch to using the force variant of omni_patterns.

In accordance to your comment in #466 and my notes in #484. It fixes both, as well.