Shortcircuit

This will shortcircuit computations for ensembles, which means that the check

`trajectoy in A or trajectory in B` will now first compute `trajectory in A` and if this is true, skip the
second computation since the result is independent of the outcome of `trajectory in B`

This seems to speed up computations by more than 30% in my tests.