Also revise a related function to minimise file handle/pipe leakage
and improve reliability.

Backported from -HEAD.