spi: consolidate extractFields logic