diff --git a/autoload/airline.vim b/autoload/airline.vim
index 952a080..36475d1 100644
--- a/autoload/airline.vim
+++ b/autoload/airline.vim
@@ -68,7 +68,7 @@ function! airline#switch_theme(name)
   let w:airline_lastmode = ''
   call airline#load_theme()
 
-  silent doautocmd User AirlineAfterTheme
+  call airline#util#doautocmd('AirlineAfterTheme')
 
   " this is required to prevent clobbering the startup info message, i don't know why...
   call airline#check_mode(winnr())
@@ -203,7 +203,7 @@ function! airline#check_mode(winnr)
   if get(w:, 'airline_lastmode', '') != mode_string
     call airline#highlighter#highlight_modified_inactive(context.bufnr)
     call airline#highlighter#highlight(l:mode, context.bufnr)
-    silent doautocmd User AirlineModeChanged
+    call airline#util#doautocmd('AirlineModeChanged')
     let w:airline_lastmode = mode_string
   endif
 
diff --git a/autoload/airline/extensions/tabline.vim b/autoload/airline/extensions/tabline.vim
index 1f9b0ff..c07dc83 100644
--- a/autoload/airline/extensions/tabline.vim
+++ b/autoload/airline/extensions/tabline.vim
@@ -57,7 +57,7 @@ function! s:update_tabline()
         \ || isdirectory(expand("<afile>"))
     return
   endif
-  doautocmd User BufMRUChange
+  call airline#util#doautocmd('BufMRUChange')
   " sometimes, the tabline is not correctly updated see #1580
   " so force redraw here
   let &tabline = &tabline
diff --git a/autoload/airline/extensions/tabline/xtabline.vim b/autoload/airline/extensions/tabline/xtabline.vim
index 9ce3c56..e534fd4 100644
--- a/autoload/airline/extensions/tabline/xtabline.vim
+++ b/autoload/airline/extensions/tabline/xtabline.vim
@@ -100,11 +100,11 @@ function! airline#extensions#tabline#xtabline#maps()
         map <unique> <leader>cd2 <Plug>XTablineCdDown2
         map <unique> <leader>cd3 <Plug>XTablineCdDown3
         map <unique> <leader>cdh <Plug>XTablineCdHome
-        nnoremap <unique> <script> <Plug>XTablineCdCurrent :cd %:p:h<cr>:doautocmd BufAdd<cr>:pwd<cr>
-        nnoremap <unique> <script> <Plug>XTablineCdDown1   :cd %:p:h:h<cr>:doautocmd BufAdd<cr>:pwd<cr>
-        nnoremap <unique> <script> <Plug>XTablineCdDown2   :cd %:p:h:h:h<cr>:doautocmd BufAdd<cr>:pwd<cr>
-        nnoremap <unique> <script> <Plug>XTablineCdDown3   :cd %:p:h:h:h:h<cr>:doautocmd BufAdd<cr>:pwd<cr>
-        nnoremap <unique> <script> <Plug>XTablineCdHome    :cd ~<cr>:doautocmd BufAdd<cr>:pwd<cr>
+        nnoremap <unique> <script> <Plug>XTablineCdCurrent :cd %:p:h<cr>:call airline#util#doautocmd('BufAdd')<cr>:pwd<cr>
+        nnoremap <unique> <script> <Plug>XTablineCdDown1   :cd %:p:h:h<cr>:call airline#util#doautocmd('BufAdd')<cr>:pwd<cr>
+        nnoremap <unique> <script> <Plug>XTablineCdDown2   :cd %:p:h:h:h<cr>:call airline#util#doautocmd('BufAdd')<cr>:pwd<cr>
+        nnoremap <unique> <script> <Plug>XTablineCdDown3   :cd %:p:h:h:h:h<cr>:call airline#util#doautocmd('BufAdd')<cr>:pwd<cr>
+        nnoremap <unique> <script> <Plug>XTablineCdHome    :cd ~<cr>:call airline#util#doautocmd('BufAdd')<cr>:pwd<cr>
     endif
 endfunction
 
diff --git a/autoload/airline/util.vim b/autoload/airline/util.vim
index 5656c5c..a037e7e 100644
--- a/autoload/airline/util.vim
+++ b/autoload/airline/util.vim
@@ -8,6 +8,7 @@ scriptencoding utf-8
 
 call airline#init#bootstrap()
 let s:spc = g:airline_symbols.space
+let s:nomodeline = (v:version > 703 || (v:version == 703 && has("patch438"))) ? '<nomodeline>' : ''
 
 function! airline#util#shorten(text, winwidth, minwidth, ...)
   if winwidth(0) < a:winwidth && len(split(a:text, '\zs')) > a:minwidth
@@ -119,3 +120,7 @@ endfunction
 function! airline#util#has_custom_scm()
   return !empty(get(g:, 'airline#extensions#branch#custom_head', ''))
 endfunction
+
+function! airline#util#doautocmd(event)
+  exe printf("silent doautocmd %s User %s", s:nomodeline, a:event)
+endfu
diff --git a/plugin/airline.vim b/plugin/airline.vim
index 3c50f83..c32a1bf 100644
--- a/plugin/airline.vim
+++ b/plugin/airline.vim
@@ -32,7 +32,7 @@ function! s:init()
     silent call s:on_colorscheme_changed()
   endif
 
-  silent doautocmd User AirlineAfterInit
+  call airline#util#doautocmd('AirlineAfterInit')
 endfunction
 
 let s:active_winnr = -1
@@ -86,7 +86,7 @@ function! s:airline_toggle()
     endif
     call airline#highlighter#reset_hlcache()
 
-    silent doautocmd User AirlineToggledOff
+    call airline#util#doautocmd('AirlineToggledOff')
   else
     let s:stl = &statusline
     augroup airline
@@ -133,7 +133,7 @@ function! s:airline_toggle()
       call s:on_window_changed()
     endif
 
-    silent doautocmd User AirlineToggledOn
+    call airline#util#doautocmd('AirlineToggledOn')
   endif
 endfunction
 
@@ -155,11 +155,7 @@ function! s:airline_refresh()
     " disabled
     return
   endif
-  let nomodeline=''
-  if v:version > 703 || v:version == 703 && has("patch438")
-    let nomodeline = '<nomodeline>'
-  endif
-  exe printf("silent doautocmd %s User AirlineBeforeRefresh", nomodeline)
+  call airline#util#doautocmd('AirlineBeforeRefresh')
   call airline#highlighter#reset_hlcache()
   call airline#load_theme()
   call airline#update_statusline()