Change log entry for eb18cb7fb304744bd770ae5bc5567b600ecc10d6
Unify handling of multiple arguments

And while doing that, add more tests