Refactor `prioritize_creator_over_default_site`

See #1152

Simplifies the conditionals, and adds a default for the second argument.