Previously we tried to work around some possible badness from the engine
side, but now we are more assertive about the engine needing to do the
right thing.