Make sure the current template is maintained correctly.  Added option for pre-instance factories for result tree fragments.

13 files changed