Minimal change to VariableOrIndividual.