Bug 833935 - Stop using one static var per compilation unit. r=jdm