Add back support for -y (libdir) and -l (libfile) to the
  'new' index in both SFCU and MFCU mode