Follow up to #79421. Cleaned up some globals and some typos. Going to follow up with...