Ah, I see now. Yes, that is indeed a false assumption.
However, the size and complexity of the patch stems from the fact that it tries to deal with several possible scenarios at once:
- template members
- variadic template members
- templates overloading non-template members

Perhaps it's indeed feasible to break this up in a series of patches which would help to reason about each one, as you've suggested in your pull request. I don't mind closing this one in favour of yours and later submitting incremental fixes. What do you think?