Move EnumSet into libextra

Fix #8004