publish: expand_target_urls polish and clean-up

based on suggestions from Ryan