More 20x4 changes
more autogeneration, less typing
Formatting to help the defs file layout