On Resolving Non-determinism in Choreographies (Logical Methods in Computer Science, 2020)