Pre static-vs-instance class variable fixup.
e