diff --git a/loopy/translation_unit.py b/loopy/translation_unit.py
index 269fd53f9d98c6e811cd0a037ea076b0eb37645c..ac3b7076b852a8633276cd5468ecf6c8e4aefeb0 100644
--- a/loopy/translation_unit.py
+++ b/loopy/translation_unit.py
@@ -254,9 +254,11 @@ class TranslationUnit(ImmutableRecord):
     @property
     def state(self):
         """ Returns an instance of :class:`loopy.kernel.KernelState`. """
-        return min(callable_knl.subkernel.state
-                   for callable_knl in self.callables_table.values()
-                   if isinstance(callable_knl, CallableKernel))
+        from loopy.kernel import KernelState
+        return min((callable_knl.subkernel.state
+                    for callable_knl in self.callables_table.values()
+                    if isinstance(callable_knl, CallableKernel)),
+                   default=KernelState.INITIAL)
 
     def with_kernel(self, kernel):
         """
@@ -662,7 +664,7 @@ class CallablesInferenceContext(ImmutableRecord):
                                              - self.new_entrypoints)
 
         todo_renames = {}
-        new_callables = {}
+        new_callables = dict(program.callables_table)
 
         for c in callees_with_old_entrypoint_names:
             unique_func_id = c
@@ -808,7 +810,8 @@ def resolve_callables(program):
     callables_table = {}
 
     # callables: name of the calls seen in the program
-    callables = set(program.entrypoints)
+    callables = {name for name, clbl in program.callables_table.items()
+                 if isinstance(clbl, CallableKernel)}
 
     while callables:
         clbl_name = callables.pop()