Merge pull request #171 from bjackman/instrument-fix-reset

instrument: Clear up Instrument.reset semantics