expedite-cxx: Just tag a comment so we can keep track of warts.
expedite-cxx: Port last missing test.

This one passed for some reason, it was still in C.
expedite-cxx: Fix deadlock.