Merged.
Moved call-tracking printfs into Bipath.