Minor tweaks to yasnippet.