Simplify use of instrumentation

closes #53