Even more code deduplication