DNAOp: Make use of template keyword for dependent templates
DNAOp: Make use of template keyword for dependent templates

Prevents potential ambiguities from occurring.

libAthena/Athena,libAthena/Athena