Fix incorrect chooser in 'pip' (introduced in 61fc422).
Merge branch 'fix-PipHelper' for the 'on'/'via' fix.