Update for new quad code. (Anonymous unions are not compatible.)