diff --git a/vvp/schedule.cc b/vvp/schedule.cc
index a7b5dffdb..616051592 100644
--- a/vvp/schedule.cc
+++ b/vvp/schedule.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2001-2007 Stephen Williams (steve@icarus.com)
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -219,6 +219,14 @@ inline void event_time_s::operator delete(void*obj, size_t size)
  */
 static struct event_time_s* sched_list = 0;
 
+/*
+ * This is a list of initialization events. The setup puts
+ * initializations in this list so that they happen before the
+ * simulation as a whole starts. This prevents time-0 triggers of
+ * certain events.
+ */
+static struct event_s* schedule_init_list = 0;
+
 /*
  * This flag is true until a VPI task or function finishes the
  * simulation.
@@ -521,6 +529,26 @@ void schedule_set_vector(vvp_net_ptr_t ptr, double bit)
       schedule_event_(cur, 0, SEQ_ACTIVE);
 }
 
+void schedule_init_vector(vvp_net_ptr_t ptr, vvp_vector4_t bit)
+{
+      struct assign_vector4_event_s*cur = new struct assign_vector4_event_s;
+      cur->ptr = ptr;
+      cur->val = bit;
+      cur->base = 0;
+      cur->vwid = 0;
+      cur->next = schedule_init_list;
+      schedule_init_list = cur;
+}
+
+void schedule_init_vector(vvp_net_ptr_t ptr, double bit)
+{
+      struct assign_real_event_s*cur = new struct assign_real_event_s;
+      cur->ptr = ptr;
+      cur->val = bit;
+      cur->next = schedule_init_list;
+      schedule_init_list = cur;
+}
+
 void schedule_generic(vvp_gen_event_t obj, vvp_time64_t delay,
 		      bool sync_flag, bool ro_flag)
 {
@@ -575,6 +603,15 @@ void schedule_simulate(void)
       // Execute pre-simulation callbacks
       vpiPresim();
 
+	// Execute initialization events.
+      while (schedule_init_list) {
+	    struct event_s*cur = schedule_init_list;
+	    schedule_init_list = cur->next;
+
+	    cur->run_run();
+	    delete cur;
+      }
+
       signals_capture();
 
       while (schedule_runnable && sched_list) {
@@ -645,57 +682,5 @@ void schedule_simulate(void)
 
 /*
  * $Log: schedule.cc,v $
- * Revision 1.45  2007/01/16 05:44:16  steve
- *  Major rework of array handling. Memories are replaced with the
- *  more general concept of arrays. The NetMemory and NetEMemory
- *  classes are removed from the ivl core program, and the IVL_LPM_RAM
- *  lpm type is removed from the ivl_target API.
- *
- * Revision 1.44  2006/09/29 16:55:04  steve
- *  Allow rosync events to create new rosync events.
- *
- * Revision 1.43  2006/09/29 01:24:34  steve
- *  rwsync callback fixes from Ben Staveley (with modifications.)
- *
- * Revision 1.42  2006/08/06 18:17:00  steve
- *  Fix typo in initialize of new event_time cell.
- *
- * Revision 1.41  2006/02/02 02:44:00  steve
- *  Allow part selects of memory words in l-values.
- *
- * Revision 1.40  2005/09/20 18:34:02  steve
- *  Clean up compiler warnings.
- *
- * Revision 1.39  2005/07/06 04:29:25  steve
- *  Implement real valued signals and arith nodes.
- *
- * Revision 1.38  2005/06/22 18:30:12  steve
- *  Inline more simple stuff, and more vector4_t by const reference for performance.
- *
- * Revision 1.37  2005/06/12 01:10:26  steve
- *  Remove useless references to functor.h
- *
- * Revision 1.36  2005/06/09 05:04:45  steve
- *  Support UDP initial values.
- *
- * Revision 1.35  2005/06/02 16:02:11  steve
- *  Add support for notif0/1 gates.
- *  Make delay nodes support inertial delay.
- *  Add the %force/link instruction.
- *
- * Revision 1.34  2005/05/07 03:15:42  steve
- *  Implement non-blocking part assign.
- *
- * Revision 1.33  2005/03/06 17:25:03  steve
- *  Remove dead code from scheduler.
- *
- * Revision 1.32  2005/03/06 17:07:48  steve
- *  Non blocking assign to memory words.
- *
- * Revision 1.31  2005/02/12 03:26:14  steve
- *  Support scheduling vvp_vector8_t objects.
- *
- * Revision 1.30  2005/01/29 17:53:25  steve
- *  Use scheduler to initialize constant functor inputs.
  */
 
