Make order of member variable updates consistent unless the order matter...

...s

This makes it easier to
- factor out common code
- see and ensure consistency between variables