Move (again) some autocmd into a group