Less brokenness
Do not rely on ordering when not needed