Some fixes for adding declarations in wheres

:addclause needs to know how many arguments are parameters so that they
don't get printed
:addmissing now indents (but still prints too many arguments)