do CVS surgery and related build fixery to move elements and indexers in a new gstrea...