Further fixes to generate_clang_complete