diff --git a/design_dump.cc b/design_dump.cc
index 427a9a8da..301c9301e 100644
--- a/design_dump.cc
+++ b/design_dump.cc
@@ -465,9 +465,14 @@ void NetPartSelect::dump_node(ostream&o, unsigned ind) const
 	    break;
       }
       o << setw(ind) << "" << "NetPartSelect(" << pt << "): "
-	<< name() << " #(" << rise_time()
-	<< "," << fall_time() << "," << decay_time() << ") "
-	<< " off=" << off_ << " wid=" << wid_ <<endl;
+	<< name();
+      if (rise_time())
+	    o << " #(" << *rise_time()
+	      << "," << *fall_time()
+	      << "," << *decay_time() << ")";
+      else
+	    o << " #(.,.,.)";
+      o << " off=" << off_ << " wid=" << wid_ <<endl;
       dump_node_pins(o, ind+4);
       dump_obj_attr(o, ind+4);
 }
@@ -535,9 +540,11 @@ void NetSysFunc::dump_node(ostream&o, unsigned ind) const
 void NetUserFunc::dump_node(ostream&o, unsigned ind) const
 {
       o << setw(ind) << "" << "USER FUNC: "
-	<< scope_path(def_)
-	<< " #(" <<*rise_time()<<","<<*fall_time() << "," <<*decay_time() << ")"
-	<< endl;
+	<< scope_path(def_);
+      if (rise_time())
+	    o << " #(" <<*rise_time()
+	      <<","<<*fall_time()
+	      << "," <<*decay_time() << ")" << endl;
       dump_node_pins(o, ind+4);
       dump_obj_attr(o, ind+4);
 }
diff --git a/driver/cfparse_misc.h b/driver/cfparse_misc.h
index 5ccdb8d40..b822bd7a9 100644
--- a/driver/cfparse_misc.h
+++ b/driver/cfparse_misc.h
@@ -19,9 +19,6 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: cfparse_misc.h,v 1.6 2004/02/15 18:03:30 steve Exp $"
-#endif
 
 /*
  * The vlltype supports the passing of detailed source file location
diff --git a/vvp/vpi_priv.h b/vvp/vpi_priv.h
index 5c4c30658..9c170d907 100644
--- a/vvp/vpi_priv.h
+++ b/vvp/vpi_priv.h
@@ -103,7 +103,7 @@ struct __vpirt {
  * "base" that is a __vpiHandle object. This template can convert any
  * of those structures into a vpiHandle object.
  */
-template <class T> struct __vpiHandle*vpi_handle(T obj)
+template <class T> vpiHandle vpi_handle(T obj)
 { return &obj->base; }
 
 /*