3.0 Separate default templates and runtime templates.

This makes for fewer workarounds with managing templates vs. having duplicate conditions for handling string/array templates.

Fixes #3142