Further improvements to data types and structures.