diff --git a/src/Ubiquity.NET.Llvm.Tests/DebugInfo/DebugStructTypeTests.cs b/src/Ubiquity.NET.Llvm.Tests/DebugInfo/DebugStructTypeTests.cs
index def30ef20..53302efe9 100644
--- a/src/Ubiquity.NET.Llvm.Tests/DebugInfo/DebugStructTypeTests.cs
+++ b/src/Ubiquity.NET.Llvm.Tests/DebugInfo/DebugStructTypeTests.cs
@@ -9,6 +9,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using Ubiquity.NET.Llvm.DebugInfo;
+using Ubiquity.NET.Llvm.Types;
 
 namespace Ubiquity.NET.Llvm.Tests.DebugInfo
 {
@@ -65,21 +66,34 @@ public void DebugStructType_constructing_empty_anonymous_struct_succeeds( )
             Assert.AreEqual( sourceName, structType.SourceName );
         }
 
-#if NOT_YET_READY_GENERATED
         [TestMethod]
-        public void SetBody_StateUnderTest_ExpectedBehavior( )
+        public void SetBody_with_native_elements_succeeds( )
         {
-            var debugStructType = new DebugStructType( TODO, TODO, TODO, TODO, TODO, TODO, TODO, TODO, TODO, TODO, TODO, TODO );
+            using var context = new Context( );
+            using var testModule = context.CreateBitcodeModule( "test" );
+
+            var file = testModule.DIBuilder.CreateFile( "test.foo" );
+            uint line = 1234;
+            string sourceName = string.Empty;
+            string linkageName = string.Empty;
+
+            var debugStructType = new DebugStructType( testModule, linkageName, file, sourceName, file, line );
             bool packed = false;
-            ITypeRef[ ] elements = null;
+            var elements = new ITypeRef[] { context.Float128Type, context.Int32Type, context.Int64Type };
 
             debugStructType.SetBody(
                 packed,
                 elements );
 
-            Assert.Inconclusive( );
+            Assert.AreEqual( elements.Length, debugStructType.Members.Count );
+            for(int i =0; i < elements.Length; ++i )
+            {
+                Assert.AreSame( elements[ i ], debugStructType.Members[ i ] );
+            }
         }
 
+#if NOT_YET_READY_GENERATED
+
         [TestMethod]
         public void SetBody_StateUnderTest_ExpectedBehavior1( )
         {
diff --git a/src/Ubiquity.NET.Llvm/Context.cs b/src/Ubiquity.NET.Llvm/Context.cs
index e8f331ff2..c9c2655eb 100644
--- a/src/Ubiquity.NET.Llvm/Context.cs
+++ b/src/Ubiquity.NET.Llvm/Context.cs
@@ -396,7 +396,7 @@ public Constant CreateNamedConstantStruct( IStructType type, IEnumerable<Constan
         }
 
         /// <summary>Create an opaque structure type (e.g. a forward reference)</summary>
-        /// <param name="name">Name of the type</param>
+        /// <param name="name">Name of the type (use <see cref="string.Empty"/> for anonymous types)</param>
         /// <remarks>
         /// This method creates an opaque type. The <see cref="IStructType.SetBody(bool, ITypeRef[])"/>
         /// method provides a means to add a body, including indication of packed status, to an opaque
@@ -406,7 +406,7 @@ public Constant CreateNamedConstantStruct( IStructType type, IEnumerable<Constan
         /// <returns>New type</returns>
         public IStructType CreateStructType( string name )
         {
-            name.ValidateNotNullOrWhiteSpace( nameof( name ) );
+            name.ValidateNotNull( nameof( name ) );
             var handle = LLVMStructCreateNamed( ContextHandle, name );
             return TypeRef.FromHandle<IStructType>( handle.ThrowIfInvalid( ) )!;
         }
diff --git a/src/Ubiquity.NET.Llvm/IOperandCollection.cs b/src/Ubiquity.NET.Llvm/IOperandCollection.cs
index 536060cf8..1bdd1357b 100644
--- a/src/Ubiquity.NET.Llvm/IOperandCollection.cs
+++ b/src/Ubiquity.NET.Llvm/IOperandCollection.cs
@@ -33,10 +33,10 @@ public interface IOperandCollection<T>
         bool Contains( T item );
 
         /// <summary>Creates a slice of the collection</summary>
-        /// <param name="start">inclusive start index for the slice</param>
+        /// <param name="start">Inclusive start index for the slice</param>
         /// <param name="end">Exclusive end index for the slice</param>
         /// <returns>Slice of the collection</returns>
-        [SuppressMessage( "Naming", "CA1716:Identifiers should not match keywords", Justification = "Name is consistent with System.Range parameters" )]
+        [SuppressMessage( "Naming", "CA1716:Identifiers should not match keywords", Justification = "Naming is consistent with System.Range parameters" )]
         IOperandCollection<T> Slice( int start, int end )
         {
             return new OperandCollectionSlice<T>( this, new Range( start, end ) );
diff --git a/src/Ubiquity.NET.Llvm/IOperandContainer.cs b/src/Ubiquity.NET.Llvm/IOperandContainer.cs
deleted file mode 100644
index adfce4f9c..000000000
--- a/src/Ubiquity.NET.Llvm/IOperandContainer.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="IOperandContainer.cs" company="Ubiquity.NET Contributors">
-// Copyright (c) Ubiquity.NET Contributors. All rights reserved.
-// </copyright>
-// -----------------------------------------------------------------------
-
-/*
-using System;
-using System.Diagnostics.CodeAnalysis;
-
-namespace Ubiquity.NET.Llvm
-{
-    /// <summary>Internal interface to provide raw access to operands of a container type</summary>
-    /// <typeparam name="T">type of operands</typeparam>
-    /// <remarks>
-    /// This is used to build an operand list for multiple container types that is ultimately
-    /// exposed as a public property on the container.
-    /// </remarks>
-    internal interface IOperandContainer<T>
-        where T : class
-    {
-        /// <summary>Gets the count of operands in the container</summary>
-        long Count { get; }
-
-        /// <summary>Gets an operand from the container</summary>
-        /// <param name="index">Raw index of the operand in the container</param>
-        /// <returns>Operand from the container</returns>
-        TItem? GetRawOperandAt<TItem>( int index )
-            where TItem : class, T;
-
-        /// <summary>Sets an operand in the container</summary>
-        /// <param name="index">Raw index of the operand in the container</param>
-        /// <param name="value">Value to set at the index</param>
-        void SetRawOperandAt( int index, T? value );
-
-        /// <summary>Adds an item to the end of the container (i.e. append)</summary>
-        /// <param name="item">item to add</param>
-        /// <exception cref="NotSupportedException">If the container doesn't support adding items</exception>
-        /// <exception cref="ArgumentNullException">If the container doesn't support adding null items</exception>
-        void Add( T? item );
-    }
-}
-*/