Be more explicit about defaults, and do not recreate the set all the time