Refine instrumentation.
Also change NopInstrumentation.
Merge pull request #10 from u-c-l/repair-instrumentation

Refine instrumentation of the repair.