Proactively incorporate late parsing refactors from github.com/llvm/llvm-project/pull/166491 to minimize auto-merger conflicts during future upstream syncs.