Review2.6.2

Don't we also have these typedefs elsewhere?