Fix the G26 out of scope identifiers in the v2.0.0 branch (#8543)

These changes may need to be warmed over.  I tried to fix things with
the least amount of disruption.   I just wanted to get the bugfix_v2.0.0
branch working for people again.