Stronger enforcement of singleton tracer
1.1.0