Move a couple of static variables into an inner block where they're actually used. (dm)