Auxiliary stack is unaffected by environments; messed more with calc.
Version bump.
Merge branch 'master' into delete-out
Moved where auxiliary stack is re-pushed for environments.