Remove global variable leakage.

Title says it all.