Merge "Fix support finding global variables."