Merge "Avoid use of FQName globals."