Centralize expansion

Merge expansion and use predefined helpers to reduce the number of places to apply a patch.

This is constantly faster according to benchmarks, but by an insignificant margin (0.5%).