svm: more fifo refactor/cleanup