Various tweaks to try to resolve crashes in libclang