Avoid yak-shaving around libxml versions and deface compatibility