Fix bug 659: Don't use static member variables

No match.