Remove a couple unneeded typedefs