Clean up some nested parameters which were blocking the same value passed in from an outer scope.