New single variable to replace the two. Stop using the old ones.
Merge branch 'lessvars' into development