Fixup all lingering instances of old style expansion