Remove the static member variables, converting two of them to private member variables.