Clean up wrap driver

for easier use in Clang.wrap_cpp testing.