[ refactor ] Unified counting of variables when unquoting clauses
[ quote ] Use ignoreSharing when picking names
Merge branch 'maint-2.4.2'