More code deduplication