s3-registry: use some prs macros to the only place where they are used.