Fix regression caused by #6875

[TomAFrench]

#6875 caused a small regression in some of our circuits where we started to multiply a predicate into a value multiple times unnecessarily.

We should nail down how this regression is coming in (notably the optimization we added prevents the automatic value merging of if-else instructions for numeric values if the new optimization fires) and address it.