python: fix some pipe_format_simplify merge damage