Continued progress in fixing spi_as.S