High time I updated this with Ultisnips, etc.