Many changes to support for multiple orig tarballs.