Wrap unwrapped globals when expanded