Fix a g_id -> uid renaming that escaped D72.