Refactoring tracing in progress (CSG support mainly)