This is mostly just reading through the output of uparam, after noticing that there were a few places where we were ignoring some arguments.