de-staticize references in Context.java