Fix some consistency issues in handling libpng, etc. deps

Just here for the CI.