Minor tweaks to discoveree, pir_publisher