Merge pull request #9718 from Pokechu22/better-fifo-analyzer-part-3 Fifo analyzer improvements, part 3
