fixup! Make fix-products-paths more reusable.