Address more review comments by @pradyunsg.
Address more review comments by @pradyunsg.

sbidoul/pip,pfmoore/pip,rouge8/pip,sbidoul/pip,xavfernandez/pip,xavfernandez/pip,techtonik/pip,techtonik/pip,pradyunsg/pip,pradyunsg/pip,pypa/pip,rouge8/pip,xavfernandez/pip,techtonik/pip,pypa/pip,pfmoore/pip,rouge8/pip