Fix case where initial comment token would slip through.