Additional edits for refs #23340; thanks Loic.