diff --git a/autoload/fzf/vim.vim b/autoload/fzf/vim.vim
index 62755d5..4a17152 100644
--- a/autoload/fzf/vim.vim
+++ b/autoload/fzf/vim.vim
@@ -27,16 +27,26 @@ set cpo&vim
 " ------------------------------------------------------------------
 " Common
 " ------------------------------------------------------------------
+
+" Deprecated: use fzf#wrap instead
 function! fzf#vim#wrap(opts)
-  return extend(copy(a:opts), {
-  \ 'options': get(a:opts, 'options', '').' --expect='.join(keys(get(g:, 'fzf_action', s:default_action)), ','),
-  \ 'sink*':   get(a:opts, 'sink*', s:function('s:common_sink'))})
+  return fzf#wrap(a:opts)
 endfunction
 
+" Deprecated
 function! fzf#vim#layout(...)
   return (a:0 && a:1) ? {} : copy(get(g:, 'fzf_layout', g:fzf#vim#default_layout))
 endfunction
 
+function! s:wrap(opts)
+  " fzf#wrap does not append --expect if sink or sink* is found
+  let opts = copy(a:opts)
+  let Sink = remove(opts, 'sink*')
+  let wrapped = fzf#wrap(opts)
+  let wrapped['sink*'] = Sink
+  return wrapped
+endfunction
+
 function! s:strip(str)
   return substitute(a:str, '^\s*\|\s*$', '', 'g')
 endfunction
@@ -101,18 +111,24 @@ function! s:defaults()
 endfunction
 
 function! s:fzf(name, opts, extra)
-  let extra  = empty(a:extra) ? fzf#vim#layout() : a:extra[0]
+  let [extra, bang] = [{}, 0]
+  if len(a:extra) == 1
+    let first = a:extra[0]
+    if type(first) == s:TYPE.dict
+      let extra = first
+    else
+      let bang = first
+    endif
+  elseif len(a:extra) == 2
+    let [extra, bang] = a:extra
+  else
+    throw 'invalid number of arguments'
+  endif
+
   let eopts  = has_key(extra, 'options') ? remove(extra, 'options') : ''
   let merged = extend(copy(a:opts), extra)
   let merged.options = join(filter([s:defaults(), get(merged, 'options', ''), eopts], '!empty(v:val)'))
-  if len(get(g:, 'fzf_history_dir', ''))
-    let dir = expand(g:fzf_history_dir)
-    if !isdirectory(dir)
-      call mkdir(dir, 'p')
-    endif
-    let merged.options = join(['--history', s:escape(dir.'/'.a:name), merged.options])
-  endif
-  return fzf#run(merged)
+  return fzf#run(fzf#wrap(a:name, merged, bang))
 endfunction
 
 let s:default_action = {
@@ -127,39 +143,6 @@ function! s:open(cmd, target)
   execute a:cmd s:escape(a:target)
 endfunction
 
-function! s:common_sink(lines) abort
-  if len(a:lines) < 2
-    return
-  endif
-  let key = remove(a:lines, 0)
-  let cmd = get(get(g:, 'fzf_action', s:default_action), key, 'e')
-  if len(a:lines) > 1
-    augroup fzf_swap
-      autocmd SwapExists * let v:swapchoice='o'
-            \| call s:warn('fzf: E325: swap file exists: '.expand('<afile>'))
-    augroup END
-  endif
-  try
-    let empty = empty(expand('%')) && line('$') == 1 && empty(getline(1)) && !&modified
-    let autochdir = &autochdir
-    set noautochdir
-    for item in a:lines
-      if empty
-        execute 'e' s:escape(item)
-        let empty = 0
-      else
-        call s:open(cmd, item)
-      endif
-      if exists('#BufEnter') && isdirectory(item)
-        doautocmd BufEnter
-      endif
-    endfor
-  finally
-    let &autochdir = autochdir
-    silent! autocmd! fzf_swap
-  endtry
-endfunction
-
 function! s:align_lists(lists)
   let maxes = {}
   for list in a:lists
@@ -210,7 +193,7 @@ function! fzf#vim#files(dir, ...)
     let args.options .= ' --prompt '.shellescape(pathshorten(getcwd())).'/'
   endif
 
-  return s:fzf('files', fzf#vim#wrap(args), a:000)
+  return s:fzf('files', args, a:000)
 endfunction
 
 " ------------------------------------------------------------------
@@ -275,7 +258,7 @@ function! fzf#vim#lines(...)
   let nth = display_bufnames ? 3 : 2
   let [query, args] = (a:0 && type(a:1) == type('')) ?
         \ [a:1, a:000[1:]] : ['', a:000]
-  return s:fzf('lines', fzf#vim#wrap({
+  return s:fzf('lines', s:wrap({
   \ 'source':  lines,
   \ 'sink*':   s:function('s:line_handler'),
   \ 'options': '+m --tiebreak=index --prompt "Lines> " --ansi --extended --nth='.nth.'.. --reverse --tabstop=1'.s:q(query)
@@ -307,7 +290,7 @@ endfunction
 function! fzf#vim#buffer_lines(...)
   let [query, args] = (a:0 && type(a:1) == type('')) ?
         \ [a:1, a:000[1:]] : ['', a:000]
-  return s:fzf('blines', fzf#vim#wrap({
+  return s:fzf('blines', s:wrap({
   \ 'source':  s:buffer_lines(),
   \ 'sink*':   s:function('s:buffer_line_handler'),
   \ 'options': '+m --tiebreak=index --prompt "BLines> " --ansi --extended --nth=2.. --reverse --tabstop=1'.s:q(query)
@@ -330,10 +313,10 @@ endfunction
 " Locate
 " ------------------------------------------------------------------
 function! fzf#vim#locate(query, ...)
-  return s:fzf('locate', fzf#vim#wrap({
+  return s:fzf('locate', {
   \ 'source':  'locate '.a:query,
   \ 'options': '-m --prompt "Locate> "'
-  \}), a:000)
+  \}, a:000)
 endfunction
 
 " ------------------------------------------------------------------
@@ -395,42 +378,42 @@ function! fzf#vim#search_history(...)
 endfunction
 
 function! fzf#vim#history(...)
-  return s:fzf('history-files', fzf#vim#wrap({
+  return s:fzf('history-files', {
   \ 'source':  reverse(s:all_files()),
   \ 'options': '-m --prompt "Hist> "'
-  \}), a:000)
+  \}, a:000)
 endfunction
 
 " ------------------------------------------------------------------
 " GFiles[?]
 " ------------------------------------------------------------------
 
-function! s:git_status_sink(lines) abort
-  if len(a:lines) < 2
-    return
-  endif
-  let lines = extend(a:lines[0:0], map(a:lines[1:], 'v:val[3:]'))
-  return s:common_sink(lines)
-endfunction
-
 function! fzf#vim#gitfiles(args, ...)
   let root = split(system('git rev-parse --show-toplevel'), '\n')[0]
   if v:shell_error
     return s:warn('Not in git repo')
   endif
   if a:args != '?'
-    return s:fzf('gfiles', fzf#vim#wrap({
+    return s:fzf('gfiles', {
     \ 'source':  'git ls-files '.a:args,
     \ 'dir':     root,
     \ 'options': '-m --prompt "GitFiles> "'
-    \}), a:000)
+    \}, a:000)
   endif
-  return s:fzf('gfiles-diff', fzf#vim#wrap({
+
+  " Here be dragons
+  let wrapped = fzf#wrap({
   \ 'source':  'git -c color.status=always status --short',
   \ 'dir':     root,
-  \ 'sink*':   s:function('s:git_status_sink'),
   \ 'options': '--ansi --multi --nth 2..,.. --prompt "GitFiles?> "'
-  \}), a:000)
+  \})
+  let wrapped.common_sink = remove(wrapped, 'sink*')
+  function! wrapped.newsink(lines)
+    let lines = extend(a:lines[0:0], map(a:lines[1:], 'v:val[3:]'))
+    return self.common_sink(lines)
+  endfunction
+  let wrapped['sink*'] = remove(wrapped, 'newsink')
+  return s:fzf('gfiles-diff', wrapped, a:000)
 endfunction
 
 " ------------------------------------------------------------------
@@ -494,7 +477,7 @@ endfunction
 
 function! fzf#vim#buffers(...)
   let bufs = map(sort(s:buflisted(), 's:sort_buffers'), 's:format_buffer(v:val)')
-  return s:fzf('buffers', fzf#vim#wrap({
+  return s:fzf('buffers', s:wrap({
   \ 'source':  reverse(bufs),
   \ 'sink*':   s:function('s:bufopen'),
   \ 'options': '+m -x --tiebreak=index --header-lines=1 --ansi -d "\t" -n 2,1..2 --prompt="Buf> "',
@@ -544,7 +527,7 @@ endfunction
 
 " ag command suffix, [options]
 function! fzf#vim#ag_raw(command_suffix, ...)
-  return s:fzf('ag', fzf#vim#wrap({
+  return s:fzf('ag', s:wrap({
   \ 'source':  'ag --nogroup --column --color '.a:command_suffix,
   \ 'sink*':    s:function('s:ag_handler'),
   \ 'options': '--ansi --delimiter : --nth 4..,.. --prompt "Ag> " '.
@@ -608,7 +591,7 @@ function! fzf#vim#buffer_tags(query, ...)
     \ printf('ctags -f - --sort=no --excmd=number --language-force=%s %s', &filetype, expand('%:S')),
     \ printf('ctags -f - --sort=no --excmd=number %s', expand('%:S'))]
   try
-    return s:fzf('btags', fzf#vim#wrap({
+    return s:fzf('btags', s:wrap({
     \ 'source':  s:btags_source(tag_cmds),
     \ 'sink*':   s:function('s:btags_sink'),
     \ 'options': '--reverse -m -d "\t" --with-nth 1,4.. -n 1 --prompt "BTags> "'.s:q(a:query)}), args)
@@ -683,7 +666,7 @@ function! fzf#vim#tags(query, ...)
     let proc = 'perl -ne ''unless (/^\!/) { s/^(.*?)\t(.*?)\t/'.s:yellow('\1', 'Function').'\t'.s:blue('\2', 'String').'\t/; print }'' '
     let copt = '--ansi '
   endif
-  return s:fzf('tags', fzf#vim#wrap({
+  return s:fzf('tags', s:wrap({
   \ 'source':  proc.shellescape(fnamemodify(tagfile, ':t')),
   \ 'sink*':   s:function('s:tags_sink'),
   \ 'dir':     fnamemodify(tagfile, ':h'),
@@ -802,7 +785,7 @@ function! fzf#vim#marks(...)
   silent marks
   redir END
   let list = split(cout, "\n")
-  return s:fzf('marks', fzf#vim#wrap({
+  return s:fzf('marks', s:wrap({
   \ 'source':  extend(list[0:0], map(list[1:], 's:format_mark(v:val)')),
   \ 'sink*':   s:function('s:mark_sink'),
   \ 'options': '+m -x --ansi --tiebreak=index --header-lines 1 --tiebreak=begin --prompt "Marks> "'}), a:000)
@@ -926,7 +909,7 @@ function! s:commits(buffer_local, args)
   endif
 
   let command = a:buffer_local ? 'BCommits' : 'Commits'
-  let options = fzf#vim#wrap({
+  let options = s:wrap({
   \ 'source':  source,
   \ 'sink*':   s:function('s:commits_sink'),
   \ 'options': '--ansi --multi --no-sort --tiebreak=index --reverse '.
diff --git a/plugin/fzf.vim b/plugin/fzf.vim
index 2b6991a..6cc015f 100644
--- a/plugin/fzf.vim
+++ b/plugin/fzf.vim
@@ -38,37 +38,36 @@ function! s:defs(commands)
 endfunction
 
 call s:defs([
-\'command! -bang -nargs=? -complete=dir Files  call fzf#vim#files(<q-args>, fzf#vim#layout(<bang>0))',
-\'command! -bang -nargs=? GitFiles             call fzf#vim#gitfiles(<q-args>, fzf#vim#layout(<bang>0))',
-\'command! -bang -nargs=? GFiles               call fzf#vim#gitfiles(<q-args>, fzf#vim#layout(<bang>0))',
-\'command! -bang Buffers                       call fzf#vim#buffers(fzf#vim#layout(<bang>0))',
-\'command! -bang -nargs=* Lines                call fzf#vim#lines(<q-args>, fzf#vim#layout(<bang>0))',
-\'command! -bang -nargs=* BLines               call fzf#vim#buffer_lines(<q-args>, fzf#vim#layout(<bang>0))',
-\'command! -bang Colors                        call fzf#vim#colors(fzf#vim#layout(<bang>0))',
-\'command! -bang -nargs=1 -complete=dir Locate call fzf#vim#locate(<q-args>, fzf#vim#layout(<bang>0))',
-\'command! -bang -nargs=* Ag                   call fzf#vim#ag(<q-args>, fzf#vim#layout(<bang>0))',
-\'command! -bang -nargs=* Tags                 call fzf#vim#tags(<q-args>, fzf#vim#layout(<bang>0))',
-\'command! -bang -nargs=* BTags                call fzf#vim#buffer_tags(<q-args>, fzf#vim#layout(<bang>0))',
-\'command! -bang Snippets                      call fzf#vim#snippets(fzf#vim#layout(<bang>0))',
-\'command! -bang Commands                      call fzf#vim#commands(fzf#vim#layout(<bang>0))',
-\'command! -bang Marks                         call fzf#vim#marks(fzf#vim#layout(<bang>0))',
-\'command! -bang Helptags                      call fzf#vim#helptags(fzf#vim#layout(<bang>0))',
-\'command! -bang Windows                       call fzf#vim#windows(fzf#vim#layout(<bang>0))',
-\'command! -bang Commits                       call fzf#vim#commits(fzf#vim#layout(<bang>0))',
-\'command! -bang BCommits                      call fzf#vim#buffer_commits(fzf#vim#layout(<bang>0))',
-\'command! -bang Maps                          call fzf#vim#maps("n", fzf#vim#layout(<bang>0))',
-\'command! -bang Filetypes                     call fzf#vim#filetypes(fzf#vim#layout(<bang>0))',
+\'command! -bang -nargs=? -complete=dir Files  call fzf#vim#files(<q-args>, <bang>0)',
+\'command! -bang -nargs=? GitFiles             call fzf#vim#gitfiles(<q-args>, <bang>0)',
+\'command! -bang -nargs=? GFiles               call fzf#vim#gitfiles(<q-args>, <bang>0)',
+\'command! -bang Buffers                       call fzf#vim#buffers(<bang>0)',
+\'command! -bang -nargs=* Lines                call fzf#vim#lines(<q-args>, <bang>0)',
+\'command! -bang -nargs=* BLines               call fzf#vim#buffer_lines(<q-args>, <bang>0)',
+\'command! -bang Colors                        call fzf#vim#colors(<bang>0)',
+\'command! -bang -nargs=1 -complete=dir Locate call fzf#vim#locate(<q-args>, <bang>0)',
+\'command! -bang -nargs=* Ag                   call fzf#vim#ag(<q-args>, <bang>0)',
+\'command! -bang -nargs=* Tags                 call fzf#vim#tags(<q-args>, <bang>0)',
+\'command! -bang -nargs=* BTags                call fzf#vim#buffer_tags(<q-args>, <bang>0)',
+\'command! -bang Snippets                      call fzf#vim#snippets(<bang>0)',
+\'command! -bang Commands                      call fzf#vim#commands(<bang>0)',
+\'command! -bang Marks                         call fzf#vim#marks(<bang>0)',
+\'command! -bang Helptags                      call fzf#vim#helptags(<bang>0)',
+\'command! -bang Windows                       call fzf#vim#windows(<bang>0)',
+\'command! -bang Commits                       call fzf#vim#commits(<bang>0)',
+\'command! -bang BCommits                      call fzf#vim#buffer_commits(<bang>0)',
+\'command! -bang Maps                          call fzf#vim#maps("n", <bang>0)',
+\'command! -bang Filetypes                     call fzf#vim#filetypes(<bang>0)',
 \'command! -bang -nargs=* History              call s:history(<q-args>, <bang>0)'])
 
 function! s:history(arg, bang)
   let bang = a:bang || a:arg[len(a:arg)-1] == '!'
-  let ext = fzf#vim#layout(bang)
   if a:arg[0] == ':'
-    call fzf#vim#command_history(ext)
+    call fzf#vim#command_history(bang)
   elseif a:arg[0] == '/'
-    call fzf#vim#search_history(ext)
+    call fzf#vim#search_history(bang)
   else
-    call fzf#vim#history(ext)
+    call fzf#vim#history(bang)
   endif
 endfunction
 
@@ -129,10 +128,10 @@ inoremap <expr> <plug>(fzf-complete-file-ag)     fzf#vim#complete#path("ag -l -g
 inoremap <expr> <plug>(fzf-complete-line)        fzf#vim#complete#line()
 inoremap <expr> <plug>(fzf-complete-buffer-line) fzf#vim#complete#buffer_line()
 
-nnoremap <silent> <plug>(fzf-maps-n) :<c-u>call fzf#vim#maps('n', fzf#vim#layout(0))<cr>
-inoremap <silent> <plug>(fzf-maps-i) <c-o>:call fzf#vim#maps('i', fzf#vim#layout(0))<cr>
-xnoremap <silent> <plug>(fzf-maps-x) :<c-u>call fzf#vim#maps('x', fzf#vim#layout(0))<cr>
-onoremap <silent> <plug>(fzf-maps-o) <c-c>:<c-u>call fzf#vim#maps('o', fzf#vim#layout(0))<cr>
+nnoremap <silent> <plug>(fzf-maps-n) :<c-u>call fzf#vim#maps('n', 0)<cr>
+inoremap <silent> <plug>(fzf-maps-i) <c-o>:call fzf#vim#maps('i', 0)<cr>
+xnoremap <silent> <plug>(fzf-maps-x) :<c-u>call fzf#vim#maps('x', 0)<cr>
+onoremap <silent> <plug>(fzf-maps-o) <c-c>:<c-u>call fzf#vim#maps('o', 0)<cr>
 
 let &cpo = s:cpo_save
 unlet s:cpo_save