diff --git a/vvp/schedule.h b/vvp/schedule.h
index 5f80cb000..cf296cf29 100644
--- a/vvp/schedule.h
+++ b/vvp/schedule.h
@@ -1,7 +1,7 @@
 #ifndef __schedule_H
 #define __schedule_H
 /*
- * Copyright (c) 2001-2003 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2001-2007 Stephen Williams (steve@icarus.com)
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -67,14 +67,26 @@ extern void schedule_assign_memory_word(vvp_memory_t mem,
 					vvp_time64_t delay);
 /*
  * This is very similar to schedule_assign_vector, but generates an
- * event in the active queue. It is used at link time to set an initial
- * value (a compile time constant) to the input of a functor. This
+ * event in the active queue. It is used at link time to assign a
+ * constant value (i.e. C4<...>) to the input of a functor. This
  * creates an event in the active queue.
  */
 extern void schedule_set_vector(vvp_net_ptr_t ptr, vvp_vector4_t val);
 extern void schedule_set_vector(vvp_net_ptr_t ptr, vvp_vector8_t val);
 extern void schedule_set_vector(vvp_net_ptr_t ptr, double val);
 
+/*
+ * The schedule_init_vector function assigns an initial value to a
+ * functor. The assignment is put into a pre-simulation queue that is
+ * run before the rest of the simulation runs. This is used to assign
+ * initial values to variables and have them propagate through the
+ * net. Doing the init before the rest of the scheduler starts
+ * prevents threads being triggered by the initialization of the
+ * variable, but still allows the initial value to be driven
+ * (propagated as events) through the rest of the net.
+ */
+extern void schedule_init_vector(vvp_net_ptr_t ptr, vvp_vector4_t val);
+extern void schedule_init_vector(vvp_net_ptr_t ptr, double val);
 
 /*
  * Create a generic event. This supports scheduled events that are not
@@ -146,58 +158,4 @@ extern unsigned long count_prop_events;
 extern unsigned long count_thread_events;
 extern unsigned long count_event_pool;
 
-/*
- * $Log: schedule.h,v $
- * Revision 1.29  2007/01/16 05:44:16  steve
- *  Major rework of array handling. Memories are replaced with the
- *  more general concept of arrays. The NetMemory and NetEMemory
- *  classes are removed from the ivl core program, and the IVL_LPM_RAM
- *  lpm type is removed from the ivl_target API.
- *
- * Revision 1.28  2006/09/29 01:24:34  steve
- *  rwsync callback fixes from Ben Staveley (with modifications.)
- *
- * Revision 1.27  2006/02/02 02:44:00  steve
- *  Allow part selects of memory words in l-values.
- *
- * Revision 1.26  2005/09/20 18:34:02  steve
- *  Clean up compiler warnings.
- *
- * Revision 1.25  2005/07/06 04:29:25  steve
- *  Implement real valued signals and arith nodes.
- *
- * Revision 1.24  2005/06/22 18:30:12  steve
- *  Inline more simple stuff, and more vector4_t by const reference for performance.
- *
- * Revision 1.23  2005/06/09 05:04:45  steve
- *  Support UDP initial values.
- *
- * Revision 1.22  2005/06/02 16:02:11  steve
- *  Add support for notif0/1 gates.
- *  Make delay nodes support inertial delay.
- *  Add the %force/link instruction.
- *
- * Revision 1.21  2005/05/07 03:15:42  steve
- *  Implement non-blocking part assign.
- *
- * Revision 1.20  2005/03/06 17:07:48  steve
- *  Non blocking assign to memory words.
- *
- * Revision 1.19  2005/02/12 03:26:14  steve
- *  Support scheduling vvp_vector8_t objects.
- *
- * Revision 1.18  2005/01/29 17:53:25  steve
- *  Use scheduler to initialize constant functor inputs.
- *
- * Revision 1.17  2004/12/11 02:31:30  steve
- *  Rework of internals to carry vectors through nexus instead
- *  of single bits. Make the ivl, tgt-vvp and vvp initial changes
- *  down this path.
- *
- * Revision 1.16  2003/09/09 00:56:45  steve
- *  Reimpelement scheduler to divide nonblocking assign queue out.
- *
- * Revision 1.15  2003/02/22 02:52:06  steve
- *  Check for stopped flag in certain strategic points.
- */
 #endif
diff --git a/vvp/words.cc b/vvp/words.cc
index 3265c71c3..035778c0d 100644
--- a/vvp/words.cc
+++ b/vvp/words.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2003-2007 Stephen Williams (steve@icarus.com)
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -23,6 +23,7 @@
 # include  "compile.h"
 # include  "vpi_priv.h"
 # include  "array.h"
+# include  "schedule.h"
 # include  <stdio.h>
 # include  <stdlib.h>
 # include  <string.h>
@@ -48,6 +49,7 @@ static void __compile_var_real(char*label, char*name,
       if (name) {
 	    assert(!array);
 	    vpip_attach_to_current_scope(obj);
+	    schedule_init_vector(vvp_net_ptr_t(net,0), fun->real_value());
       }
       if (array) {
 	    assert(!name);
@@ -95,6 +97,7 @@ static void __compile_var(char*label, char*name,
       if (name) {
 	    assert(!array);
 	    vpip_attach_to_current_scope(obj);
+	    schedule_init_vector(vvp_net_ptr_t(node,0), vsig->vec4_value());
       }
 	// If this is an array word, then it does not have a name, and
 	// it is attached to the addressed array.
@@ -269,8 +272,3 @@ void compile_alias_real(char*label, char*name, int msb, int lsb,
       free(argv[0].text);
       free(argv);
 }
-
-/*
- * $Log: words.cc,v $
- */
-