Expansion and unexpansion complete, though not yet correct.