Bug 937793 - Tweaks to template-array creation.  r=bhackett

--HG--
extra : rebase_source : dd75409a458a1ef5a6379251edb75f026d52c94c