diff --git a/tools/bifcl/include/bif_type.def b/tools/bifcl/include/bif_type.def
index ebc025cfb7..388b6195a8 100644
--- a/tools/bifcl/include/bif_type.def
+++ b/tools/bifcl/include/bif_type.def
@@ -5,7 +5,7 @@ DEFINE_BIF_TYPE(TYPE_BOOL,       "bool",       "bool",       "int",         "int
 DEFINE_BIF_TYPE(TYPE_CONN_ID,    "conn_id",    "conn_id",    "Val*",        "IntrusivePtr<Val>",        "%s",                             "%s",                             "",             "IntrusivePtr{AdoptRef{}, %s}",             "std::move(%s)")
 DEFINE_BIF_TYPE(TYPE_CONNECTION, "connection", "connection", "Connection*", "Connection*",              "%s->AsRecordVal()->GetOrigin()", "%s->AsRecordVal()->GetOrigin()", "",             "%s->ConnVal()",                            "%s->ConnVal()")
 DEFINE_BIF_TYPE(TYPE_COUNT,      "count",      "count",      "bro_uint_t",  "bro_uint_t",               "%s->AsCount()",                  "%s->AsCount()",                  "",             "val_mgr->Count(%s)",                       "val_mgr->Count(%s)")
-DEFINE_BIF_TYPE(TYPE_DOUBLE,     "double",     "double",     "double",      "double",                   "%s->AsDouble()",                 "%s->AsDouble()",                 "",             "make_intrusive<Val>(%s, TYPE_DOUBLE)",     "make_intrusive<Val>(%s, TYPE_DOUBLE)")
+DEFINE_BIF_TYPE(TYPE_DOUBLE,     "double",     "double",     "double",      "double",                   "%s->AsDouble()",                 "%s->AsDouble()",                 "",             "make_intrusive<DoubleVal>(%s)",            "make_intrusive<DoubleVal>(%s)")
 DEFINE_BIF_TYPE(TYPE_FILE,       "file",       "file",       "BroFile*",    "IntrusivePtr<Val>",        "%s->AsFile()",                   "%s",                             "",             "make_intrusive<Val>(IntrusivePtr{AdoptRef{}, %s})",    "std::move(%s)")
 DEFINE_BIF_TYPE(TYPE_INT,        "int",        "int",        "bro_int_t",   "bro_int_t",                "%s->AsInt()",                    "%s->AsInt()",                    "",             "val_mgr->Int(%s)",                         "val_mgr->Int(%s)")
 DEFINE_BIF_TYPE(TYPE_INTERVAL,   "interval",   "interval",   "double",      "double",                   "%s->AsInterval()",               "%s->AsInterval()",               "",             "make_intrusive<IntervalVal>(%s, Seconds)", "make_intrusive<IntervalVal>(%s, Seconds)")
@@ -13,5 +13,5 @@ DEFINE_BIF_TYPE(TYPE_PATTERN,    "pattern",    "pattern",    "RE_Matcher*", "Int
 DEFINE_BIF_TYPE(TYPE_PORT,       "port",       "port",       "PortVal*",    "IntrusivePtr<PortVal>",    "%s->AsPortVal()",                "%s",                             "<PortVal>",    "IntrusivePtr{AdoptRef{}, %s}",             "std::move(%s)")
 DEFINE_BIF_TYPE(TYPE_STRING,     "string",     "string",     "StringVal*",  "IntrusivePtr<StringVal>",  "%s->AsStringVal()",              "%s",                             "<StringVal>",  "IntrusivePtr{AdoptRef{}, %s}",             "std::move(%s)")
 DEFINE_BIF_TYPE(TYPE_SUBNET,     "subnet",     "subnet",     "SubNetVal*",  "IntrusivePtr<SubNetVal>",  "%s->AsSubNetVal()",              "%s",                             "<SubNetVal>",  "IntrusivePtr{AdoptRef{}, %s}",             "std::move(%s)")
-DEFINE_BIF_TYPE(TYPE_TIME,       "time",       "time",       "double",      "double",                   "%s->AsTime()",                   "%s->AsTime()",                   "",             "make_intrusive<Val>(%s, TYPE_TIME)",       "make_intrusive<Val>(%s, TYPE_TIME)")
+DEFINE_BIF_TYPE(TYPE_TIME,       "time",       "time",       "double",      "double",                   "%s->AsTime()",                   "%s->AsTime()",                   "",             "make_intrusive<TimeVal>(%s)",              "make_intrusive<TimeVal>(%s)")
 DEFINE_BIF_TYPE(TYPE_OTHER,      "",           "",           "Val*",        "IntrusivePtr<Val>",        "%s",                             "%s",                             "",             "IntrusivePtr{AdoptRef{}, %s}",             "std::move(%s)")