Yet more cleanup
QSV: improve error path
Another test