Well, the main purpose for this PR is to have a quick solution for false positive that breaks GCC, which we have more than 2 reports daily in the past week. So I'm more inclined to fall back to the first solution which is simple and meet our immediate goal, and extend in future.

How do you think?