Fixed creation/deletion to use templatehandler template instance when
available.