Cleanup instrumentation code

In theory, the instrumentation code should be easy. In practice, its a hell of a mess to position starts and stops in the right place. It could be helpful to add generator functions instrumentation_{start,stop}(timer, *deps) to at least make the code a bit easier.