Start working to eliminate VFM dependence on static variables.