tentative fix for dogfood "100 parameters" issue

  1676 tests complete (2 minutes)
  111 tests pending