Fix further concerns about psql wrapping in expanded mode having
collateral damage on other formats, by Sergey Muraviov.