X-Git-Url: http://nitlanguage.org

diff --git a/src/metrics/rta_metrics.nit b/src/metrics/rta_metrics.nit
index 1224513..00f9d02 100644
--- a/src/metrics/rta_metrics.nit
+++ b/src/metrics/rta_metrics.nit
@@ -17,12 +17,10 @@
 # Metrics from RTA
 module rta_metrics
 
-import modelbuilder
 private import rapid_type_analysis
-private import metrics_base
+import metrics_base
 import mmodules_metrics
 import mclasses_metrics
-import frontend
 
 redef class ToolContext
 	var rta_metrics_phase: Phase = new RTAMetricsPhase(self, null)
@@ -376,7 +374,7 @@ redef class RapidTypeAnalysis
 		super
 		tnlc.values.inc(mtype)
 
-		mtype = mtype.as_notnullable
+		mtype = mtype.undecorate
 		if mtype isa MClassType then
 			cnlc.values.inc(mtype.mclass)
 		end
@@ -387,7 +385,7 @@ end
 
 redef class MType
 	private fun signature_depth: Int do
-		var mtype = self.as_notnullable
+		var mtype = self.undecorate
 		if not mtype isa MGenericType then return 0
 
 		var depth = 0