Better handle separate positional parameters, bug 497936