Remove unnecessary template parameters and fix template instantiation/specialization order issue
Remove unnecessary template parameters and fix template instantiation/specialization order issue

devinamatthews/marray,devinamatthews/marray,devinamatthews/marray