Fix multiword --with- arguments.