#770: Correctly store independent variables

Resolves #770.