Please ignore the patch from my previous email and use this one instead.
(I haven't noticed the emacs-auto-yasnippet is in the upstream already.)