More data type cleanup in the renderer.