Minor template fixes for pickier gcc/clang on recent Colleciton template changes