QSV: refactor initialization somewhat