Capture Ter's change to expression ordering for cast