v0.0.x: minor refactoring to better tracing