More cleanup
No need to comment, @capitaomorte fixed capitaomorte/yasnippet#546
Ensure ibuffer always