Alter #251: Made non-g mode behave more like in the original surround.vim.