A couple of arrays in the XI code have effectively constant content, these patches fold away the arrays.