I think that the introduction of given-when-then clauses fixes the problem. Let me know.