Be more consistent about using the VCL typedefs