Goodies Templates: update some goodies for auto-template usage.

Testing these in duckpan will depend upon the changes in that repository
being integrated.