Improvements to yasnippet support