Clean up in-line f-string concatenation (#23591)