Merge pull request #6910 from lioncash/analyst PPCAnalyst: Clean up indexing expressions in Analyze()