Canonicalize affine expression trees in simplifier.
Canonicalize affine expression trees in simplifier.

I don't know where the current non-determinism comes from, but this should
fix it.

The particular order is not important, but it being canonical is. These
expressions are used for codegen in the new emitters, so the simplification
must be deterministic.
