I agree - I think that'd be ideal. Unfortunately, I think most of the work in `_wrap_parameters` is still necessary because it needs to find out if there will be any wrapped parameters based on the include/exclude options. I just pushed another pass at this which returns the right thing from `_wrap_parameters`. (I also noticed a missing test for returning an empty parameter set, which I added)