Tune-ups to get Rhino3dmIo build back to no compile errors