Address review feedback.

Author: jpobst

src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FindJavaObjectsStep.cs

@@ -85,8 +85,10 @@ List<CallableWrapperType> ConvertToCallableWrappers (List<TypeDefinition> types)
 		if (UseMarshalMethods)
 			reader_options.MethodClassifier = new MarshalMethodsClassifier (Context, Context.Resolver, Log);
 
-		foreach (var type in types)
-			wrappers.Add (CecilImporter.CreateType (type, Context, reader_options));
+		foreach (var type in types) {
+			var wrapper = CecilImporter.CreateType (type, Context, reader_options);
+			wrappers.Add (wrapper);
+		}
 
 		return wrappers;
 	}

src/Xamarin.Android.Build.Tasks/Tasks/GenerateACWMap.cs

@@ -74,7 +74,7 @@ void GenerateMap ()
 				return;
 			}
 
-			var xml = JavaObjectsXmlFile.Import (wrappersPath, JavaObjectsXmlFileReadType.ACW);
+			var xml = JavaObjectsXmlFile.Import (wrappersPath, JavaObjectsXmlFileReadType.AndroidResourceFixups);
 
 			entries.AddRange (xml.ACWMapEntries);
 		}

src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaCallableWrappers.cs

@@ -69,7 +69,7 @@ void GenerateWrappers (List<ITaskItem> assemblies)
 				return;
 			}
 
-			var xml = JavaObjectsXmlFile.Import (wrappersPath, JavaObjectsXmlFileReadType.JCW);
+			var xml = JavaObjectsXmlFile.Import (wrappersPath, JavaObjectsXmlFileReadType.JavaCallableWrappers);
 
 			if (xml.JavaCallableWrappers.Count == 0) {
 				Log.LogDebugMessage ($"'{wrappersPath}' is empty, skipping.");

src/Xamarin.Android.Build.Tasks/Utilities/JavaObjectsXmlFile.cs

@@ -107,10 +107,10 @@ public static JavaObjectsXmlFile Import (string filename, JavaObjectsXmlFileRead
 		var xml = XDocument.Load (filename);
 
 		// We let callers specify which part(s) of the file they want to deserialize to save time
-		if (readType.HasFlag (JavaObjectsXmlFileReadType.JCW) && xml.Root?.Element ("jcw-types") is XElement jcw)
+		if (readType.HasFlag (JavaObjectsXmlFileReadType.JavaCallableWrappers) && xml.Root?.Element ("jcw-types") is XElement jcw)
 			file.JavaCallableWrappers.AddRange (XmlImporter.Import (jcw));
 
-		if (readType.HasFlag (JavaObjectsXmlFileReadType.ACW) && xml.Root?.Element ("acw-types") is XElement acw) {
+		if (readType.HasFlag (JavaObjectsXmlFileReadType.AndroidResourceFixups) && xml.Root?.Element ("acw-types") is XElement acw) {
 			var partialAssemblyName = acw.GetAttributeOrDefault ("partial-assembly-name", string.Empty);
 			var moduleName = acw.GetAttributeOrDefault ("module-name", string.Empty);
 
@@ -136,6 +136,6 @@ public static void WriteEmptyFile (string destination, TaskLoggingHelper log)
 enum JavaObjectsXmlFileReadType
 {
 	None = 0,
-	ACW = 1,
-	JCW = 2,
+	AndroidResourceFixups = 1,
+	JavaCallableWrappers = 2,
 }