Update to allow for older versions of GCC and Xen.