Construct params of setting to None except joins and the new dataclasses that must be an empty collection need consolidating. It's kind of a mess not knowing when it should be empty or None.