Changed typedefs to 'using' expressions.