Making the generated files prettier (again)