Remove unnecessary casts to non-const to fix -Werror=cast-qual issue during make distcheck
Be more consistent about using the VCL typedefs