Improve some scoping.
Improve some scoping.

sagemathinc/smc,DrXyzzy/smc,tscholl2/smc,tscholl2/smc,tscholl2/smc,tscholl2/smc,DrXyzzy/smc,sagemathinc/smc,sagemathinc/smc,DrXyzzy/smc,sagemathinc/smc,tscholl2/smc,DrXyzzy/smc