diff --git a/components/codetools/codebeautifier.pas b/components/codetools/codebeautifier.pas
index 3a9eec7313..ba6ce253cf 100644
--- a/components/codetools/codebeautifier.pas
+++ b/components/codetools/codebeautifier.pas
@@ -1582,6 +1582,9 @@ begin
     if (StackIndex<Stack.Top) then begin
       // block(s) closed by next token
       // use indent of block start
+      {$IFDEF VerboseIndenter}
+      //DebugLn(['TFullyAutomaticBeautifier.GetIndent next token close block: ',FABBlockTypeNames[Stack.TOperation]]);
+      {$ENDIF}
       Indent.Indent:=GetLineIndentWithTabs(Source,Block.StartPos,DefaultTabWidth);
       Indent.IndentValid:=true;
       exit(true);
diff --git a/components/codetools/identcompletiontool.pas b/components/codetools/identcompletiontool.pas
index 56e6cc02bd..123d8e43ca 100644
--- a/components/codetools/identcompletiontool.pas
+++ b/components/codetools/identcompletiontool.pas
@@ -1579,6 +1579,7 @@ begin
   GatherContext:=CreateFindContext(Self,CursorNode);
 
   IgnoreCurContext:=false;
+  //DebugLn(['TIdentCompletionTool.FindCollectionContext IdentStartPos=',dbgstr(copy(Src,IdentStartPos,20))]);
   ContextExprStartPos:=GetContextExprStartPos(IdentStartPos,CursorNode);
   if GatherContext.Node.Desc=ctnWithVariable then begin
     if GatherContext.Node.PriorBrother<>nil then
diff --git a/components/codetools/sourcelog.pas b/components/codetools/sourcelog.pas
index 7175aff140..6c555f0613 100644
--- a/components/codetools/sourcelog.pas
+++ b/components/codetools/sourcelog.pas
@@ -321,12 +321,9 @@ end;
 function TSourceLog.GetLineLength(Index: integer): integer;
 begin
   BuildLineRanges;
-  if (Index>=0) and (Index<fLineCount) then begin
-    if Index<fLineCount-1 then
-      Result:=fLineRanges[Index+1].EndPos-fLineRanges[Index+1].StartPos
-    else
-      Result:=fSrcLen-fLineRanges[Index].StartPos;
-  end else
+  if (Index>=0) and (Index<fLineCount) then
+    Result:=fLineRanges[Index].EndPos-fLineRanges[Index].StartPos
+  else
     Result:=0;
 end;