impl_standard_builder followup

I had thought I had updated my branch for !499 (merged) with these changes, as I wrote in !499 (comment 2802467), but I think my force push must have failed.

Apologies for the inconvenience.

requested review from @eta

assigned to @Diziet

approved this merge request

enabled an automatic merge when the pipeline for c1c6f2b3 succeeds

lgtm! pipeline failure looked spurious, so I just hit retry

Thanks :-).

merged

mentioned in commit 2255778a