Improved some of my snippets to work better with my completion.