In the meantime, is there a simple way to disable this "more correct" mechanism so I can get my timings?
You'll get testsuite failures if you disable it because it fixes a bunch of bugs. You can always disable all of PTA, but i would not recommend it. With the attached patch, it should take less than 60 seconds per PTA run for all.i (i have no copy of cplusplus_grammar.i, and it's not clear where to get it).
includes.diff
Description: Binary data
