Don't double-scope variables

This also improves the selection behavior of variables in basic assignments and the scope of variable assignments.
Improve string scopes to match conventions