Proper SPI abstraction removed the need for these workarounds