Migrate more defuns.