Made comment parsing more resilient