Some continued work on new-style templates and associated test code changes.  Legacy template functions
are marked with "legacy_" for possible future removal.