Adding further enable/disable toggles to debug-trace