clean up template parameter passing based on suggestions from chip
clean up template parameter passing based on suggestions from chip

toffaletti/libten,toffaletti/libten,toffaletti/libten,toffaletti/libten,toffaletti/libten