Cleanup resultset-seq / result-set-seq in preparation for extending the latter