Some more work in pretty_pv

No functional change.