Fix a bug in sourcing the saved session file.

Minor variable scope cleanup.