Avoid patches to the xenocara tree, which we are not using.
Style...