Further fix for ROOT-6583 concerning the pythia6_nolink option