Merge "Another round of code deduplication."