Minor refactoring.
Merge branch 'master' into gc-proto-v1