Bugfix for trace-merging after a cond-expression