Make static references to static variables to avoid local sets