Fixup simplification changes.