Improvements and workarounds for yasnippet, but still goofy and bad
results.