Missed one.
Remove unused variable.
Move default message logic where it belongs.
Inline method.
Merge branch 'master' into gh-pages
Update docs.