Integrate changes from varepsilon/ultisnips