Changes to support parallel multi-file analysis.