Working on code quality.
Merge branch 'master' of github.com:bolt/bolt
Tiny bit more code cleanup.