Minor refactoring.
Merge branch 'protofinal' of https://github.com/zippers/gear into protofinal
Refactor.