I reviewed parameters (both in code and in documentation) and think they are
now consistent and sane enough to not block a merge.