Small changes to the autogeneration script, to improve output.