diff --git a/source/components/namespace/nsxfobj.c b/source/components/namespace/nsxfobj.c
index 077df429d..976da2396 100644
--- a/source/components/namespace/nsxfobj.c
+++ b/source/components/namespace/nsxfobj.c
@@ -549,12 +549,12 @@ AcpiGetParent (
 {
     NAME_TABLE_ENTRY        *Object;
     
-    FUNCTION_TRACE ("AcpiGetParent");
+
+    /* No trace macro, too verbose */
 
 
     if (!RetHandle)
     {
-    	FUNCTION_EXIT;
         return AE_BAD_PARAMETER;
     }
 
@@ -562,7 +562,6 @@ AcpiGetParent (
 
     if (Handle == ACPI_ROOT_OBJECT)
     {
-    	FUNCTION_EXIT;
         return AE_NULL_ENTRY;
     }
 
@@ -570,7 +569,6 @@ AcpiGetParent (
 
     if (!(Object = NsConvertHandleToEntry (Handle)))
     {
-    	FUNCTION_EXIT;
         return AE_BAD_PARAMETER;
     }
 
@@ -583,11 +581,9 @@ AcpiGetParent (
 
     if (!Object->ParentEntry)
     {
-    	FUNCTION_EXIT;
         return AE_NULL_ENTRY;
     }
 
-   	FUNCTION_EXIT;
     return AE_OK;
 }
 
@@ -675,12 +671,12 @@ AcpiGetContainingScope (
 {
     NAME_TABLE_ENTRY        *Object;
     
-    FUNCTION_TRACE ("AcpiGetContainingScope");
+
+    /* No trace macro, too verbose */
 
 
     if (!RetHandle)
     {
-    	FUNCTION_EXIT;
         return AE_BAD_PARAMETER;
     }
 
@@ -688,7 +684,6 @@ AcpiGetContainingScope (
 
     if (Handle == ACPI_ROOT_OBJECT)
     {
-    	FUNCTION_EXIT;
         return AE_NULL_ENTRY;
     }
 
@@ -696,7 +691,6 @@ AcpiGetContainingScope (
 
     if (!(Object = NsConvertHandleToEntry (Handle)))
     {
-    	FUNCTION_EXIT;
         return AE_BAD_PARAMETER;
     }
 
@@ -711,7 +705,6 @@ AcpiGetContainingScope (
         *RetHandle = Object->ParentEntry->Scope;
     }
 
-   	FUNCTION_EXIT;
     return AE_OK;
 }