Eliminating some pointless template specializations