Move expansion to after completion to avert some weird escape issues.