diff --git a/base/inference.jl b/base/inference.jl
index f6edfc6961dcc..332badb5b543e 100644
--- a/base/inference.jl
+++ b/base/inference.jl
@@ -1853,6 +1853,17 @@ function without_linenums(a::Array{Any,1})
     l
 end
 
+contains_typevar(T::ANY) = false
+contains_typevar(T::TypeVar) = true
+function contains_typevar(T::DataType)
+    for p in T.parameters
+        if contains_typevar(p)
+            return true
+        end
+    end
+    return false
+end
+
 const _pure_builtins = {tuple, tupleref, tuplelen, fieldtype, apply_type, is, isa, typeof, typeassert} # known affect-free calls (also effect-free)
 const _pure_builtins_volatile = {getfield, arrayref} # known effect-free calls (might not be affect-free)
 
@@ -2042,7 +2053,7 @@ function inlineable(f, e::Expr, atypes, sv, enclosing_ast)
     sp = tuple(sp..., linfo.sparams...)
     spvals = { sp[i] for i in 2:2:length(sp) }
     for i=1:length(spvals)
-        if isa(spvals[i],TypeVar)
+        if contains_typevar(spvals[i])
             return NF
         end
         if isa(spvals[i],Symbol)
@@ -2054,6 +2065,9 @@ function inlineable(f, e::Expr, atypes, sv, enclosing_ast)
     nm = length(methargs)
     if !(atypes <: methargs)
         incompletematch = true
+        if !inline_incompletematch_allowed
+            return NF
+        end
     else
         incompletematch = false
     end
@@ -2421,6 +2435,10 @@ function inlineable(f, e::Expr, atypes, sv, enclosing_ast)
     end
     return (expr, stmts)
 end
+# The inlining incomplete matches optimization doesn't work well during the first
+# pass of bootstrapping, since it assumes the method call list is relatively stable.
+# It is disabled here, and enabled later in sysimg.jl
+inline_incompletematch_allowed = false
 
 inline_worthy(body, cost::Real) = true
 function inline_worthy(body::Expr, cost::Real=1.0) # precondition: 0<cost
diff --git a/src/builtins.c b/src/builtins.c
index 9753fe7ff4864..ab4838b447df1 100644
--- a/src/builtins.c
+++ b/src/builtins.c
@@ -1188,7 +1188,9 @@ DLLEXPORT size_t jl_static_show(JL_STREAM *out, jl_value_t *v)
         n += jl_static_show(out, ((jl_typector_t*)v)->body);
     }
     else if (jl_is_typevar(v)) {
-        n += JL_PRINTF(out, "%s", ((jl_tvar_t*)v)->name->name);
+        n += jl_static_show(out, ((jl_tvar_t*)v)->lb);
+        n += JL_PRINTF(out, "<:%s<:", ((jl_tvar_t*)v)->name->name);
+        n += jl_static_show(out, ((jl_tvar_t*)v)->ub);
     }
     else if (jl_is_module(v)) {
         jl_module_t *m = (jl_module_t*)v;