expedite-cxx: Fix some bugs.