Made collection suffix identification more resilient.