Towards more usage of code generation
Towards YAML again, ironically...