--- a/src/simulator/simulator.cc	Fri Aug 01 23:15:00 2008 +0100
+++ b/src/simulator/simulator.cc	Sun Aug 03 09:14:07 2008 -0700
@@ -67,8 +67,9 @@
 SimulatorImpl *
 Simulator::GetImpl (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
-
+  /* Please, don't include any calls to logging macros in this function
+   * or pay the price, that is, stack explosions.
+   */
   if (m_impl == 0) 
     {
       ObjectFactory factory;
@@ -90,7 +91,6 @@
 //
       LogSetTimePrinter (&TimePrinter);
     }
-  NS_LOG_LOGIC ("priv " << m_impl);
   return PeekPointer (m_impl);
 }
 
@@ -162,7 +162,9 @@
 Time
 Simulator::Now (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
+  /* Please, don't include any calls to logging macros in this function
+   * or pay the price, that is, stack explosions.
+   */
   return GetImpl ()->Now ();
 }