Got rid of more errors (finding field definitions during instrumentation)