Update for flattened vars.