Move the fix to the Expression constructor.

Now also with extra testy goodness.