diff --git a/ILSpy/ExtensionMethods.cs b/ILSpy/ExtensionMethods.cs
index 52cc0d125..61361f2d8 100644
--- a/ILSpy/ExtensionMethods.cs
+++ b/ILSpy/ExtensionMethods.cs
@@ -18,8 +18,8 @@
 
 using System;
 using System.Collections.Generic;
-using ICSharpCode.Decompiler;
 using Mono.Cecil;
+using ICSharpCode.ILSpy.Options;
 
 namespace ICSharpCode.ILSpy
 {
@@ -47,5 +47,13 @@ namespace ICSharpCode.ILSpy
 			}
 			return false;
 		}
+		
+		public static string ToSuffixString(this MetadataToken token)
+		{
+			if (!DisplaySettingsPanel.CurrentDisplaySettings.ShowMetadataTokens)
+				return string.Empty;
+			
+			return " @" + token.ToInt32().ToString("x8");
+		}
 	}
 }
diff --git a/ILSpy/Options/DisplaySettings.cs b/ILSpy/Options/DisplaySettings.cs
index 447edeb9e..eddefb313 100644
--- a/ILSpy/Options/DisplaySettings.cs
+++ b/ILSpy/Options/DisplaySettings.cs
@@ -88,10 +88,8 @@ namespace ICSharpCode.ILSpy.Options
 		public bool ShowMetadataTokens
 		{
 			get { return showMetadataTokens; }
-			set
-			{
-				if (showMetadataTokens != value)
-				{
+			set {
+				if (showMetadataTokens != value) {
 					showMetadataTokens = value;
 					OnPropertyChanged("ShowMetadataTokens");
 				}
diff --git a/ILSpy/TreeNodes/AssemblyReferenceTreeNode.cs b/ILSpy/TreeNodes/AssemblyReferenceTreeNode.cs
index 60a8a2359..e95b6d140 100644
--- a/ILSpy/TreeNodes/AssemblyReferenceTreeNode.cs
+++ b/ILSpy/TreeNodes/AssemblyReferenceTreeNode.cs
@@ -18,7 +18,6 @@
 
 using System;
 using ICSharpCode.Decompiler;
-using ICSharpCode.ILSpy.Options;
 using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes
@@ -43,13 +42,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 		}
 		
 		public override object Text {
-			get
-			{
-				return r.Name +
-					(DisplaySettingsPanel.CurrentDisplaySettings.ShowMetadataTokens ?
-					" @" + r.MetadataToken.ToInt32().ToString("x8") :
-					"");
-			}
+			get { return r.Name + r.MetadataToken.ToSuffixString(); }
 		}
 		
 		public override object Icon {
diff --git a/ILSpy/TreeNodes/BaseTypesEntryNode.cs b/ILSpy/TreeNodes/BaseTypesEntryNode.cs
index a96c0caae..7eaf4ed98 100644
--- a/ILSpy/TreeNodes/BaseTypesEntryNode.cs
+++ b/ILSpy/TreeNodes/BaseTypesEntryNode.cs
@@ -19,7 +19,6 @@
 using System;
 using System.Linq;
 using ICSharpCode.Decompiler;
-using ICSharpCode.ILSpy.Options;
 using ICSharpCode.TreeView;
 using Mono.Cecil;
 
@@ -48,13 +47,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 
 		public override object Text
 		{
-			get
-			{
-				return this.Language.TypeToString(tr, true) +
-					(DisplaySettingsPanel.CurrentDisplaySettings.ShowMetadataTokens ?
-					" @" + tr.MetadataToken.ToInt32().ToString("x8") :
-					"");
-			}
+			get { return this.Language.TypeToString(tr, true) + tr.MetadataToken.ToSuffixString(); }
 		}
 
 		public override object Icon
diff --git a/ILSpy/TreeNodes/DerivedTypesEntryNode.cs b/ILSpy/TreeNodes/DerivedTypesEntryNode.cs
index 734f949c4..7f3a3b274 100644
--- a/ILSpy/TreeNodes/DerivedTypesEntryNode.cs
+++ b/ILSpy/TreeNodes/DerivedTypesEntryNode.cs
@@ -20,7 +20,6 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 using ICSharpCode.Decompiler;
-using ICSharpCode.ILSpy.Options;
 using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes
@@ -46,13 +45,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 
 		public override object Text
 		{
-			get
-			{
-				return this.Language.TypeToString(type, true) +
-					(DisplaySettingsPanel.CurrentDisplaySettings.ShowMetadataTokens ?
-					" @" + type.MetadataToken.ToInt32().ToString("x8") :
-					"");
-			}
+			get { return this.Language.TypeToString(type, true) + type.MetadataToken.ToSuffixString(); }
 		}
 
 		public override object Icon
diff --git a/ILSpy/TreeNodes/EventTreeNode.cs b/ILSpy/TreeNodes/EventTreeNode.cs
index 9621b0816..291c23f96 100644
--- a/ILSpy/TreeNodes/EventTreeNode.cs
+++ b/ILSpy/TreeNodes/EventTreeNode.cs
@@ -19,7 +19,6 @@
 using System;
 using System.Windows.Media;
 using ICSharpCode.Decompiler;
-using ICSharpCode.ILSpy.Options;
 using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes
@@ -56,13 +55,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 		
 		public override object Text
 		{
-			get
-			{
-				return GetText(ev, this.Language) +
-					(DisplaySettingsPanel.CurrentDisplaySettings.ShowMetadataTokens ?
-					" @" + ev.MetadataToken.ToInt32().ToString("x8") :
-					"");
-			}
+			get { return GetText(ev, this.Language) + ev.MetadataToken.ToSuffixString(); }
 		}
 
 		public static object GetText(EventDefinition eventDef, Language language)
diff --git a/ILSpy/TreeNodes/FieldTreeNode.cs b/ILSpy/TreeNodes/FieldTreeNode.cs
index 30ab2ad0b..ef8ddef4c 100644
--- a/ILSpy/TreeNodes/FieldTreeNode.cs
+++ b/ILSpy/TreeNodes/FieldTreeNode.cs
@@ -19,7 +19,6 @@
 using System;
 using System.Windows.Media;
 using ICSharpCode.Decompiler;
-using ICSharpCode.ILSpy.Options;
 using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes
@@ -45,14 +44,11 @@ namespace ICSharpCode.ILSpy.TreeNodes
 
 		public override object Text
 		{
-			get
-			{
+			get {
 				return HighlightSearchMatch(
 					field.Name,
-					" : " + this.Language.TypeToString(field.FieldType, false, field) +
-						(DisplaySettingsPanel.CurrentDisplaySettings.ShowMetadataTokens ?
-						" @" + field.MetadataToken.ToInt32().ToString("x8") :
-						""));
+					" : " + this.Language.TypeToString(field.FieldType, false, field) + field.MetadataToken.ToSuffixString()
+				);
 			}
 		}
 
diff --git a/ILSpy/TreeNodes/MethodTreeNode.cs b/ILSpy/TreeNodes/MethodTreeNode.cs
index 1a012ffa5..d6b33bcb5 100644
--- a/ILSpy/TreeNodes/MethodTreeNode.cs
+++ b/ILSpy/TreeNodes/MethodTreeNode.cs
@@ -21,7 +21,6 @@ using System.Text;
 using System.Windows.Media;
 
 using ICSharpCode.Decompiler;
-using ICSharpCode.ILSpy.Options;
 using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes
@@ -69,10 +68,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			}
 			b.Append(") : ");
 			b.Append(language.TypeToString(method.ReturnType, false, method.MethodReturnType));
-			if (DisplaySettingsPanel.CurrentDisplaySettings.ShowMetadataTokens)
-			{
-				b.Append(" @" + method.MetadataToken.ToInt32().ToString("x8"));
-			}
+			b.Append(method.MetadataToken.ToSuffixString());
 			return HighlightSearchMatch(method.Name, b.ToString());
 		}
 
diff --git a/ILSpy/TreeNodes/ModuleReferenceTreeNode.cs b/ILSpy/TreeNodes/ModuleReferenceTreeNode.cs
index d2888980b..ae2b54205 100644
--- a/ILSpy/TreeNodes/ModuleReferenceTreeNode.cs
+++ b/ILSpy/TreeNodes/ModuleReferenceTreeNode.cs
@@ -18,7 +18,6 @@
 
 using System;
 using ICSharpCode.Decompiler;
-using ICSharpCode.ILSpy.Options;
 using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes
@@ -38,13 +37,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 		}
 		
 		public override object Text {
-			get
-			{
-				return r.Name +
-					(DisplaySettingsPanel.CurrentDisplaySettings.ShowMetadataTokens ?
-					" @" + r.MetadataToken.ToInt32().ToString("x8") :
-					"");
-			}
+			get { return r.Name + r.MetadataToken.ToSuffixString(); }
 		}
 		
 		public override object Icon {
diff --git a/ILSpy/TreeNodes/PropertyTreeNode.cs b/ILSpy/TreeNodes/PropertyTreeNode.cs
index 166a337b0..76cd12dd5 100644
--- a/ILSpy/TreeNodes/PropertyTreeNode.cs
+++ b/ILSpy/TreeNodes/PropertyTreeNode.cs
@@ -19,7 +19,6 @@
 using System;
 using System.Windows.Media;
 using ICSharpCode.Decompiler;
-using ICSharpCode.ILSpy.Options;
 using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes
@@ -58,13 +57,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 
 		public override object Text
 		{
-			get
-			{
-				return GetText(property, Language, isIndexer) +
-					(DisplaySettingsPanel.CurrentDisplaySettings.ShowMetadataTokens ?
-					" @" + property.MetadataToken.ToInt32().ToString("x8") :
-					"");
-			}
+			get { return GetText(property, Language, isIndexer) + property.MetadataToken.ToSuffixString(); }
 		}
 
 		public static object GetText(PropertyDefinition property, Language language, bool? isIndexer = null)
diff --git a/ILSpy/TreeNodes/TypeTreeNode.cs b/ILSpy/TreeNodes/TypeTreeNode.cs
index 47e2604f0..38cf099e6 100644
--- a/ILSpy/TreeNodes/TypeTreeNode.cs
+++ b/ILSpy/TreeNodes/TypeTreeNode.cs
@@ -22,7 +22,6 @@ using System.Linq;
 using System.Windows.Media;
 
 using ICSharpCode.Decompiler;
-using ICSharpCode.ILSpy.Options;
 using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes
@@ -60,14 +59,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 		}
 		
 		public override object Text {
-			get
-			{
-				return HighlightSearchMatch(
-					this.Language.FormatTypeName(type),
-					DisplaySettingsPanel.CurrentDisplaySettings.ShowMetadataTokens ?
-						" @" + type.MetadataToken.ToInt32().ToString("x8") :
-						"");
-			}
+			get { return HighlightSearchMatch(this.Language.FormatTypeName(type), type.MetadataToken.ToSuffixString()); }
 		}
 		
 		public override bool IsPublicAPI {