Migrated old variables to new system.

Some still might remain in _cloud.