#114901 exposed that foldExtractedCmps didn't account for non-commutative binops, and were disabled by 05e838f428555bcc4507bd37912da60ea9110ef6 This patch re-enables support for non-commutative binops by ensuring that the LHS/RHS arg order of the binop is retained.