on-demand tracing: Delay sync object creation to state snapshot
* Also clean up include paths