Give Pip license extraction more confidence

Just refactoring some tentative code.