diff --git a/src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource/SourceJavadocToXmldocGrammar.InlineTagsBnfTerms.cs b/src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource/SourceJavadocToXmldocGrammar.InlineTagsBnfTerms.cs
index 6c3255326..d13b68a3a 100644
--- a/src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource/SourceJavadocToXmldocGrammar.InlineTagsBnfTerms.cs
+++ b/src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource/SourceJavadocToXmldocGrammar.InlineTagsBnfTerms.cs
@@ -41,7 +41,8 @@ internal void CreateRules (SourceJavadocToXmldocGrammar grammar)
 
 				InheritDocDeclaration.Rule = grammar.ToTerm ("{@inheritDoc}");
 				InheritDocDeclaration.AstConfig.NodeCreator = (context, parseNode) => {
-					parseNode.AstNode = new XText ("[TODO: @inheritDoc]");
+					// TODO: Iterate through parents for corresponding javadoc element.
+					parseNode.AstNode = new XText ("To be added");
 				};
 
 				LinkDeclaration.Rule = grammar.ToTerm ("{@link") + InlineValue + "}";
@@ -70,11 +71,13 @@ internal void CreateRules (SourceJavadocToXmldocGrammar grammar)
 					| grammar.ToTerm ("{@value") + InlineValue + "}";
 				ValueDeclaration.AstConfig.NodeCreator = (context, parseNode) => {
 					if (parseNode.ChildNodes.Count > 1) {
+						// TODO: Need to convert to appropriate CREF value, use code text for now.
 						var field = parseNode.ChildNodes [1].AstNode.ToString ();
-						parseNode.AstNode = new XText ($"[TODO: @value for `{field}`]");
+						parseNode.AstNode = new XElement ("c", field);
 					}
 					else {
-						parseNode.AstNode = new XText ("[TODO: @value]");
+						// TODO: Display the value of the corresponding static field.
+						parseNode.AstNode = new XText ("To be added");
 					}
 				};
 			}
diff --git a/tests/Java.Interop.Tools.JavaSource-Tests/SourceJavadocToXmldocGrammar.InlineTagsBnfTermsTests.cs b/tests/Java.Interop.Tools.JavaSource-Tests/SourceJavadocToXmldocGrammar.InlineTagsBnfTermsTests.cs
index 06dcd7390..3bb4f9095 100644
--- a/tests/Java.Interop.Tools.JavaSource-Tests/SourceJavadocToXmldocGrammar.InlineTagsBnfTermsTests.cs
+++ b/tests/Java.Interop.Tools.JavaSource-Tests/SourceJavadocToXmldocGrammar.InlineTagsBnfTermsTests.cs
@@ -41,7 +41,7 @@ public void InheritDocDeclaration ()
 
 			var r = p.Parse ("{@inheritDoc}");
 			Assert.IsFalse (r.HasErrors (), DumpMessages (r, p));
-			Assert.AreEqual ("[TODO: @inheritDoc]", r.Root.AstNode.ToString ());
+			Assert.AreEqual ("To be added", r.Root.AstNode.ToString ());
 		}
 
 		[Test]
@@ -82,11 +82,11 @@ public void ValueDeclaration ()
 
 			var r = p.Parse ("{@value}");
 			Assert.IsFalse (r.HasErrors (), DumpMessages (r, p));
-			Assert.AreEqual ("[TODO: @value]", r.Root.AstNode.ToString ());
+			Assert.AreEqual ("To be added", r.Root.AstNode.ToString ());
 
 			r = p.Parse ("{@value #field}");
 			Assert.IsFalse (r.HasErrors (), DumpMessages (r, p));
-			Assert.AreEqual ("[TODO: @value for `#field`]", r.Root.AstNode.ToString ());
+			Assert.AreEqual ("<c>#field</c>", r.Root.AstNode.ToString ());
 		}
 	}
 }