Some general adder tricks hidden inside custom components. Explanation of CCs:
stiB: An upiside-down bit splitter for aesthetics
GP + X: The left output (and all cyan wires) is a two-bit line containing Generate (AND) and Propagate (OR) terms. The right (pink) output is XOR.
Black: Given two two-bit Generate/Propagate lines, outputs a merged G/P line. G' = (G0&P1) | G1. P' = P0&P1
Gray: Given two two-bit Generate/Propagate lines, outputs a merged Generate bit. G' = (G0&P1) | G1
G: Pulls the generate bit out of a G/P line
Cyan wires are 2-bit G/P lines. Pink wires are XOR. Green wires are carry bits.
This can be improved significantly from the score you see by sacrificing clarity, but I think it's a good starting point for relating things back to the way diagrams are drawn for these things. Hopefully it helps someone.