diff --git a/components/codetools/finddeclarationtool.pas b/components/codetools/finddeclarationtool.pas
index 0b2e67fb73..34be65ca3c 100644
--- a/components/codetools/finddeclarationtool.pas
+++ b/components/codetools/finddeclarationtool.pas
@@ -9577,6 +9577,7 @@ var
           then begin
             // 'alloc' returns the class itself
             ExprType.Context:=Context;
+            //debugln(['ResolveIdentifier ',ExprTypeToString(ExprType)]);
             Params.Load(OldInput,true);
             exit;
           end;
@@ -9657,6 +9658,12 @@ var
     ResolveBaseTypeOfIdentifier;
     {$IFDEF ShowExprEval}
     debugln(['  FindExpressionTypeOfTerm ResolveChildren ExprType=',ExprTypeToString(ExprType)]);
+    //debugln(['ResolveChildren xtContext=',(ExprType.Desc=xtContext),
+    //  ' ctnPointerType=',(ExprType.Context.Node.Desc=ctnPointerType),
+    //  ' Node=',(ExprType.Context.Node<>StartNode),
+    //  ' cmsAutoderef=',(cmsAutoderef in Scanner.CompilerModeSwitches),
+    //  ' ',CompilerModeNames[Scanner.CompilerMode]
+    //  ]);
     {$ENDIF}
     NewNode:=ExprType.Context.Node;
     if (NewNode=nil) then exit;
@@ -9728,6 +9735,7 @@ var
       // ok, allowed
     end else begin
       // not allowed
+      //debugln(['ResolvePoint ',ExprTypeToString(ExprType)]);
       MoveCursorToCleanPos(CurAtom.StartPos);
       ReadNextAtom;
       RaiseIllegalQualifierFound;
diff --git a/components/codetools/linkscanner.pas b/components/codetools/linkscanner.pas
index ec1fbb9e43..1b39e50abe 100644
--- a/components/codetools/linkscanner.pas
+++ b/components/codetools/linkscanner.pas
@@ -237,8 +237,8 @@ const
      cmsRepeat_forward,cmsCvar_support,cmsInitfinal,cmsOut,cmsDefault_para,
      cmsHintdirective,cmsProperty,cmsDefault_inline,cmsExcept],
     // cmMacPas
-    [cmsCvar_support,cmsMac_procvar,cmsNestedProcVars,cmsNonLocalGoto,
-     cmsISOLike_unary_minus,cmsDefault_inline],
+    [cmsCvar_support,cmsMac_procvar,cmsNestedProcVars,
+     cmsNonLocalGoto,cmsISOLike_unary_minus,cmsDefault_inline],
     // cmISO
     [cmsTp_procvar,cmsDuplicate_names,cmsNestedProcVars,cmsNonLocalGoto,
      cmsISOLike_unary_minus],