Improved integration of yasnippet