Fix raw references to java.lang.Class