fixup for ‘Avoid creating GVs’