Bug 20478: Refactor to remove code duplication.