C-S-RET and C-RET now do these, respectively.
Description
My .emacs.d directory
Languages
Emacs Lisp
90.2%
YASnippet
9.8%