Partial update to python generation script

The templates are diverging and the python script is out of step with
templates.  Log issue and discuss with Kerfoot.