Use typedefs in place of long templated classes