Correctly null out template{Content,Else}Block