diff --git a/apidoc/plugins/typedefs.js b/apidoc/plugins/typedefs.js
index 35eb804335..a1a6a1df4f 100644
--- a/apidoc/plugins/typedefs.js
+++ b/apidoc/plugins/typedefs.js
@@ -14,9 +14,7 @@ function addSubparams(params) {
       var name = types[k];
       if (name in olxTypes) {
         param.subparams = olxTypes[name];
-        // TODO Change template before recursing here, because the table gets
-        // too wide.
-        //addSubparams(param.subparams);
+        addSubparams(param.subparams);
         // TODO Do we need to support multiple object literal types per
         // param?
         break;
diff --git a/apidoc/template/tmpl/params.tmpl b/apidoc/template/tmpl/params.tmpl
index 0d80902172..cb2012c92c 100644
--- a/apidoc/template/tmpl/params.tmpl
+++ b/apidoc/template/tmpl/params.tmpl
@@ -21,10 +21,12 @@
     params.hasDefault = false;
     params.hasName = false;
     
+    var colspan = 2;
     params.forEach(function(param) {
         if (!param) { return; }
         
         if (param.optional || param.nullable) {
+            ++colspan;
             params.hasAttributes = true;
         }
         
@@ -33,6 +35,7 @@
         }
         
         if (typeof param.defaultvalue !== 'undefined') {
+            ++colspan;
             params.hasDefault = true;
         }
     });
@@ -71,6 +74,7 @@
                 <td class="name"><code><?js= param.name.replace(/^opt_/, "") ?></code></td>
             <?js } ?>
             
+            <?js if (!param.subparams) {?>
             <td class="type">
             <?js if (param.type && param.type.names) {?>
                 <?js= self.partial('type.tmpl', param.type.names) ?>
@@ -96,8 +100,9 @@
                 <?js } ?>
                 </td>
             <?js } ?>
+            <?js } ?>
             
-            <td class="description last"><?js= param.description ?><?js if (param.subparams) { ?>
+            <td<?js= (param.subparams ? ' colspan=' + colspan : ' ') ?> class="description last"><?js= param.description ?><?js if (param.subparams) { ?>
                 <h6>Properties</h6>
                 <?js= self.partial('params.tmpl', param.subparams) ?>
             <?js } ?></td>