Yep, this is hacky. I just couldn't figure out a nice way to refactor parameter expander, so I just did something quick. I'll take another look at it.