Updating to latest nml2/lems which uses ConditionalDerivedVariable for conditions in DerivedVariables etc.