Group surround related autocommands