Fixing fallout from Rust changes to variant and struct namespacing.