fix some argument-quoting etc