Minor source changes for clearer interop w/C#.