Merge "Deduplicate some more code"