Track upstream changes in toggle-trace's implementation