Replace using-clauses with typedefs.

More compatible with slightly crustier compilers, eg gcc4.6.