Remove yasnippet $0's, they just end up adding a newline.
Reorder yasnippets for function snippet layout.
Missed a $0 removal.