Lump spy and tracer back together (these are really one).
Fix nasty bug breaking exception handling in instrumented code.