Rework EffectiveStatementBase statement order restoration