The last of Theron's (minor) 2007 changes to the XS code