diff --git a/gen/arrays.cpp b/gen/arrays.cpp
index ad120451c3..9d448144e4 100644
--- a/gen/arrays.cpp
+++ b/gen/arrays.cpp
@@ -624,7 +624,7 @@ DSliceValue *DtoNewDynArray(const Loc &loc, Type *arrayType, DValue *dim,
     return DtoNullValue(arrayType, loc)->isSlice();
 
   // get runtime function
-  bool zeroInit = eltType->isZeroInit();
+  bool zeroInit = isZeroInit(eltType);
   const char *fnname = defaultInit
                            ? (zeroInit ? "_d_newarrayT" : "_d_newarrayiT")
                            : "_d_newarrayU";
diff --git a/gen/declarations.cpp b/gen/declarations.cpp
index 9613d190bc..e8c3a4ad5a 100644
--- a/gen/declarations.cpp
+++ b/gen/declarations.cpp
@@ -382,7 +382,7 @@ public:
   //////////////////////////////////////////////////////////////////////////
 
   void visit(AttribDeclaration *decl) override {
-    Dsymbols *d = decl->include(nullptr);
+    Dsymbols *d = include(decl, nullptr);
 
     if (d) {
       for (auto s : *d) {
diff --git a/gen/dibuilder.cpp b/gen/dibuilder.cpp
index 5948660992..cabbe23ff6 100644
--- a/gen/dibuilder.cpp
+++ b/gen/dibuilder.cpp
@@ -509,7 +509,7 @@ void DIBuilder::AddStaticMembers(AggregateDeclaration *ad, DIFile file,
   std::function<void(Dsymbols *)> visitMembers = [&](Dsymbols *members) {
     for (auto s : *members) {
       if (auto attrib = s->isAttribDeclaration()) {
-        if (Dsymbols *d = attrib->include(nullptr))
+        if (Dsymbols *d = include(attrib, nullptr))
           visitMembers(d);
       } else if (auto tmixin = s->isTemplateMixin()) {
         // FIXME: static variables inside a template mixin need to be put inside
diff --git a/gen/llvmhelpers.cpp b/gen/llvmhelpers.cpp
index 3cedb56a27..b91fa2be72 100644
--- a/gen/llvmhelpers.cpp
+++ b/gen/llvmhelpers.cpp
@@ -975,7 +975,7 @@ DValue *DtoDeclarationExp(Dsymbol *declaration) {
   } else if (AttribDeclaration *a = declaration->isAttribDeclaration()) {
     Logger::println("AttribDeclaration");
     // choose the right set in case this is a conditional declaration
-    if (auto d = a->include(nullptr)) {
+    if (auto d = include(a, nullptr)) {
       for (unsigned i = 0; i < d->length; ++i) {
         DtoDeclarationExp((*d)[i]);
       }
diff --git a/gen/typinf.cpp b/gen/typinf.cpp
index c1a5f18b9a..c80b68e0a8 100644
--- a/gen/typinf.cpp
+++ b/gen/typinf.cpp
@@ -148,7 +148,7 @@ public:
 
     // void[] init
     // the array is null if the default initializer is zero
-    if (!sd->members || decl->tinfo->isZeroInit(decl->loc)) {
+    if (!sd->members || isZeroInit(decl->tinfo, decl->loc)) {
       b.push_null_void_array();
     }
     // otherwise emit a void[] with the default initializer
diff --git a/ir/irclass.cpp b/ir/irclass.cpp
index daf7f72742..b98b002251 100644
--- a/ir/irclass.cpp
+++ b/ir/irclass.cpp
@@ -240,7 +240,7 @@ LLConstant *IrClass::getVtblInit() {
 
       c = DtoCallee(fd);
 
-      if (cd->isFuncHidden(fd) && !fd->isFuture()) {
+      if (isFuncHidden(cd, fd) && !fd->isFuture()) {
         // fd is hidden from the view of this class. If fd overlaps with any
         // function in the vtbl[], issue error.
         for (size_t j = cd->vtblOffset(); j < n; j++) {
diff --git a/ir/irstruct.cpp b/ir/irstruct.cpp
index 31c1e24a79..c69c615c2f 100644
--- a/ir/irstruct.cpp
+++ b/ir/irstruct.cpp
@@ -134,7 +134,7 @@ LLConstant *IrStruct::getTypeInfoInit() {
     b.push_null_void_array();
   } else {
     llvm::Constant *initPtr;
-    if (ts->isZeroInit(Loc())) {
+    if (isZeroInit(ts)) {
       initPtr = getNullPtr();
     } else {
       initPtr = getInitSymbol();