Use proper typename buffer sizes.