Jason R. Coombs <jaraco@jaraco.com> added the comment:

I hadn't realized that the other global variables were defined at the module level or I would have implemented this originally. Please let me know if this patch doesn't correct the issue.