Refactor trace bindings, update default-tracer