Remove useless duplicate comparisons.
Remove unused values in builtin_set.
Merge remote-tracking branch 'upstream/master'