Added more convenient typedef blocks.