Minor refactoring.
Merge.