Back to a cleaner modular way.

Maintaining invariants on highly parametric features is too brainfuck.