diff --git a/src/overdub/execution.jl b/src/overdub/execution.jl
index 0455141..8520f75 100644
--- a/src/overdub/execution.jl
+++ b/src/overdub/execution.jl
@@ -168,16 +168,27 @@ end
 # Overdub{Intercept} #
 #--------------------#
 
+function _overdub_generator end
+
 for N in 0:MAX_ARGS
     arg_names = [Symbol("_CASSETTE_$i") for i in 2:(N+1)]
     arg_types = [:(unbox(C, $T)) for T in arg_names]
+    stub = Core.GeneratedFunctionStub(_overdub_generator,
+                                      Any[:f, arg_names...],
+                                      Any[:F, :C, :M, :world, :debug],
+                                      @__LINE__,
+                                      Symbol(@__FILE__),
+                                      true)
     @eval begin
-        @generated function (f::Overdub{Intercept,F,Settings{C,M,world,debug}})($(arg_names...)) where {F,C,M,world,debug}
+        function _overdub_generator(f::Overdub{Intercept,F,Settings{C,M,world,debug}}, $(arg_names...)) where {F,C,M,world,debug}
             signature = Tuple{unbox(C, F),$(arg_types...)}
-            method_body = lookup_method_body(signature, $arg_names, world, debug)
+            method, method_body = lookup_method_body(signature, $arg_names, world, debug)
             if isa(method_body, CodeInfo)
                 method_body = overdub_new!(overdub_calls!(getpass(C, M)(signature, method_body)))
                 method_body.inlineable = true
+                if isa(method, Method)
+                    method_body.method_for_inference_heuristics = method
+                end
             else
                 arg_names = $arg_names
                 method_body = quote
@@ -188,5 +199,8 @@ for N in 0:MAX_ARGS
             debug && Core.println("RETURNING Overdub(...) BODY: ", method_body)
             return method_body
         end
+        function (f::Overdub{Intercept,F,Settings{C,M,world,debug}})($(arg_names...)) where {F,C,M,world,debug}
+            $(Expr(:meta, :generated_only, stub))
+        end
     end
 end
diff --git a/src/overdub/reflection.jl b/src/overdub/reflection.jl
index 4397b56..94b717d 100644
--- a/src/overdub/reflection.jl
+++ b/src/overdub/reflection.jl
@@ -9,13 +9,13 @@ function lookup_method_body(::Type{S}, arg_names::Vector,
         Core.println("\tSIGNATURE: ", S)
         Core.println("\tWORLD: ", world)
     end
-    S.parameters[1].name.module === Core.Inference && return nothing
+    S.parameters[1].name.module === Core.Inference && return (nothing, nothing)
     results = _lookup_method_body(S, arg_names, world)
-    results === nothing && return nothing
+    results === nothing && return (nothing, nothing)
     method, code_info = results
     debug && Core.println("LOOKED UP METHOD: ", method)
     debug && Core.println("LOOKED UP CODEINFO: ", code_info)
-    return code_info
+    return method, code_info
 end
 
 function _lookup_method_body(::Type{S}, arg_names::Vector,