First cut of structure-only code generation is nearly there