Get rid of some more template functions