Fix ugly stackoverflow in comment handling