Improve vim-surround expander