Confluence check: also check confluence for uncontrollable event pairs

We currently only check controllable event pairs, but we should also check uncontrollable event pairs. For both types of events, we decide on a specific order, and it is good to know that the order doesn't matter, and we are thus allowed to make this choice.

Addresses #892