From f1d3209522d48cdac37e9449890defcdadd93aa9 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 25 Mar 2021 14:15:24 -0500
Subject: [PATCH 01/91] Implement taglets for OpField-related parameters

---
 pom.xml                                       | 19 ++++-
 .../src/main/java/module-info.java            |  1 +
 .../main/java/org/scijava/ops/math/Power.java |  7 ++
 scijava/scijava-taglets/pom.xml               | 80 +++++++++++++++++++
 .../org/scijava/taglets/ContainerTaglet.java  | 21 +++++
 .../java/org/scijava/taglets/InputTaglet.java | 21 +++++
 .../org/scijava/taglets/MutableTaglet.java    | 21 +++++
 .../org/scijava/taglets/OutputTaglet.java     | 21 +++++
 .../java/org/scijava/taglets/ParamTaglet.java | 69 ++++++++++++++++
 9 files changed, 257 insertions(+), 3 deletions(-)
 create mode 100644 scijava/scijava-taglets/pom.xml
 create mode 100644 scijava/scijava-taglets/src/main/java/org/scijava/taglets/ContainerTaglet.java
 create mode 100644 scijava/scijava-taglets/src/main/java/org/scijava/taglets/InputTaglet.java
 create mode 100644 scijava/scijava-taglets/src/main/java/org/scijava/taglets/MutableTaglet.java
 create mode 100644 scijava/scijava-taglets/src/main/java/org/scijava/taglets/OutputTaglet.java
 create mode 100644 scijava/scijava-taglets/src/main/java/org/scijava/taglets/ParamTaglet.java

diff --git a/pom.xml b/pom.xml
index 088fe85f3..d88e52e8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,6 +50,7 @@
 		<module>scijava/scijava-persist</module>
 		<module>scijava/scijava-function</module>
 		<module>scijava/scijava-ops</module>
+		<module>scijava/scijava-taglets</module>
 		<module>scijava/scijava-testutil</module>
 		<module>scijava/scijava-types</module>
 	</modules>
@@ -77,9 +78,6 @@
 		<scijava.javadoc.url.java>https://javadoc.scijava.org/Java11/</scijava.javadoc.url.java>
 		<scijava.javadoc.url.javafx>https://javadoc.scijava.org/JavaFX11/</scijava.javadoc.url.javafx>
 
-		<!-- NB: Javadoc has issues with JPMS... for now we skip it. -->
-		<maven.javadoc.skip>true</maven.javadoc.skip>
-		<javadoc.skip>true</javadoc.skip>
 		<doclint>none</doclint>
 
 		<!-- NB: Deploy releases to the SciJava Maven repository. -->
@@ -106,6 +104,21 @@
 					</annotationProcessorPaths>
 				</configuration>
 			</plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<tagletArtifacts>
+						<tagletArtifact>
+							<groupId>org.scijava</groupId>
+							<artifactId>scijava-taglets</artifactId>
+							<version>${project.version}</version>
+						</tagletArtifact>
+					</tagletArtifacts>
+					<links>
+						<link>https://javadoc.scijava.org/Java11</link>
+					</links>
+				</configuration>
+			</plugin>
 		</plugins>
 		<pluginManagement>
 			<plugins>
diff --git a/scijava/scijava-ops/src/main/java/module-info.java b/scijava/scijava-ops/src/main/java/module-info.java
index 1fbb401dc..92370bd77 100644
--- a/scijava/scijava-ops/src/main/java/module-info.java
+++ b/scijava/scijava-ops/src/main/java/module-info.java
@@ -7,6 +7,7 @@
 	exports org.scijava.ops.hints;
 	exports org.scijava.ops.matcher;
 	exports org.scijava.ops.provenance;
+	exports org.scijava.ops.math;
 	exports org.scijava.ops.simplify;
 	exports org.scijava.ops.conversionLoss;
 	// TODO: move OpWrapper to its own package (org.scijava.ops.wrap??)
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Power.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Power.java
index f0e31ef3e..1be85150e 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Power.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Power.java
@@ -12,6 +12,13 @@ public class Power {
 
 	public static final String NAMES = MathOps.POW;
 
+	/**
+	 * Computes the value of a number raised to the given power.
+	 * 
+	 * @input number The number to exponentiate.
+	 * @input exponent The power to which to raise the number.
+	 * @output result The number raised to the exponent.
+	 */
 	@OpField(names = NAMES, params = "number, exponent, result")
 	public static final BiFunction<Double, Double, Double> MathPowerDoubleFunction = (base, exp) -> Math.pow(base, exp);
 
diff --git a/scijava/scijava-taglets/pom.xml b/scijava/scijava-taglets/pom.xml
new file mode 100644
index 000000000..67c441837
--- /dev/null
+++ b/scijava/scijava-taglets/pom.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.scijava</groupId>
+		<artifactId>scijava-incubator</artifactId>
+		<version>0-SNAPSHOT</version>
+		<relativePath>../..</relativePath>
+	</parent>
+
+	<artifactId>scijava-taglets</artifactId>
+
+	<name>SciJava Taglets</name>
+	<description>SciJava Taglets: custom javadoc taglets.</description>
+	<url>https://github.com/scijava/scijava-taglets</url>
+	<inceptionYear>2021</inceptionYear>
+	<organization>
+		<name>SciJava</name>
+		<url>https://scijava.org/</url>
+	</organization>
+	<licenses>
+		<license>
+			<name>Simplified BSD License</name>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+
+	<developers>
+		<developer>
+			<id>ctrueden</id>
+			<name>Curtis Rueden</name>
+			<url>https://imagej.net/User:Rueden</url>
+			<roles>
+				<role>founder</role>
+				<role>lead</role>
+				<role>reviewer</role>
+				<role>support</role>
+				<role>maintainer</role>
+			</roles>
+		</developer>
+	</developers>
+	<contributors>
+		<contributor>
+			<name>None</name>
+		</contributor>
+	</contributors>
+
+	<mailingLists>
+		<mailingList>
+			<name>Image.sc Forum</name>
+			<archive>https://forum.image.sc/tags/scijava</archive>
+		</mailingList>
+	</mailingLists>
+
+	<scm>
+		<connection>scm:git:git://github.com/scijava/incubator</connection>
+		<developerConnection>scm:git:git@github.com:scijava/incubator</developerConnection>
+		<tag>HEAD</tag>
+		<url>https://github.com/scijava/incubator</url>
+	</scm>
+	<issueManagement>
+		<system>GitHub Issues</system>
+		<url>https://github.com/scijava/scijava/issues</url>
+	</issueManagement>
+	<ciManagement>
+		<system>Travis CI</system>
+		<url>https://travis-ci.com/scijava/incubator</url>
+	</ciManagement>
+
+	<properties>
+		<package-name>org.scijava.taglets</package-name>
+
+		<license.licenseName>bsd_2</license.licenseName>
+		<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
+	</properties>
+
+	<dependencies>
+	</dependencies>
+</project>
diff --git a/scijava/scijava-taglets/src/main/java/org/scijava/taglets/ContainerTaglet.java b/scijava/scijava-taglets/src/main/java/org/scijava/taglets/ContainerTaglet.java
new file mode 100644
index 000000000..5b01c5322
--- /dev/null
+++ b/scijava/scijava-taglets/src/main/java/org/scijava/taglets/ContainerTaglet.java
@@ -0,0 +1,21 @@
+package org.scijava.taglets;
+
+import java.util.Map;
+
+import jdk.javadoc.doclet.Taglet;
+
+/**
+ * A taglet handling {@code @container} tags.
+ * 
+ * @author Curtis Rueden
+ */
+public class ContainerTaglet extends ParamTaglet {
+
+	public static void register(Map<String, Taglet> tagletMap) {
+		new ContainerTaglet().registerMe(tagletMap);
+	}
+
+	public ContainerTaglet() {
+		super("Container");
+	}
+}
\ No newline at end of file
diff --git a/scijava/scijava-taglets/src/main/java/org/scijava/taglets/InputTaglet.java b/scijava/scijava-taglets/src/main/java/org/scijava/taglets/InputTaglet.java
new file mode 100644
index 000000000..44d0b9799
--- /dev/null
+++ b/scijava/scijava-taglets/src/main/java/org/scijava/taglets/InputTaglet.java
@@ -0,0 +1,21 @@
+package org.scijava.taglets;
+
+import java.util.Map;
+
+import jdk.javadoc.doclet.Taglet;
+
+/**
+ * A taglet handling {@code @input} tags.
+ * 
+ * @author Curtis Rueden
+ */
+public class InputTaglet extends ParamTaglet {
+
+	public static void register(Map<String, Taglet> tagletMap) {
+		new InputTaglet().registerMe(tagletMap);
+	}
+
+	public InputTaglet() {
+		super("Input");
+	}
+}
\ No newline at end of file
diff --git a/scijava/scijava-taglets/src/main/java/org/scijava/taglets/MutableTaglet.java b/scijava/scijava-taglets/src/main/java/org/scijava/taglets/MutableTaglet.java
new file mode 100644
index 000000000..357c6919b
--- /dev/null
+++ b/scijava/scijava-taglets/src/main/java/org/scijava/taglets/MutableTaglet.java
@@ -0,0 +1,21 @@
+package org.scijava.taglets;
+
+import java.util.Map;
+
+import jdk.javadoc.doclet.Taglet;
+
+/**
+ * A taglet handling {@code @mutable} tags.
+ * 
+ * @author Curtis Rueden
+ */
+public class MutableTaglet extends ParamTaglet {
+
+	public static void register(Map<String, Taglet> tagletMap) {
+		new MutableTaglet().registerMe(tagletMap);
+	}
+
+	public MutableTaglet() {
+		super("Mutable");
+	}
+}
\ No newline at end of file
diff --git a/scijava/scijava-taglets/src/main/java/org/scijava/taglets/OutputTaglet.java b/scijava/scijava-taglets/src/main/java/org/scijava/taglets/OutputTaglet.java
new file mode 100644
index 000000000..ab88a1033
--- /dev/null
+++ b/scijava/scijava-taglets/src/main/java/org/scijava/taglets/OutputTaglet.java
@@ -0,0 +1,21 @@
+package org.scijava.taglets;
+
+import java.util.Map;
+
+import jdk.javadoc.doclet.Taglet;
+
+/**
+ * A taglet handling {@code @output} tags.
+ * 
+ * @author Curtis Rueden
+ */
+public class OutputTaglet extends ParamTaglet {
+
+	public static void register(Map<String, Taglet> tagletMap) {
+		new OutputTaglet().registerMe(tagletMap);
+	}
+
+	public OutputTaglet() {
+		super("Output");
+	}
+}
\ No newline at end of file
diff --git a/scijava/scijava-taglets/src/main/java/org/scijava/taglets/ParamTaglet.java b/scijava/scijava-taglets/src/main/java/org/scijava/taglets/ParamTaglet.java
new file mode 100644
index 000000000..06a55c661
--- /dev/null
+++ b/scijava/scijava-taglets/src/main/java/org/scijava/taglets/ParamTaglet.java
@@ -0,0 +1,69 @@
+package org.scijava.taglets;
+
+import com.sun.source.doctree.DocTree;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.lang.model.element.Element;
+
+import jdk.javadoc.doclet.Taglet;
+
+public abstract class ParamTaglet implements Taglet {
+
+	private final String tagName;
+	private final String title;
+
+	protected ParamTaglet(final String title) {
+		this.tagName = title.toLowerCase();
+		this.title = title;
+	}
+
+	@Override
+	public Set<Location> getAllowedLocations() {
+		return Collections.singleton(Location.FIELD);
+	}
+
+	@Override
+	public boolean isInlineTag() {
+		return false;
+	}
+
+	@Override
+	public String getName() {
+		return tagName;
+	}
+
+	@Override
+	public String toString(List<? extends DocTree> tags, Element element) {
+		return "\n<dt><span class=\"paramLabel\">" + title + " parameters:</span></dt>\n" + //
+				String.join("", tags.stream()//
+						.map(tag -> "<dd>" + tagToHTML(tag) + "</dd>\n")//
+						.collect(Collectors.toList()));
+	}
+
+	/** Reformats the tag content to match the HTML we want to have. */
+	private String tagToHTML(final DocTree tag) {
+		// Strip the leading tag string.
+		final String text = tag.toString().trim().replaceFirst("^@" + tagName, "").trim();
+		// Extract parameter name.
+		final String paramName = text.replaceFirst("\\s.*", "");
+		// Extract parameter description, if any.
+		final String description = text.substring(paramName.length()).trim();
+		final String separator = description.isEmpty() ? "" : " - ";
+		// Slap together the HTML.
+		return "<code>" + paramName + "</code>" + separator + description;
+	}
+
+	// NB: It would be great if we could just add multiple different instances
+	// of this ParamTaglet class, which could then be concrete, to the taglet
+	// map in a single static register method. Unfortunately, the taglet system
+	// does not actually use the instances you add to the map! Instead, it
+	// appears to construct new instances via an assumed no-args constructor?
+	protected void registerMe(final Map<String, Taglet> tagletMap) {
+		tagletMap.put(getName(), this);
+	}
+}

From c828b57fb3d48d3115896c12a4927cafe8aad5a6 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Tue, 21 Jul 2020 09:40:56 -0500
Subject: [PATCH 02/91] therapi-runtime-javadoc: first cut

---
 imagej/imagej-ops2/pom.xml                    |   3 +-
 scijava/scijava-ops/.gitignore                |   2 +
 scijava/scijava-ops/pom.xml                   |  86 ++++++++++--
 .../src/main/java/module-info.java            |  14 +-
 .../ops/create/CreateOpCollection.java        |   5 +
 .../ops/simplify/SimplificationUtils.java     |   1 +
 .../scijava/param/JavadocParameterData.java   | 123 ++++++++++++++++++
 .../org/scijava/param/ParameterStructs.java   |   6 +
 .../javax.annotation.processing.Processor     |   2 +
 .../scijava/param/JavadocParameterTest.java   | 101 ++++++++++++++
 10 files changed, 325 insertions(+), 18 deletions(-)
 create mode 100644 scijava/scijava-ops/.gitignore
 create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
 create mode 100644 scijava/scijava-ops/src/main/resources/META-INF/services/javax.annotation.processing.Processor
 create mode 100644 scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java

diff --git a/imagej/imagej-ops2/pom.xml b/imagej/imagej-ops2/pom.xml
index 5066eb908..857774b88 100644
--- a/imagej/imagej-ops2/pom.xml
+++ b/imagej/imagej-ops2/pom.xml
@@ -210,7 +210,8 @@
 		<license.projectName>ImageJ software for multidimensional image processing and analysis.</license.projectName>
 
 		<!-- NB While we depend on old scijava-common -->
-		<allowedDuplicateClasses>org.scijava.*</allowedDuplicateClasses>
+		<imagej-ops2.allowedDuplicateClasses>${scijava.allowedDuplicateClasses}, org.scijava.*,com.github.therapi.runtimejavadoc.repack.com.eclipsesource.json.*</imagej-ops2.allowedDuplicateClasses>
+		<allowedDuplicateClasses>${imagej-ops2.allowedDuplicateClasses}</allowedDuplicateClasses>
 
 		<!-- NB: Deploy releases to the ImageJ Maven repository. -->
 		<releaseProfiles>deploy-to-imagej</releaseProfiles>
diff --git a/scijava/scijava-ops/.gitignore b/scijava/scijava-ops/.gitignore
new file mode 100644
index 000000000..00d2ab71d
--- /dev/null
+++ b/scijava/scijava-ops/.gitignore
@@ -0,0 +1,2 @@
+/.apt_generated/
+/.apt_generated_tests/
diff --git a/scijava/scijava-ops/pom.xml b/scijava/scijava-ops/pom.xml
index 4226e99fa..630bd9756 100644
--- a/scijava/scijava-ops/pom.xml
+++ b/scijava/scijava-ops/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -55,13 +57,21 @@
 		<contributor>
 			<name>Christian Dietz</name>
 			<url>https://imagej.net/User:Dietzc</url>
-			<roles><role>founder</role></roles>
-			<properties><id>dietzc</id></properties>
+			<roles>
+				<role>founder</role>
+			</roles>
+			<properties>
+				<id>dietzc</id>
+			</properties>
 		</contributor>
 		<contributor>
 			<name>David Kolb</name>
-			<roles><role>founder</role></roles>
-			<properties><id>Treiblesschorle</id></properties>
+			<roles>
+				<role>founder</role>
+			</roles>
+			<properties>
+				<id>Treiblesschorle</id>
+			</properties>
 		</contributor>
 	</contributors>
 
@@ -93,14 +103,56 @@
 
 		<license.licenseName>bsd_2</license.licenseName>
 		<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
+		<enforcer.skip>true</enforcer.skip>
+		<scijava-ops.allowedDuplicateClasses>${scijava.allowedDuplicateClasses},com.github.therapi.runtimejavadoc.repack.com.eclipsesource.json.*</scijava-ops.allowedDuplicateClasses>
+		<allowedDuplicateClasses>${scijava-ops.allowedDuplicateClasses}</allowedDuplicateClasses>
 	</properties>
-
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>com.alexecollins.maven.plugin</groupId>
 				<artifactId>script-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.8.1</version>
+				<configuration>
+					<annotationProcessors>
+						<annotationProcessor>com.github.therapi.runtimejavadoc.internal.JavadocAnnotationProcessor</annotationProcessor>
+						<annotationProcessor>org.scijava.annotations.AnnotationProcessor</annotationProcessor>
+					</annotationProcessors>
+					<debug>true</debug>
+					<optimize>true</optimize>
+					<compilerArguments>
+						<AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
+						<Adebug>true</Adebug>
+					</compilerArguments>
+					<annotationProcessorPaths>
+						<path>
+							<groupId>com.github.therapi</groupId>
+							<artifactId>therapi-runtime-javadoc-scribe</artifactId>
+							<version>0.12.0</version>
+						</path>
+						<path>
+							<groupId>org.scijava</groupId>
+							<artifactId>scijava-common</artifactId>
+							<version>2.83.3</version>
+						</path>
+					</annotationProcessorPaths>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestEntries>
+							<Automatic-Module-Name>org.scijava.ops</Automatic-Module-Name>
+						</manifestEntries>
+					</archive>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
@@ -111,12 +163,12 @@
 		</dependency>
 		<dependency>
 			<groupId>org.scijava</groupId>
-			<artifactId>scijava-function</artifactId>
+			<artifactId>scijava-types</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.scijava</groupId>
-			<artifactId>scijava-types</artifactId>
+			<groupId> org.scijava</groupId>
+			<artifactId>scijava-function</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<!-- Third-party dependencies -->
@@ -133,6 +185,22 @@
 			<groupId>org.javassist</groupId>
 			<artifactId>javassist</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>javax.annotation</groupId>
+			<artifactId>javax.annotation-api</artifactId>
+			<version>1.3.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.therapi</groupId>
+			<artifactId>therapi-runtime-javadoc-scribe</artifactId>
+			<version>0.12.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.therapi</groupId>
+			<artifactId>therapi-runtime-javadoc</artifactId>
+			<version>0.12.0</version>
+		</dependency>
+
 		<!-- Test scope dependencies -->
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
diff --git a/scijava/scijava-ops/src/main/java/module-info.java b/scijava/scijava-ops/src/main/java/module-info.java
index 92370bd77..072093843 100644
--- a/scijava/scijava-ops/src/main/java/module-info.java
+++ b/scijava/scijava-ops/src/main/java/module-info.java
@@ -1,4 +1,4 @@
-module org.scijava.ops {
+open module org.scijava.ops {
 	
 	//TODO: rearrange packages to export only needed classes
 	exports org.scijava.ops; //contains OpDependency interface
@@ -15,19 +15,17 @@
 	exports org.scijava.struct;
 	exports org.scijava.param;
 
-	// -- Open plugins to scijava-common
-	opens org.scijava.ops to org.scijava;
-	opens org.scijava.ops.impl to org.scijava;
-	opens org.scijava.ops.provenance to org.scijava;
-	opens org.scijava.ops.provenance.impl to org.scijava;
-
   // FIXME: This is a file name and is thus unstable
   requires geantyref;
-  
+
   requires java.desktop;
 
 	requires org.scijava;
 	requires org.scijava.types;
 	requires javassist;
 	requires org.scijava.function;
+	requires java.compiler;
+	requires therapi.runtime.javadoc;
+
+	uses javax.annotation.processing.Processor;
 }
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java
index 3fbad7421..e1eaf27ca 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java
@@ -11,6 +11,11 @@
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
+/**
+ * Creation ops
+ * @author G
+ *
+ */
 @Plugin(type = OpCollection.class)
 public class CreateOpCollection {
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java
index 4609a6508..a983240d1 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java
@@ -114,6 +114,7 @@ private static Type[] typesFromOpType(Class<?> opType, Method fMethod, Type... t
 		return Types.mapVarToTypes(types, map);
 	}
 
+	// TODO: extract this method to a more general utility class
 	public static Method findFMethod(Class<?> c) {
 			Class<?> fIface = ParameterStructs.findFunctionalInterface(c);
 			if(fIface == null) throw new IllegalArgumentException("Class " + c +" does not implement a functional interface!");
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
new file mode 100644
index 000000000..37fab5a54
--- /dev/null
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
@@ -0,0 +1,123 @@
+
+package org.scijava.param;
+
+import com.github.therapi.runtimejavadoc.FieldJavadoc;
+import com.github.therapi.runtimejavadoc.MethodJavadoc;
+import com.github.therapi.runtimejavadoc.OtherJavadoc;
+import com.github.therapi.runtimejavadoc.ParamJavadoc;
+import com.github.therapi.runtimejavadoc.RuntimeJavadoc;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.scijava.ops.simplify.SimplificationUtils;
+import org.scijava.types.Types;
+
+/**
+ * Class able to scrape Op parameter metadata off the Op's Javadoc.
+ * 
+ * @author Gabriel Selzer
+ */
+public class JavadocParameterData {
+
+	List<String> paramNames;
+	List<String> paramDescriptions;
+	String returnDescription;
+
+	public JavadocParameterData(Method m) {
+		parseMethod(m);
+	}
+
+	public JavadocParameterData(Class<?> c) {
+		try {
+			parseMethod(getOpMethod(c));
+		}
+		catch (NoSuchMethodException e) {
+			throw new IllegalArgumentException("Op class " + c +
+				" does not declare a functional method!");
+		}
+	}
+
+	/**
+	 * Parses a {@link Field} for {@code @param}, {@code @return} tags. HACK:
+	 * since {@code Field}s shouldn't normally have these tags, we have to parse
+	 * these manually.
+	 * 
+	 * @param f the field
+	 */
+	public JavadocParameterData(Field f) {
+		paramNames = new ArrayList<>();
+		paramDescriptions = new ArrayList<>();
+		FieldJavadoc doc = RuntimeJavadoc.getJavadoc(f);
+		for (OtherJavadoc other : doc.getOther()) {
+			switch (other.getName()) {
+				case "param":
+					String param = other.getComment().toString();
+					paramNames.add(param.substring(0, param.indexOf(" ")));
+					paramDescriptions.add(param.substring(param.indexOf(" ") + 1));
+					break;
+				case "return":
+					if (returnDescription != null) throw new IllegalArgumentException(
+						"Op cannot have multiple returns!");
+					returnDescription = other.getComment().toString();
+					break;
+			}
+
+		}
+	}
+
+	public List<String> paramNames() {
+		return paramNames;
+	}
+
+	public List<String> paramDescriptions() {
+		return paramDescriptions;
+	}
+
+	public String returnDescription() {
+		return returnDescription;
+	}
+
+	// -- Helper methods -- //
+
+	/**
+	 * Finds the abstract {@link FunctionalInterface} method implemented by the Op
+	 * {@code c}
+	 * 
+	 * @param c the Op {@link Class}
+	 * @return the {@link Method} of the {@link FunctionalInterface} implemented
+	 *         by {@code c}
+	 * @throws NoSuchMethodException when {@code c} does not implement its
+	 *           functional method
+	 */
+	private Method getOpMethod(Class<?> c) throws NoSuchMethodException {
+		// NB this is the functional method w.r.t. the interface, not w.r.t. the Op
+		Method fMethod = SimplificationUtils.findFMethod(c);
+		Type[] paramTypes = Types.getExactParameterTypes(fMethod, c);
+		Class<?>[] rawParamTypes = Arrays.stream(paramTypes).map(t -> Types.raw(t))
+			.toArray(Class[]::new);
+		return c.getMethod(fMethod.getName(), rawParamTypes);
+	}
+
+	/**
+	 * Parses the {@code @param} and {@code @return} annotations of {@link Method}
+	 * {@code m}.
+	 * 
+	 * @param m the method whose javadoc has tags we want to parse
+	 */
+	private void parseMethod(Method m) {
+		MethodJavadoc doc = RuntimeJavadoc.getJavadoc(m);
+		List<ParamJavadoc> params = doc.getParams();
+		paramNames = params.stream().map(param -> param.getName()).collect(
+			Collectors.toList());
+		paramDescriptions = params.stream().map(param -> param.getComment()
+			.toString()).collect(Collectors.toList());
+		returnDescription = doc.getReturns().toString();
+	}
+
+}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java
index 0be9cee49..4553d0265 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java
@@ -158,6 +158,7 @@ public static List<Member<?>> parse(final Field field) throws ValidityException
 		Class<?> c = field.getDeclaringClass();
 		if (c == null || field == null) return null;
 
+		JavadocParameterData paramData = new JavadocParameterData(field);
 		field.setAccessible(true);
 		
 		final ArrayList<Member<?>> items = new ArrayList<>();
@@ -198,6 +199,8 @@ public static List<Member<?>> parse(final Class<?> c, final Method method)
 			if (c == null || method == null) return null;
 
 			method.setAccessible(true);
+			
+			JavadocParameterData paramData = new JavadocParameterData(method);
 
 			final ArrayList<Member<?>> items = new ArrayList<>();
 			final ArrayList<ValidityProblem> problems = new ArrayList<>();
@@ -505,6 +508,7 @@ private static void parseFunctionalParameters(final ArrayList<Member<?>> items,
 			return;
 		}
 		
+		
 		// Get parameter annotations (may not be present)
 		// TODO: remove Parameter annotations from all ops and remove logic below.
 		// TODO: grab names from OpClass/OpField annotations.
@@ -694,4 +698,6 @@ private static Method findFunctionalMethod(Class<?> cls) {
 		
 		return nonDefaults.get(0);
 	}
+	
+	
 }
diff --git a/scijava/scijava-ops/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/scijava/scijava-ops/src/main/resources/META-INF/services/javax.annotation.processing.Processor
new file mode 100644
index 000000000..2b8a1fdb0
--- /dev/null
+++ b/scijava/scijava-ops/src/main/resources/META-INF/services/javax.annotation.processing.Processor
@@ -0,0 +1,2 @@
+org.scijava.annotations.AnnotationProcessor
+com.github.therapi.runtimejavadoc.internal.JavadocAnnotationProcessor
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
new file mode 100644
index 000000000..705cbec05
--- /dev/null
+++ b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
@@ -0,0 +1,101 @@
+package org.scijava.param;
+
+import com.github.therapi.runtimejavadoc.ClassJavadoc;
+import com.github.therapi.runtimejavadoc.FieldJavadoc;
+import com.github.therapi.runtimejavadoc.MethodJavadoc;
+import com.github.therapi.runtimejavadoc.RuntimeJavadoc;
+import com.google.common.collect.Streams;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import org.junit.Test;
+import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.OpField;
+import org.scijava.ops.OpMethod;
+import org.scijava.ops.core.Op;
+import org.scijava.ops.core.OpCollection;
+import org.scijava.ops.create.CreateOpCollection;
+import org.scijava.ops.simplify.SimplificationUtils;
+import org.scijava.plugin.Plugin;
+import org.scijava.struct.ItemIO;
+import org.scijava.types.Types;
+
+/**
+ * Tests the ability of a Javadoc parser to scrape an Op's parameters out of its Javadoc
+ * @author G
+ *
+ */
+@Plugin(type = OpCollection.class)
+public class JavadocParameterTest extends AbstractTestEnvironment {
+	
+	/**
+	 * 
+	 * @param in1 the first input
+	 * @param in2 the second input
+	 * @return in1 + in2
+	 */
+	@OpMethod(names = "test.javadoc", type = BiFunction.class)
+	public static List<Long> OpMethodFoo(List<String> in1, List<String> in2) {
+		BiFunction<String, String, Long> func = (s1, s2) -> Long.parseLong(s1) + Long.parseLong(s2);
+		return Streams.zip(in1.stream(), in2.stream(), func).collect(Collectors.toList());
+	}
+	
+	/**
+	 * @param thing the input
+	 * @return the output
+	 */
+	@OpField(names = "test.javadoc")
+	public final Function<Double, Double> javadocFieldOp = (in) -> in + 1;
+	
+	@Test
+	public void testJavadocMethod() throws NoSuchMethodException, SecurityException, NoSuchFieldException {
+		Method fMethod = SimplificationUtils.findFMethod(JavadocOp.class);
+		Type[] exactParameterTypes = Types.getExactParameterTypes(fMethod, JavadocOp.class);
+		Class<?>[] rawParamTypes = Arrays.stream(exactParameterTypes).map(t -> Types.raw(t)).toArray(Class[]::new);
+		Method opMethod = JavadocOp.class.getMethod(fMethod.getName(), rawParamTypes);
+		MethodJavadoc javadoc = RuntimeJavadoc.getJavadoc(opMethod);
+		System.out.println("Functional Method javadoc" + javadoc);
+		
+		ClassJavadoc classdoc = RuntimeJavadoc.getJavadoc(org.scijava.ops.OpInfo.class);
+		System.out.println("Class javadoc" + classdoc);
+		
+		ClassJavadoc createDoc = RuntimeJavadoc.getJavadoc(CreateOpCollection.class);
+		System.out.println("Create javadoc: " + createDoc);
+
+		ClassJavadoc testDoc = RuntimeJavadoc.getJavadoc(JavadocOp.class);
+		System.out.println("Class javado" + testDoc);
+		ops.op("math.add").input(2, 3).apply();
+		
+		Field field = this.getClass().getField("javadocFieldOp");
+		FieldJavadoc fieldDoc = RuntimeJavadoc.getJavadoc(field);
+	}
+
+}
+
+/**
+ * Test Op used to see if we can't scrape the javadoc.
+ * @author Gabriel Selzer
+ *
+ */
+@Plugin(type = Op.class) 
+@Parameter(key = "input")
+@Parameter(key = "output", itemIO = ItemIO.OUTPUT)
+class JavadocOp implements Function<Double, Double> {
+
+	/**
+	 * @param t the input
+	 * @return u the output
+	 */
+	@Override
+	public Double apply(Double t) {
+		return t + 1;
+	}
+	
+}

From e59cb639675b000f00999a0e3fd5787771fd2a28 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 5 Mar 2021 12:06:48 -0600
Subject: [PATCH 03/91] Scrape javadoc for parameter data

---
 .../scijava/param/JavadocParameterData.java   | 120 ++++++++++++++++-
 .../java/org/scijava/param/Parameter.java     |   7 +
 .../java/org/scijava/param/ParameterData.java |   9 ++
 .../org/scijava/param/ParameterStructs.java   | 121 +++++++-----------
 .../param/SynthesizedParameterData.java       |  56 ++++++++
 .../scijava/param/JavadocParameterTest.java   |  87 +++++++------
 6 files changed, 285 insertions(+), 115 deletions(-)
 create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/ParameterData.java
 create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterData.java

diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
index 37fab5a54..ed8f408c8 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
@@ -7,15 +7,23 @@
 import com.github.therapi.runtimejavadoc.ParamJavadoc;
 import com.github.therapi.runtimejavadoc.RuntimeJavadoc;
 
+import io.leangen.geantyref.AnnotationFormatException;
+import io.leangen.geantyref.TypeFactory;
+
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
+import org.scijava.ops.OpInfo;
 import org.scijava.ops.simplify.SimplificationUtils;
+import org.scijava.struct.Member;
 import org.scijava.types.Types;
 
 /**
@@ -23,12 +31,14 @@
  * 
  * @author Gabriel Selzer
  */
-public class JavadocParameterData {
+public class JavadocParameterData implements ParameterData {
 
 	List<String> paramNames;
 	List<String> paramDescriptions;
 	String returnDescription;
 
+	
+
 	public JavadocParameterData(Method m) {
 		parseMethod(m);
 	}
@@ -67,8 +77,53 @@ public JavadocParameterData(Field f) {
 					returnDescription = other.getComment().toString();
 					break;
 			}
+		}
+
+		// ensure non-null description
+		if (returnDescription == null) returnDescription = "";
 
+		// ensure that f has enough @parameter annotations
+		Method sam = ParameterStructs.singularAbstractMethod(f.getType());
+		int numParams = sam.getParameterCount();
+		if (numParams != paramNames.size()) {
+			throw new IllegalArgumentException("Field " + f +
+				" does not have one @param annotation for each parameter of the Op!");
+		}
+	}
+
+	// TODO: consider if we want to add more data to the {@link OpInfo}
+	// 
+	public JavadocParameterData(OpInfo info, Type newType) {
+		paramNames = new ArrayList<>();
+		paramDescriptions = new ArrayList<>();
+		List<Member<?>> inputs = new ArrayList<>(info.inputs());
+		Member<?> output = info.output();
+
+		// this method is called when the op is adapted/simplified. In the case of
+		// adaptation, the op's output might shift from a pure output to an input,
+		// or might shift from a container to a pure output. We 
+		Method sam = ParameterStructs.singularAbstractMethod(Types.raw(newType));
+		if (sam.getParameterCount() > inputs.size()) {
+			inputs.add(output);
+		}
+		else if (sam.getParameterCount() < inputs.size()) {
+			// one of the inputs is an I/O and should be a pure output. We need to
+			// remove it from the inputs.
+			Optional<Member<?>> ioMember = inputs.parallelStream().filter(m -> m
+				.isOutput()).findFirst();
+			if (ioMember == null) throw new IllegalArgumentException(
+				"Cannot transform Op of type " + info.opType() + " into type " +
+					newType + "; at least one input must also be an output!");
+
+			inputs.remove(ioMember.get());
 		}
+		for(Member<?> m : inputs) {
+			paramNames.add(m.getKey());
+			// TODO: Add member support for descriptions
+			paramDescriptions.add("");
+		}
+		// TODO: Add member support for descriptions
+		returnDescription = "";
 	}
 
 	public List<String> paramNames() {
@@ -113,11 +168,70 @@ private Method getOpMethod(Class<?> c) throws NoSuchMethodException {
 	private void parseMethod(Method m) {
 		MethodJavadoc doc = RuntimeJavadoc.getJavadoc(m);
 		List<ParamJavadoc> params = doc.getParams();
-		paramNames = params.stream().map(param -> param.getName()).collect(
-			Collectors.toList());
+		if (params.size() != m.getParameterCount())
+			throw new IllegalArgumentException("Method " + m +
+				" does not have valid @param tags for each of its inputs!");
+		paramNames = params.stream().map(param -> param.getName() != null ? param
+			.getName() : null).collect(Collectors.toList());
 		paramDescriptions = params.stream().map(param -> param.getComment()
 			.toString()).collect(Collectors.toList());
 		returnDescription = doc.getReturns().toString();
+		if (returnDescription == null) returnDescription = "";
+	}
+
+	@Override
+	public List<Parameter> synthesizeAnnotations(List<FunctionalMethodType> fmts) {
+		List<Parameter> params = new ArrayList<>();
+		int ins = 0;
+		int outs = 1;
+
+		Map<String, Object> paramValues = new HashMap<>();
+		for (FunctionalMethodType fmt : fmts) {
+			paramValues.clear();
+			paramValues.put(Parameter.ITEMIO_FIELD_NAME, fmt.itemIO());
+			
+			String key;
+			String description;
+			switch (fmt.itemIO()) {
+			case INPUT:
+				key = paramNames.get(ins);
+				description = paramDescriptions.get(ins);
+				ins++;
+				break;
+			case OUTPUT:
+				// NB the @return tag does not provide a name, only a comment
+				key = "output" + outs; 
+				description = returnDescription;
+				outs++;
+				break;
+			case CONTAINER:
+				key = paramNames.get(ins);
+				description = paramDescriptions.get(ins);
+				ins++;
+				outs++;
+				break;
+			case MUTABLE:
+				key = paramNames.get(ins);
+				description = paramDescriptions.get(ins);
+				ins++;
+				outs++;
+				break;
+			default:
+				throw new RuntimeException("Unexpected ItemIO type encountered!");
+			}
+			
+			paramValues.put(Parameter.KEY_FIELD_NAME, key);
+			paramValues.put(Parameter.DESCRIPTION_FIELD_NAME, description);
+			
+			try {
+				params.add(TypeFactory.annotation(Parameter.class, paramValues));
+			} catch (AnnotationFormatException e) {
+				throw new RuntimeException("Error during Parameter annotation synthetization. This is "
+						+ "most likely an implementation error.", e);
+			}
+		}
+		// TODO: consider if some error should be thrown when there are 2+ outputs
+		return params;
 	}
 
 }
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/Parameter.java b/scijava/scijava-ops/src/main/java/org/scijava/param/Parameter.java
index b985c685c..093889aec 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/Parameter.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/Parameter.java
@@ -68,6 +68,13 @@
 	 * by name. If the name is changed, this has to be changed accordingly.
 	 */
 	public static final String KEY_FIELD_NAME = "key";
+
+	/**
+	 * IMPORTANT: Parameter annotation instances are mutated using reflections
+	 * in order to resolve {@link ItemIO#AUTO} which accesses this field
+	 * by name. If the name is changed, this has to be changed accordingly.
+	 */
+	public static final String DESCRIPTION_FIELD_NAME = "description";
 	
 	/** Defines a key for the parameter. */
 	String key() default "";
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterData.java
new file mode 100644
index 000000000..5e0cbfa6e
--- /dev/null
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterData.java
@@ -0,0 +1,9 @@
+package org.scijava.param;
+
+import java.util.List;
+
+public interface ParameterData {
+
+	public List<Parameter> synthesizeAnnotations(List<FunctionalMethodType> fmts);
+
+}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java
index 4553d0265..9f88288b4 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java
@@ -131,10 +131,21 @@ public static List<Member<?>> parse(final Class<?> type)
 		// NB: Reject abstract classes.
 		checkModifiers(type.getName() + ": ", problems, type.getModifiers(), true, Modifier.ABSTRACT);
 
-		// Parse class level (i.e., generic) @Parameter annotations.
+		// obatin a parameterData (preferably one that scrapes the javadoc)
 		final Class<?> paramsClass = findParametersDeclaration(type);
+		ParameterData paramData;
+		try {
+			paramData = new JavadocParameterData(paramsClass);
+		} catch(NullPointerException | IllegalArgumentException e) {
+			paramData = new SynthesizedParameterData();
+		}
+
+		// Parse class level (i.e., generic) @Parameter annotations.
 		if (paramsClass != null) {
-			parseFunctionalParameters(items, names, problems, paramsClass, type, false);
+			parseFunctionalParameters(items, names, problems, paramsClass, paramData);
+		}
+		else {
+			parseFunctionalParameters(items, names, problems, type, paramData);
 		}
 
 		// Parse field level @OpDependency annotations.
@@ -158,7 +169,13 @@ public static List<Member<?>> parse(final Field field) throws ValidityException
 		Class<?> c = field.getDeclaringClass();
 		if (c == null || field == null) return null;
 
-		JavadocParameterData paramData = new JavadocParameterData(field);
+		// obtain a parameterData (preferably one that scrapes the javadoc)
+		ParameterData paramData;
+		try {
+			paramData = new JavadocParameterData(field);
+		} catch(IllegalArgumentException e) {
+			paramData = new SynthesizedParameterData();
+		}
 		field.setAccessible(true);
 		
 		final ArrayList<Member<?>> items = new ArrayList<>();
@@ -167,8 +184,7 @@ public static List<Member<?>> parse(final Field field) throws ValidityException
 		final Type fieldType = Types.fieldType(field, c);
 
 		checkModifiers(field.toString() + ": ", problems, field.getModifiers(), false, Modifier.FINAL);
-		parseFunctionalParameters(items, names, problems, field, fieldType, false);
-
+		parseFunctionalParameters(items, names, problems, fieldType, paramData); 
 		// Fail if there were any problems.
 		if (!problems.isEmpty()) {
 			throw new ValidityException(problems);
@@ -183,7 +199,15 @@ public static List<Member<?>> parse(final OpInfo opInfo, final Type newType) thr
 		final ArrayList<ValidityProblem> problems = new ArrayList<>();
 		final Set<String> names = new HashSet<>();
 
-		parseFunctionalParameters(items, names, problems, opInfo.getAnnotationBearer(), newType, true);
+		// obtain a parameterData (preferably one that scrapes the javadoc)
+		ParameterData paramData;
+		try {
+			paramData = new JavadocParameterData(opInfo, newType);
+		} catch(IllegalArgumentException e) {
+			paramData = new SynthesizedParameterData();
+		}
+
+		parseFunctionalParameters(items, names, problems, newType, paramData);
 
 		// Fail if there were any problems.
 		if (!problems.isEmpty()) {
@@ -199,8 +223,14 @@ public static List<Member<?>> parse(final Class<?> c, final Method method)
 			if (c == null || method == null) return null;
 
 			method.setAccessible(true);
-			
-			JavadocParameterData paramData = new JavadocParameterData(method);
+
+			// obtain a parameterData (preferably one that scrapes the javadoc)
+			ParameterData paramData;
+			try {
+				paramData = new JavadocParameterData(method);
+			} catch(IllegalArgumentException e) {
+				paramData = new SynthesizedParameterData();
+			}
 
 			final ArrayList<Member<?>> items = new ArrayList<>();
 			final ArrayList<ValidityProblem> problems = new ArrayList<>();
@@ -219,7 +249,7 @@ public static List<Member<?>> parse(final Class<?> c, final Method method)
 			}
 			
 			// Parse method level @Parameter annotations.
-			parseFunctionalParameters(items, names, problems, method, functionalType, true);
+			parseFunctionalParameters(items, names, problems, functionalType, paramData);
 
 			// Parse method level @OpDependency annotations.
 			parseMethodOpDependencies(items, problems, c, method);
@@ -229,7 +259,7 @@ public static List<Member<?>> parse(final Class<?> c, final Method method)
 
 			return items;
 		}
-	
+
 	private static java.lang.reflect.Parameter[] getOpDependencies(
 		java.lang.reflect.Parameter[] methodParams)
 	{
@@ -417,7 +447,7 @@ private static void checkModifiers(String message, final ArrayList<ValidityProbl
 	 * @param fmts
 	 * @return
 	 */
-	private static Parameter[] synthesizeParameterAnnotations(final List<FunctionalMethodType> fmts) {
+	private static Parameter[] synthesizeParameterAnnotations(final List<FunctionalMethodType> fmts, JavadocParameterData data) {
 		List<Parameter> params = new ArrayList<>();
 		
 		int ins, outs, containers, mutables;
@@ -456,47 +486,9 @@ private static Parameter[] synthesizeParameterAnnotations(final List<FunctionalM
 		
 		return params.toArray(new Parameter[params.size()]);
 	}
-	
-	//TODO: delete
-//	/**
-//	 * Mutates {@link ItemIO#AUTO} in the specified annotations array by replacing it with the inferred {@link ItemIO}
-//	 * from the specified {@link FunctionalMethodType}s. Also checks if the user defined {@link ItemIO} matches the 
-//	 * inferred one if its different from AUTO and logs the errors in the specified problems list. It is expected that
-//	 * the order of annotations matches the order of specified {@link FunctionalMethodType}s.
-//	 * 
-//	 * @param annotations the {@link Parameter} annotations to mutate
-//	 * @param fmts inferred method types from the functional method
-//	 * @param problems list to record problems
-//	 * @return true if new problems got added to the problems list
-//	 */
-//	private static boolean resolveItemIOAuto(Parameter[] annotations, List<FunctionalMethodType> fmts, final ArrayList<ValidityProblem> problems) {
-//		boolean dirty = false;
-//		int i = 0;
-//		for (Parameter anno : annotations) {
-//			FunctionalMethodType fmt = fmts.get(i);
-//			if (anno.itemIO().equals(ItemIO.AUTO)) {
-//				// NB: Mutating the annotation should be fine here, as the functional signature can't change dynamically.
-//				// Hence, the inferred ITemIO should stay valid. (And for now we do not need information about AUTO after
-//				// this point)
-//				ItemIO io = (ItemIO) AnnotationUtils.mutateAnnotationInstance(anno, Parameter.ITEMIO_FIELD_NAME, fmt.itemIO());
-//				assert io.equals(ItemIO.AUTO);
-//			// if the ItemIO is explicitly specified, we can check if it matches the inferred ItemIO from the functional method
-//			} else if (!anno.itemIO().equals(fmt.itemIO())) {
-//				String message = "";
-//				message += "Inferred ItemIO of parameter annotation number " + i + " does not match "
-//						+ "the specified ItemIO of the annotation: "
-//						+ "inferred: " + fmt.itemIO() + " vs. "
-//						+ "specified: " + anno.itemIO();
-//				problems.add(new ValidityProblem(message));
-//				dirty = true;
-//			}
-//			i++;
-//		}
-//		return dirty;
-//	}
-	
+
 	private static void parseFunctionalParameters(final ArrayList<Member<?>> items, final Set<String> names, final ArrayList<ValidityProblem> problems,
-			AnnotatedElement annotationBearer, Type type, final boolean synthesizeAnnotations) {
+			Type type, ParameterData data) {
 		//Search for the functional method of 'type' and map its signature to ItemIO
 		List<FunctionalMethodType> fmts;
 		try {
@@ -507,33 +499,12 @@ private static void parseFunctionalParameters(final ArrayList<Member<?>> items,
 				type.getTypeName()));
 			return;
 		}
-		
-		
+
 		// Get parameter annotations (may not be present)
 		// TODO: remove Parameter annotations from all ops and remove logic below.
 		// TODO: grab names from OpClass/OpField annotations.
-		Parameter[] annotations = synthesizeParameterAnnotations(fmts);
-//		// 'type' is annotated, resolve ItemIO.AUTO by matching it to the signature of the functional method
-//		if (annotations.length > 0 && !synthesizeAnnotations) {
-//			if (annotations.length != fmts.size()) {
-//				String fmtIOs = Arrays.deepToString(fmts.stream().map(fmt -> fmt.itemIO()).toArray(ItemIO[]::new));
-//				problems.add(new ValidityProblem("The number of inferred functional method types does not match "
-//						+ "the number of specified parameters annotations.\n"
-//						+ "#inferred functional method types: " + fmts.size() + " " +  fmtIOs + "\n"
-//						+ "#specified paraeter annotations: " + annotations.length));
-//				return;
-//			}
-//			// START HERE: Instead of hacking the annotation here, we need to 
-//			if (resolveItemIOAuto(annotations, fmts, problems)) {
-//				// specified parameter annotations do not match functional method signature
-//				return;
-//			}
-//		// 'type' is not annotated, synthesize parameter annotations using defaults and ItemIO inferred from 
-//		// the functional method
-//		} else {
-//			annotations = synthesizeParameterAnnotations(fmts);
-//		}
-		
+		Parameter[] annotations = data.synthesizeAnnotations(fmts).toArray(Parameter[]::new);
+
 		for (int i=0; i<annotations.length; i++) {
 			String key = annotations[i].key();
 			final Type itemType = fmts.get(i).type();
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterData.java
new file mode 100644
index 000000000..f56ac5a1c
--- /dev/null
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterData.java
@@ -0,0 +1,56 @@
+package org.scijava.param;
+
+import io.leangen.geantyref.AnnotationFormatException;
+import io.leangen.geantyref.TypeFactory;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class SynthesizedParameterData implements ParameterData{
+
+	@Override
+	public List<Parameter> synthesizeAnnotations(
+		List<FunctionalMethodType> fmts)
+	{
+		List<Parameter> params = new ArrayList<>();
+		
+		int ins, outs, containers, mutables;
+		ins = outs = containers = mutables = 1;
+		for (FunctionalMethodType fmt : fmts) {
+			Map<String, Object> paramValues = new HashMap<>();
+			paramValues.put(Parameter.ITEMIO_FIELD_NAME, fmt.itemIO());
+			
+			String key;
+			switch (fmt.itemIO()) {
+			case INPUT:
+				key = "input" + ins++;
+				break;
+			case OUTPUT:
+				key = "output" + outs++;
+				break;
+			case CONTAINER:
+				key = "container" + containers++;
+				break;
+			case MUTABLE:
+				key = "mutable" + mutables++;
+				break;
+			default:
+				throw new RuntimeException("Unexpected ItemIO type encountered!");
+			}
+			
+			paramValues.put(Parameter.KEY_FIELD_NAME, key);
+			
+			try {
+				params.add(TypeFactory.annotation(Parameter.class, paramValues));
+			} catch (AnnotationFormatException e) {
+				throw new RuntimeException("Error during Parameter annotation synthetization. This is "
+						+ "most likely an implementation error.", e);
+			}
+		}
+		
+		return params;
+	}
+
+}
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
index 705cbec05..dacafc6ff 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
@@ -1,31 +1,25 @@
 package org.scijava.param;
 
-import com.github.therapi.runtimejavadoc.ClassJavadoc;
-import com.github.therapi.runtimejavadoc.FieldJavadoc;
-import com.github.therapi.runtimejavadoc.MethodJavadoc;
-import com.github.therapi.runtimejavadoc.RuntimeJavadoc;
 import com.google.common.collect.Streams;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import org.junit.Assert;
 import org.junit.Test;
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.OpField;
+import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpMethod;
 import org.scijava.ops.core.Op;
 import org.scijava.ops.core.OpCollection;
-import org.scijava.ops.create.CreateOpCollection;
-import org.scijava.ops.simplify.SimplificationUtils;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
-import org.scijava.types.Types;
+import org.scijava.types.Nil;
 
 /**
  * Tests the ability of a Javadoc parser to scrape an Op's parameters out of its Javadoc
@@ -36,45 +30,64 @@
 public class JavadocParameterTest extends AbstractTestEnvironment {
 	
 	/**
-	 * 
-	 * @param in1 the first input
-	 * @param in2 the second input
-	 * @return in1 + in2
+	 * @param foo the first input
+	 * @param bar the second input
+	 * @return foo + bar
 	 */
-	@OpMethod(names = "test.javadoc", type = BiFunction.class)
+	@OpMethod(names = "test.javadoc.method", type = BiFunction.class)
 	public static List<Long> OpMethodFoo(List<String> in1, List<String> in2) {
 		BiFunction<String, String, Long> func = (s1, s2) -> Long.parseLong(s1) + Long.parseLong(s2);
 		return Streams.zip(in1.stream(), in2.stream(), func).collect(Collectors.toList());
 	}
-	
+
 	/**
-	 * @param thing the input
-	 * @return the output
+	 * @input the input
+	 * @output the output
 	 */
 	@OpField(names = "test.javadoc")
 	public final Function<Double, Double> javadocFieldOp = (in) -> in + 1;
 	
 	@Test
-	public void testJavadocMethod() throws NoSuchMethodException, SecurityException, NoSuchFieldException {
-		Method fMethod = SimplificationUtils.findFMethod(JavadocOp.class);
-		Type[] exactParameterTypes = Types.getExactParameterTypes(fMethod, JavadocOp.class);
-		Class<?>[] rawParamTypes = Arrays.stream(exactParameterTypes).map(t -> Types.raw(t)).toArray(Class[]::new);
-		Method opMethod = JavadocOp.class.getMethod(fMethod.getName(), rawParamTypes);
-		MethodJavadoc javadoc = RuntimeJavadoc.getJavadoc(opMethod);
-		System.out.println("Functional Method javadoc" + javadoc);
+	public void testJavadocMethod() {
+		Iterator<OpInfo> infos = ops.env().infos("test.javadoc.method").iterator();
 		
-		ClassJavadoc classdoc = RuntimeJavadoc.getJavadoc(org.scijava.ops.OpInfo.class);
-		System.out.println("Class javadoc" + classdoc);
+		OpInfo info = infos.next();
+		if (infos.hasNext()) {
+			Assert.fail("Multiple OpInfos with name \"test.javadoc.method\"");
+		}
+
+		// assert input names
+		String[] inputNames = info.inputs().stream().map(m -> m.getKey()).toArray(String[]::new);
+		Assert.assertArrayEquals(inputNames, new String[] {"foo", "bar"});
 		
-		ClassJavadoc createDoc = RuntimeJavadoc.getJavadoc(CreateOpCollection.class);
-		System.out.println("Create javadoc: " + createDoc);
+		// assert input descriptions
+		
+		// assert output name
+		
+		// assert output description
+	}
 
-		ClassJavadoc testDoc = RuntimeJavadoc.getJavadoc(JavadocOp.class);
-		System.out.println("Class javado" + testDoc);
-		ops.op("math.add").input(2, 3).apply();
+	@Test
+	public void testJavadocClass() {
+		Iterator<OpInfo> infos = ops.env().infos("test.javadoc.class").iterator();
+		
+		if (!infos.hasNext()) {
+			Assert.fail("No OpInfos with name \"test.javadoc.class\"");
+		}
+		OpInfo info = infos.next();
+		if (infos.hasNext()) {
+			Assert.fail("Multiple OpInfos with name \"test.javadoc.class\"");
+		}
+
+		// assert input names
+		String[] inputNames = info.inputs().stream().map(m -> m.getKey()).toArray(String[]::new);
+		Assert.assertArrayEquals(inputNames, new String[] {"t"});
 		
-		Field field = this.getClass().getField("javadocFieldOp");
-		FieldJavadoc fieldDoc = RuntimeJavadoc.getJavadoc(field);
+		// assert input descriptions
+		
+		// assert output name
+		
+		// assert output description
 	}
 
 }
@@ -84,14 +97,14 @@ public void testJavadocMethod() throws NoSuchMethodException, SecurityException,
  * @author Gabriel Selzer
  *
  */
-@Plugin(type = Op.class) 
+@Plugin(type = Op.class, name = "test.javadoc.class") 
 @Parameter(key = "input")
 @Parameter(key = "output", itemIO = ItemIO.OUTPUT)
 class JavadocOp implements Function<Double, Double> {
 
 	/**
 	 * @param t the input
-	 * @return u the output
+	 * @return the output
 	 */
 	@Override
 	public Double apply(Double t) {

From aaf7a41420b9f7f631cf61346a17a9a39659fe04 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Thu, 20 May 2021 10:07:26 -0500
Subject: [PATCH 04/91] Change switch case to input from param

---
 .../src/main/java/org/scijava/param/JavadocParameterData.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
index ed8f408c8..6b61ae272 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
@@ -66,7 +66,7 @@ public JavadocParameterData(Field f) {
 		FieldJavadoc doc = RuntimeJavadoc.getJavadoc(f);
 		for (OtherJavadoc other : doc.getOther()) {
 			switch (other.getName()) {
-				case "param":
+				case "input":
 					String param = other.getComment().toString();
 					paramNames.add(param.substring(0, param.indexOf(" ")));
 					paramDescriptions.add(param.substring(param.indexOf(" ") + 1));

From a73fcd323db36654f4d7113b40535bd4355c468d Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Thu, 20 May 2021 10:08:01 -0500
Subject: [PATCH 05/91] Further flesh out JavadocParameterTest

---
 .../scijava/param/JavadocParameterTest.java   | 78 +++++++++++++------
 1 file changed, 54 insertions(+), 24 deletions(-)

diff --git a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
index dacafc6ff..73eaf6f99 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
@@ -1,3 +1,4 @@
+
 package org.scijava.param;
 
 import com.google.common.collect.Streams;
@@ -22,55 +23,59 @@
 import org.scijava.types.Nil;
 
 /**
- * Tests the ability of a Javadoc parser to scrape an Op's parameters out of its Javadoc
+ * Tests the ability of a Javadoc parser to scrape an Op's parameters out of its
+ * Javadoc
+ * 
  * @author G
- *
  */
 @Plugin(type = OpCollection.class)
 public class JavadocParameterTest extends AbstractTestEnvironment {
-	
+
 	/**
 	 * @param foo the first input
 	 * @param bar the second input
 	 * @return foo + bar
 	 */
 	@OpMethod(names = "test.javadoc.method", type = BiFunction.class)
-	public static List<Long> OpMethodFoo(List<String> in1, List<String> in2) {
-		BiFunction<String, String, Long> func = (s1, s2) -> Long.parseLong(s1) + Long.parseLong(s2);
-		return Streams.zip(in1.stream(), in2.stream(), func).collect(Collectors.toList());
+	public static List<Long> OpMethodFoo(List<String> foo, List<String> bar) {
+		BiFunction<String, String, Long> func = (s1, s2) -> Long.parseLong(s1) +
+			Long.parseLong(s2);
+		return Streams.zip(foo.stream(), bar.stream(), func).collect(Collectors
+			.toList());
 	}
 
 	/**
-	 * @input the input
+	 * @input in the input
 	 * @output the output
 	 */
-	@OpField(names = "test.javadoc")
+	@OpField(names = "test.javadoc.field")
 	public final Function<Double, Double> javadocFieldOp = (in) -> in + 1;
-	
+
 	@Test
 	public void testJavadocMethod() {
 		Iterator<OpInfo> infos = ops.env().infos("test.javadoc.method").iterator();
-		
+
 		OpInfo info = infos.next();
 		if (infos.hasNext()) {
 			Assert.fail("Multiple OpInfos with name \"test.javadoc.method\"");
 		}
 
 		// assert input names
-		String[] inputNames = info.inputs().stream().map(m -> m.getKey()).toArray(String[]::new);
-		Assert.assertArrayEquals(inputNames, new String[] {"foo", "bar"});
-		
+		String[] inputNames = info.inputs().stream().map(m -> m.getKey()).toArray(
+			String[]::new);
+		Assert.assertArrayEquals(inputNames, new String[] { "foo", "bar" });
+
 		// assert input descriptions
-		
+
 		// assert output name
-		
+
 		// assert output description
 	}
 
 	@Test
 	public void testJavadocClass() {
 		Iterator<OpInfo> infos = ops.env().infos("test.javadoc.class").iterator();
-		
+
 		if (!infos.hasNext()) {
 			Assert.fail("No OpInfos with name \"test.javadoc.class\"");
 		}
@@ -80,13 +85,38 @@ public void testJavadocClass() {
 		}
 
 		// assert input names
-		String[] inputNames = info.inputs().stream().map(m -> m.getKey()).toArray(String[]::new);
-		Assert.assertArrayEquals(inputNames, new String[] {"t"});
-		
+		String[] inputNames = info.inputs().stream().map(m -> m.getKey()).toArray(
+			String[]::new);
+		Assert.assertArrayEquals(inputNames, new String[] { "t" });
+
 		// assert input descriptions
-		
+
 		// assert output name
-		
+
+		// assert output description
+	}
+
+	@Test
+	public void testJavadocField() {
+		Iterator<OpInfo> infos = ops.env().infos("test.javadoc.field").iterator();
+
+		if (!infos.hasNext()) {
+			Assert.fail("No OpInfos with name \"test.javadoc.field\"");
+		}
+		OpInfo info = infos.next();
+		if (infos.hasNext()) {
+			Assert.fail("Multiple OpInfos with name \"test.javadoc.field\"");
+		}
+
+		// assert input names
+		String[] inputNames = info.inputs().stream().map(m -> m.getKey()).toArray(
+			String[]::new);
+		Assert.assertArrayEquals(inputNames, new String[] { "in" });
+
+		// assert input descriptions
+
+		// assert output name
+
 		// assert output description
 	}
 
@@ -94,10 +124,10 @@ public void testJavadocClass() {
 
 /**
  * Test Op used to see if we can't scrape the javadoc.
+ * 
  * @author Gabriel Selzer
- *
  */
-@Plugin(type = Op.class, name = "test.javadoc.class") 
+@Plugin(type = Op.class, name = "test.javadoc.class")
 @Parameter(key = "input")
 @Parameter(key = "output", itemIO = ItemIO.OUTPUT)
 class JavadocOp implements Function<Double, Double> {
@@ -110,5 +140,5 @@ class JavadocOp implements Function<Double, Double> {
 	public Double apply(Double t) {
 		return t + 1;
 	}
-	
+
 }

From ea3e5cc5f84ba4615f1b75cd969e674a50aaf1ae Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Thu, 11 Mar 2021 13:28:21 -0600
Subject: [PATCH 06/91] Member: add description field

This will allow us to retain the descriptions scraped from the javadoc
---
 .../org/scijava/ops/AnnotatedOpDependencyMember.java   |  6 ++++++
 .../org/scijava/ops/simplify/SimplifiedMember.java     |  5 +++++
 .../org/scijava/param/AnnotatedParameterMember.java    |  5 +++++
 .../org/scijava/param/ConvertedParameterMember.java    |  5 +++++
 .../scijava/param/DefaultMutableParameterMember.java   | 10 ++++++++--
 .../java/org/scijava/param/JavadocParameterData.java   |  6 +++---
 .../main/java/org/scijava/param/ParameterMember.java   |  5 -----
 .../src/main/java/org/scijava/struct/Member.java       |  3 +++
 8 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/AnnotatedOpDependencyMember.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/AnnotatedOpDependencyMember.java
index b7946dd2c..52fa934b2 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/AnnotatedOpDependencyMember.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/AnnotatedOpDependencyMember.java
@@ -74,6 +74,12 @@ public String getKey() {
 		return key;
 	}
 
+	@Override
+	public String getDescription() {
+		// TODO: consider more implementation here
+		return "";
+	}
+
 	@Override
 	public Type getType() {
 		return type;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedMember.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedMember.java
index bf3cd515c..f3bb99b8a 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedMember.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedMember.java
@@ -20,6 +20,11 @@ public String getKey() {
 		return original.getKey();
 	}
 
+	@Override
+	public String getDescription() {
+		return original.getDescription();
+	}
+
 	@Override
 	public Type getType() {
 		return newType;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/AnnotatedParameterMember.java b/scijava/scijava-ops/src/main/java/org/scijava/param/AnnotatedParameterMember.java
index d65b907ff..8d01b6a9a 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/AnnotatedParameterMember.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/AnnotatedParameterMember.java
@@ -114,6 +114,11 @@ public String getKey() {
 		return getAnnotation().key();
 	}
 
+	@Override
+	public String getDescription() {
+		return getAnnotation().description();
+	}
+
 	@Override
 	public Type getType() {
 		return itemType;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/ConvertedParameterMember.java b/scijava/scijava-ops/src/main/java/org/scijava/param/ConvertedParameterMember.java
index ea19ee9aa..781839350 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/ConvertedParameterMember.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/ConvertedParameterMember.java
@@ -27,6 +27,11 @@ public String getKey() {
 		return original.getKey();
 	}
 
+	@Override
+	public String getDescription() {
+		return original.getDescription();
+	}
+
 	@Override
 	public Type getType() {
 		return newType;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/DefaultMutableParameterMember.java b/scijava/scijava-ops/src/main/java/org/scijava/param/DefaultMutableParameterMember.java
index b7d0abce8..298b3ea75 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/DefaultMutableParameterMember.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/DefaultMutableParameterMember.java
@@ -75,10 +75,17 @@ public class DefaultMutableParameterMember<T> implements
 	private final Map<String, String> values = new HashMap<>();
 
 	public DefaultMutableParameterMember(final String key, final Class<T> type, final ItemIO ioType) {
-		this(key, (Type) type, ioType);
+		this(key, "", (Type) type, ioType);
 	}
 	public DefaultMutableParameterMember(final String key, final Type type, final ItemIO ioType) {
+		this(key, "", type, ioType);
+	}
+	public DefaultMutableParameterMember(final String key, final String description, final Class<T> type, final ItemIO ioType) {
+		this(key, description, (Type) type, ioType);
+	}
+	public DefaultMutableParameterMember(final String key, final String description, final Type type, final ItemIO ioType) {
 		this.key = key;
+		this.description = description;
 		this.type = type;
 		this.ioType = ioType;
 		visibility = MutableParameterMember.super.getVisibility();
@@ -94,7 +101,6 @@ public DefaultMutableParameterMember(final String key, final Type type, final It
 		final List<Object> superChoices = MutableParameterMember.super.getChoices();
 		if (superChoices != null) choices.addAll(superChoices);
 		label = MutableParameterMember.super.getLabel();
-		description = MutableParameterMember.super.getDescription();
 	}
 
 	/** Creates a new parameter with the same values as the given one. */
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
index 6b61ae272..e24682351 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
@@ -71,7 +71,7 @@ public JavadocParameterData(Field f) {
 					paramNames.add(param.substring(0, param.indexOf(" ")));
 					paramDescriptions.add(param.substring(param.indexOf(" ") + 1));
 					break;
-				case "return":
+				case "output":
 					if (returnDescription != null) throw new IllegalArgumentException(
 						"Op cannot have multiple returns!");
 					returnDescription = other.getComment().toString();
@@ -120,10 +120,10 @@ else if (sam.getParameterCount() < inputs.size()) {
 		for(Member<?> m : inputs) {
 			paramNames.add(m.getKey());
 			// TODO: Add member support for descriptions
-			paramDescriptions.add("");
+			paramDescriptions.add(m.getDescription());
 		}
 		// TODO: Add member support for descriptions
-		returnDescription = "";
+		returnDescription = output.getDescription();
 	}
 
 	public List<String> paramNames() {
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterMember.java b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterMember.java
index a5d506360..66a9770f6 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterMember.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterMember.java
@@ -144,11 +144,6 @@ default String getLabel() {
 		return getKey();
 	}
 
-	/** Gets a string describing the object. */
-	default String getDescription() {
-		return null;
-	}
-
 	/** Returns true iff the given key is defined. */
 	default boolean has(@SuppressWarnings("unused") String key) {
 		return false;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/struct/Member.java b/scijava/scijava-ops/src/main/java/org/scijava/struct/Member.java
index ce61ad230..ccdc6af85 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/struct/Member.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/struct/Member.java
@@ -16,6 +16,9 @@ public interface Member<T> {
 	/** Unique name of the member. */
 	String getKey();
 
+	/** Description of the member. */
+	String getDescription();
+
 	/**
 	 * Gets the type of the member, including Java generic parameters.
 	 * 

From 0b82e4736a08992ef807abcbff9fd8a9a5c7c754 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Thu, 11 Mar 2021 13:29:56 -0600
Subject: [PATCH 07/91] Test obtaining the descriptions of parameters

---
 .../scijava/param/JavadocParameterTest.java   | 60 +++++++++++++------
 1 file changed, 41 insertions(+), 19 deletions(-)

diff --git a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
index 73eaf6f99..451cd20b5 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
@@ -1,9 +1,10 @@
 
 package org.scijava.param;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import com.google.common.collect.Streams;
 
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.function.BiFunction;
@@ -18,9 +19,9 @@
 import org.scijava.ops.OpMethod;
 import org.scijava.ops.core.Op;
 import org.scijava.ops.core.OpCollection;
+import org.scijava.ops.function.Computers;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
-import org.scijava.types.Nil;
 
 /**
  * Tests the ability of a Javadoc parser to scrape an Op's parameters out of its
@@ -44,13 +45,6 @@ public static List<Long> OpMethodFoo(List<String> foo, List<String> bar) {
 			.toList());
 	}
 
-	/**
-	 * @input in the input
-	 * @output the output
-	 */
-	@OpField(names = "test.javadoc.field")
-	public final Function<Double, Double> javadocFieldOp = (in) -> in + 1;
-
 	@Test
 	public void testJavadocMethod() {
 		Iterator<OpInfo> infos = ops.env().infos("test.javadoc.method").iterator();
@@ -66,58 +60,86 @@ public void testJavadocMethod() {
 		Assert.assertArrayEquals(inputNames, new String[] { "foo", "bar" });
 
 		// assert input descriptions
+		String[] inputDescriptions = info.inputs().stream().map(m -> m.getDescription()).toArray(
+			String[]::new);
+		Assert.assertArrayEquals(inputDescriptions, new String[] { "the first input", "the second input" });
 
 		// assert output name
+		String outputName = info.output().getKey();
+		Assert.assertEquals("output1", outputName);
 
 		// assert output description
+		String outputDescription = info.output().getDescription();
+		Assert.assertEquals("foo + bar", outputDescription);
 	}
 
+	/**
+	 * @input in the input
+	 * @output the output
+	 */
+	@OpField(names = "test.javadoc.field")
+	public final Function<Double, Double> javadocFieldOp = (in) -> in + 1;
+
 	@Test
-	public void testJavadocClass() {
-		Iterator<OpInfo> infos = ops.env().infos("test.javadoc.class").iterator();
+	public void testJavadocField() {
+		Iterator<OpInfo> infos = ops.env().infos("test.javadoc.field").iterator();
 
 		if (!infos.hasNext()) {
-			Assert.fail("No OpInfos with name \"test.javadoc.class\"");
+			Assert.fail("No OpInfos with name \"test.javadoc.field\"");
 		}
 		OpInfo info = infos.next();
 		if (infos.hasNext()) {
-			Assert.fail("Multiple OpInfos with name \"test.javadoc.class\"");
+			Assert.fail("Multiple OpInfos with name \"test.javadoc.field\"");
 		}
 
 		// assert input names
 		String[] inputNames = info.inputs().stream().map(m -> m.getKey()).toArray(
 			String[]::new);
-		Assert.assertArrayEquals(inputNames, new String[] { "t" });
+		Assert.assertArrayEquals(new String[] { "in" }, inputNames);
 
 		// assert input descriptions
+		String[] inputDescriptions = info.inputs().stream().map(m -> m.getDescription()).toArray(
+			String[]::new);
+		Assert.assertArrayEquals(new String[] { "the input" }, inputDescriptions);
 
 		// assert output name
+		String outputName = info.output().getKey();
+		Assert.assertEquals("output1", outputName);
 
 		// assert output description
+		String outputDescription = info.output().getDescription();
+		assertEquals("the output", outputDescription);
 	}
 
 	@Test
-	public void testJavadocField() {
-		Iterator<OpInfo> infos = ops.env().infos("test.javadoc.field").iterator();
+	public void testJavadocClass() {
+		Iterator<OpInfo> infos = ops.env().infos("test.javadoc.class").iterator();
 
 		if (!infos.hasNext()) {
-			Assert.fail("No OpInfos with name \"test.javadoc.field\"");
+			Assert.fail("No OpInfos with name \"test.javadoc.class\"");
 		}
 		OpInfo info = infos.next();
 		if (infos.hasNext()) {
-			Assert.fail("Multiple OpInfos with name \"test.javadoc.field\"");
+			Assert.fail("Multiple OpInfos with name \"test.javadoc.class\"");
 		}
 
 		// assert input names
 		String[] inputNames = info.inputs().stream().map(m -> m.getKey()).toArray(
 			String[]::new);
-		Assert.assertArrayEquals(inputNames, new String[] { "in" });
+		Assert.assertArrayEquals(new String[] { "t" }, inputNames);
 
 		// assert input descriptions
+		String[] inputDescriptions = info.inputs().stream().map(m -> m.getDescription()).toArray(
+			String[]::new);
+		Assert.assertArrayEquals(new String[] { "the input" }, inputDescriptions);
 
 		// assert output name
+		String outputName = info.output().getKey();
+		Assert.assertEquals("output1", outputName);
 
 		// assert output description
+		String outputDescription = info.output().getDescription();
+		Assert.assertEquals("the output", outputDescription);
 	}
 
 }

From ed5ad58208ada3f1b8e2c96202487a10b0cf54e3 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 12 Mar 2021 08:49:24 -0600
Subject: [PATCH 08/91] Convert Parameter annotations to javadoc

Accomplished via this script:

  perl -0777 -i -pe 's/(\@Plugin[^\n]*\n)\@Parameter.key = "([^"]*)".\n/\1\/**\n * TODO\n *\n * \@param \2\n/igs' **/*.java
  perl -0777 -i -pe 's/\@Parameter.key = "([^"]*)".\n/ * \@param \1\n/igs' **/*.java
  perl -0777 -i -pe 's/( \* \@param[^\n]*\n)([^ ])/\1 *\/\n\2/igs' **/*.java

Plus vim macros and manual tidying.
---
 .../java/net/imagej/ops2/coloc/icq/LiICQ.java |  24 +-
 .../coloc/kendallTau/KendallTauBRank.java     |  10 +-
 .../ops2/coloc/maxTKendallTau/MTKT.java       |  22 +-
 .../ops2/coloc/pValue/DefaultPValue.java      |  50 +-
 .../ops2/coloc/pearsons/DefaultPearsons.java  |  10 +-
 .../ops2/convert/clip/ClipRealTypes.java      |   8 +-
 .../ops2/convert/copy/CopyRealTypes.java      |   8 +-
 .../net/imagej/ops2/copy/CopyArrayImg.java    |  16 +-
 .../java/net/imagej/ops2/copy/CopyII.java     |  16 +-
 .../java/net/imagej/ops2/copy/CopyImg.java    |  16 +-
 .../net/imagej/ops2/copy/CopyImgLabeling.java |   8 +-
 .../imagej/ops2/copy/CopyLabelingMapping.java |  10 +-
 .../java/net/imagej/ops2/copy/CopyRAI.java    |   8 +-
 .../java/net/imagej/ops2/copy/CopyType.java   |   8 +-
 .../deconvolve/NonCirculantFirstGuess.java    |  12 +-
 .../NonCirculantNormalizationFactor.java      |  13 +-
 .../ops2/deconvolve/RichardsonLucyC.java      |  32 +-
 .../deconvolve/RichardsonLucyCorrection.java  |  13 +-
 .../ops2/deconvolve/RichardsonLucyF.java      |  28 +-
 .../ops2/deconvolve/RichardsonLucyTVF.java    |  30 +-
 .../deconvolve/RichardsonLucyTVUpdate.java    |   9 +-
 .../ops2/deconvolve/RichardsonLucyUpdate.java |   5 +-
 .../accelerate/VectorAccelerator.java         |   6 +-
 .../net/imagej/ops2/eval/DefaultEval.java     |  12 +-
 .../ops2/features/haralick/DefaultASM.java    |  14 +-
 .../haralick/DefaultClusterPromenence.java    |  14 +-
 .../haralick/DefaultClusterShade.java         |  14 +-
 .../features/haralick/DefaultContrast.java    |  14 +-
 .../features/haralick/DefaultCorrelation.java |  14 +-
 .../haralick/DefaultDifferenceEntropy.java    |  14 +-
 .../haralick/DefaultDifferenceVariance.java   |  14 +-
 .../features/haralick/DefaultEntropy.java     |  14 +-
 .../ops2/features/haralick/DefaultICM1.java   |  14 +-
 .../ops2/features/haralick/DefaultICM2.java   |  14 +-
 .../ops2/features/haralick/DefaultIFDM.java   |  14 +-
 .../haralick/DefaultMaxProbability.java       |  14 +-
 .../features/haralick/DefaultSumAverage.java  |  14 +-
 .../features/haralick/DefaultSumEntropy.java  |  14 +-
 .../features/haralick/DefaultSumVariance.java |  14 +-
 .../haralick/DefaultTextureHomogeneity.java   |  14 +-
 .../features/haralick/DefaultVariance.java    |  14 +-
 .../features/haralick/helper/CoocHXY.java     |   8 +-
 .../features/haralick/helper/CoocMeanX.java   |   8 +-
 .../features/haralick/helper/CoocMeanY.java   |   8 +-
 .../ops2/features/haralick/helper/CoocPX.java |   8 +-
 .../haralick/helper/CoocPXMinusY.java         |   8 +-
 .../features/haralick/helper/CoocPXPlusY.java |   8 +-
 .../ops2/features/haralick/helper/CoocPY.java |   8 +-
 .../features/haralick/helper/CoocStdX.java    |   8 +-
 .../features/haralick/helper/CoocStdY.java    |   8 +-
 .../hog/HistogramOfOrientedGradients2D.java   |  28 +-
 .../ops2/features/lbp2d/DefaultLBP2D.java     |  12 +-
 .../tamura2d/DefaultCoarsenessFeature.java    |   8 +-
 .../tamura2d/DefaultContrastFeature.java      |   8 +-
 .../DefaultDirectionalityFeature.java         |  10 +-
 .../zernike/DefaultMagnitudeFeature.java      |  12 +-
 .../features/zernike/DefaultPhaseFeature.java |  12 +-
 .../zernike/helper/ZernikeComputer.java       |  12 +-
 .../filter/FFTMethodsLinearFFTFilterC.java    |  22 +-
 .../filter/bilateral/DefaultBilateral.java    |  14 +-
 .../ops2/filter/convolve/ConvolveFFTC.java    |  36 +-
 .../ops2/filter/convolve/ConvolveFFTF.java    |  32 +-
 .../ops2/filter/convolve/ConvolveNaiveC.java  |  10 +-
 .../ops2/filter/convolve/ConvolveNaiveF.java  |  24 +-
 .../ops2/filter/correlate/CorrelateFFTC.java  |  20 +-
 .../ops2/filter/correlate/CorrelateFFTF.java  |  22 +-
 .../derivative/PartialDerivativeRAI.java      |  10 +-
 .../derivative/PartialDerivativesRAI.java     |   8 +-
 .../DefaultDerivativeGauss.java               |  12 +-
 .../imagej/ops2/filter/dog/DefaultDoG.java    |  12 +-
 .../ops2/filter/dog/DoGVaryingSigmas.java     |  32 +-
 .../filter/fft/CreateOutputFFTMethods.java    |  22 +-
 .../imagej/ops2/filter/fft/FFTMethodsOpC.java |  10 +-
 .../imagej/ops2/filter/fft/FFTMethodsOpF.java |  16 +-
 .../filter/fftSize/ComputeFFTMethodsSize.java |  12 +-
 .../ops2/filter/fftSize/ComputeFFTSize.java   |  16 +-
 .../filter/fftSize/DefaultComputeFFTSize.java |  10 +-
 .../ops2/filter/hessian/HessianRAI.java       |   8 +-
 .../ops2/filter/ifft/IFFTMethodsOpC.java      |  10 +-
 .../ops2/filter/ifft/IFFTMethodsOpI.java      |   8 +-
 .../ops2/filter/max/DefaultMaxFilter.java     |  12 +-
 .../ops2/filter/mean/DefaultMeanFilter.java   |  12 +-
 .../filter/median/DefaultMedianFilter.java    |  12 +-
 .../ops2/filter/min/DefaultMinFilter.java     |  12 +-
 .../ops2/filter/pad/DefaultPadInputFFT.java   |   5 -
 .../filter/pad/DefaultPadShiftKernelFFT.java  |   3 -
 .../net/imagej/ops2/filter/pad/PadInput.java  |  12 +-
 .../ops2/filter/pad/PadInputFFTMethods.java   |   5 -
 .../ops2/filter/pad/PadShiftKernel.java       |  10 +-
 .../filter/pad/PadShiftKernelFFTMethods.java  |   3 -
 .../filter/pad/PaddingIntervalCentered.java   |  10 +-
 .../filter/pad/PaddingIntervalOrigin.java     |  10 +-
 .../ops2/filter/sigma/DefaultSigmaFilter.java |  16 +-
 .../imagej/ops2/filter/sobel/SobelRAI.java    |   8 +-
 .../ops2/filter/tubeness/DefaultTubeness.java |  26 +-
 .../variance/DefaultVarianceFilter.java       |  12 +-
 .../ops2/filter/vesselness/DefaultFrangi.java |  12 +-
 .../java/net/imagej/ops2/geom/CentroidII.java |   8 +-
 .../imagej/ops2/geom/CentroidLabelRegion.java |   8 +-
 .../net/imagej/ops2/geom/CentroidMesh.java    |   8 +-
 .../net/imagej/ops2/geom/CentroidPolygon.java |   8 +-
 .../ops2/geom/DefaultCenterOfGravity.java     |   8 +-
 .../java/net/imagej/ops2/geom/SizeII.java     |   8 +-
 .../DefaultBoundarySizeConvexHullPolygon.java |   2 -
 .../ops2/geom/geom2d/DefaultBoundingBox.java  |   8 +-
 .../geom/geom2d/DefaultBoxivityPolygon.java   |   2 -
 .../ops2/geom/geom2d/DefaultCircularity.java  |   8 +-
 .../ops2/geom/geom2d/DefaultContour.java      |  10 +-
 .../ops2/geom/geom2d/DefaultConvexHull2D.java |   8 +-
 .../geom/geom2d/DefaultConvexityPolygon.java  |   2 -
 .../ops2/geom/geom2d/DefaultEccentricity.java |   8 +-
 .../ops2/geom/geom2d/DefaultElongation.java   |   8 +-
 .../ops2/geom/geom2d/DefaultFeretsAngle.java  |   8 +-
 .../geom/geom2d/DefaultFeretsDiameter.java    |   8 +-
 .../geom2d/DefaultFeretsDiameterForAngle.java |  10 +-
 .../ops2/geom/geom2d/DefaultMajorAxis.java    |   8 +-
 .../ops2/geom/geom2d/DefaultMaximumFeret.java |   8 +-
 .../geom/geom2d/DefaultMaximumFeretAngle.java |   8 +-
 .../geom2d/DefaultMaximumFeretDiameter.java   |   8 +-
 .../ops2/geom/geom2d/DefaultMinimumFeret.java |   8 +-
 .../geom/geom2d/DefaultMinimumFeretAngle.java |   8 +-
 .../geom2d/DefaultMinimumFeretDiameter.java   |   8 +-
 .../ops2/geom/geom2d/DefaultMinorAxis.java    |   8 +-
 .../geom/geom2d/DefaultMinorMajorAxis.java    |   8 +-
 .../geom/geom2d/DefaultPerimeterLength.java   |   8 +-
 .../ops2/geom/geom2d/DefaultRoundness.java    |   8 +-
 .../geom2d/DefaultSizeConvexHullPolygon.java  |   2 -
 .../ops2/geom/geom2d/DefaultSizePolygon.java  |   8 +-
 .../DefaultSmallestEnclosingRectangle.java    |   8 +-
 .../geom/geom2d/DefaultSolidityPolygon.java   |   2 -
 ...DefaultVerticesCountConvexHullPolygon.java |   8 +-
 .../geom2d/DefaultVerticesCountPolygon.java   |   8 +-
 .../ops2/geom/geom3d/DefaultBoxivityMesh.java |   2 -
 .../ops2/geom/geom3d/DefaultCompactness.java  |   8 +-
 .../ops2/geom/geom3d/DefaultConvexHull3D.java |  16 +-
 .../geom/geom3d/DefaultConvexityMesh.java     |   2 -
 .../geom/geom3d/DefaultInertiaTensor3D.java   |   8 +-
 .../geom3d/DefaultInertiaTensor3DMesh.java    |   8 +-
 .../geom/geom3d/DefaultMainElongation.java    |   8 +-
 .../geom/geom3d/DefaultMarchingCubes.java     |  20 +-
 .../geom/geom3d/DefaultMedianElongation.java  |   8 +-
 .../ops2/geom/geom3d/DefaultSolidityMesh.java |   2 -
 .../geom/geom3d/DefaultSparenessMesh.java     |   8 +-
 .../ops2/geom/geom3d/DefaultSphericity.java   |   8 +-
 .../ops2/geom/geom3d/DefaultSurfaceArea.java  |   8 +-
 .../DefaultSurfaceAreaConvexHullMesh.java     |   2 -
 .../DefaultVerticesCountConvexHullMesh.java   |   8 +-
 .../geom/geom3d/DefaultVerticesCountMesh.java |   8 +-
 .../geom3d/DefaultVolumeConvexHullMesh.java   |   2 -
 .../ops2/geom/geom3d/DefaultVolumeMesh.java   |   8 +-
 .../geom/geom3d/DefaultVoxelization3D.java    |  14 +-
 .../net/imagej/ops2/help/HelpForName.java     |   9 +-
 .../imagej/ops2/identity/DefaultIdentity.java |   6 +-
 .../imagej/ops2/image/ascii/DefaultASCII.java |  12 +-
 .../CooccurrenceMatrix.java                   |  14 +-
 .../CalibratedDistanceTransformer.java        |  12 +-
 .../DefaultDistanceTransformCalibration.java  |  12 +-
 .../DistanceTransformer.java                  |  10 +-
 .../equation/DefaultCoordinatesEquation.java  |   8 +-
 .../ops2/image/equation/DefaultEquation.java  |  10 +-
 .../imagej/ops2/image/fill/DefaultFill.java   |   8 +-
 .../net/imagej/ops2/image/fill/FillRAI.java   |   6 +-
 .../ops2/image/histogram/HistogramCreate.java |  18 +-
 .../image/integral/DefaultIntegralImg.java    |   2 -
 .../image/integral/SquareIntegralImg.java     |   2 -
 .../image/integral/WrappedIntegralImg.java    |   8 +-
 .../imagej/ops2/image/invert/InvertII.java    |   4 -
 .../ops2/image/invert/InvertIIInteger.java    |   4 -
 .../image/normalize/NormalizeIIComputer.java  |  16 +-
 .../image/normalize/NormalizeIIFunction.java  |  16 +-
 .../ops2/image/normalize/NormalizeIILazy.java |   8 +-
 .../normalize/NormalizeIILazyFunction.java    |   8 +-
 .../ops2/image/watershed/Watershed.java       |  52 +-
 .../ops2/image/watershed/WatershedBinary.java |  68 +-
 .../watershed/WatershedBinarySingleSigma.java |  68 +-
 .../ops2/image/watershed/WatershedSeeded.java |  60 +-
 .../DefaultCentralMoment00.java               |   8 +-
 .../DefaultCentralMoment01.java               |   2 -
 .../DefaultCentralMoment02.java               |   8 +-
 .../DefaultCentralMoment03.java               |   8 +-
 .../DefaultCentralMoment10.java               |   2 -
 .../DefaultCentralMoment11.java               |   8 +-
 .../DefaultCentralMoment12.java               |   8 +-
 .../DefaultCentralMoment20.java               |   8 +-
 .../DefaultCentralMoment21.java               |   8 +-
 .../DefaultCentralMoment30.java               |   8 +-
 .../IterableCentralMoment00.java              |   8 +-
 .../IterableCentralMoment11.java              |   8 +-
 .../imagemoments/hu/DefaultHuMoment1.java     |   8 +-
 .../imagemoments/hu/DefaultHuMoment2.java     |   8 +-
 .../imagemoments/hu/DefaultHuMoment3.java     |   8 +-
 .../imagemoments/hu/DefaultHuMoment4.java     |   8 +-
 .../imagemoments/hu/DefaultHuMoment5.java     |   8 +-
 .../imagemoments/hu/DefaultHuMoment6.java     |   8 +-
 .../imagemoments/hu/DefaultHuMoment7.java     |   8 +-
 .../imagemoments/moments/DefaultMoment00.java |   2 -
 .../imagemoments/moments/DefaultMoment01.java |   2 -
 .../imagemoments/moments/DefaultMoment10.java |   2 -
 .../imagemoments/moments/DefaultMoment11.java |   2 -
 .../DefaultNormalizedCentralMoment02.java     |   2 -
 .../DefaultNormalizedCentralMoment03.java     |   2 -
 .../DefaultNormalizedCentralMoment11.java     |   2 -
 .../DefaultNormalizedCentralMoment12.java     |   2 -
 .../DefaultNormalizedCentralMoment20.java     |   2 -
 .../DefaultNormalizedCentralMoment21.java     |   2 -
 .../DefaultNormalizedCentralMoment30.java     |   2 -
 .../imagej/ops2/labeling/MergeLabeling.java   |  22 +-
 .../imagej/ops2/labeling/cca/DefaultCCA.java  |  26 +-
 .../java/net/imagej/ops2/logic/Default.java   |  10 +-
 .../java/net/imagej/ops2/logic/Ternary.java   |  12 +-
 .../neighborhood/DefaultMapNeighborhood.java  |  24 +-
 .../MapNeighborhoodWithCenter.java            |  24 +-
 .../multiply/ComplexConjugateMultiplyOp.java  |  10 +-
 .../imagej/ops2/morphology/ExtractHoles.java  |  18 +-
 .../net/imagej/ops2/morphology/FillHoles.java |  11 +-
 .../net/imagej/ops2/morphology/Outline.java   |  10 +-
 .../ops2/morphology/thin/ThinGuoHall.java     |   8 +-
 .../ops2/morphology/thin/ThinHilditch.java    |   8 +-
 .../morphology/thin/ThinMorphological.java    |   8 +-
 .../ops2/morphology/thin/ThinZhangSuen.java   |   8 +-
 .../ops2/project/DefaultProjectParallel.java  |  12 +-
 .../project/ProjectRAIToIterableInterval.java |  12 +-
 .../DefaultDetectJunctions.java               |  18 +-
 .../detectRidges/DefaultDetectRidges.java     |  16 +-
 .../net/imagej/ops2/slice/SliceRAI2RAI.java   |  14 +-
 .../ops2/stats/DefaultGeometricMean.java      |   8 +-
 .../ops2/stats/DefaultHarmonicMean.java       |   8 +-
 .../imagej/ops2/stats/DefaultKurtosis.java    |   8 +-
 .../net/imagej/ops2/stats/DefaultMax.java     |   8 +-
 .../net/imagej/ops2/stats/DefaultMean.java    |   8 +-
 .../net/imagej/ops2/stats/DefaultMedian.java  |   8 +-
 .../net/imagej/ops2/stats/DefaultMin.java     |   8 +-
 .../net/imagej/ops2/stats/DefaultMinMax.java  |   8 +-
 .../ops2/stats/DefaultMoment1AboutMean.java   |   8 +-
 .../ops2/stats/DefaultMoment2AboutMean.java   |   8 +-
 .../ops2/stats/DefaultMoment3AboutMean.java   |   8 +-
 .../ops2/stats/DefaultMoment4AboutMean.java   |   8 +-
 .../ops2/stats/DefaultMomentNAboutMean.java   |   8 +-
 .../imagej/ops2/stats/DefaultPercentile.java  |  10 +-
 .../imagej/ops2/stats/DefaultQuantile.java    |  10 +-
 .../net/imagej/ops2/stats/DefaultSize.java    |   8 +-
 .../imagej/ops2/stats/DefaultSkewness.java    |   8 +-
 .../ops2/stats/DefaultStandardDeviation.java  |   8 +-
 .../net/imagej/ops2/stats/DefaultSum.java     |   8 +-
 .../ops2/stats/DefaultSumOfInverses.java      |   8 +-
 .../imagej/ops2/stats/DefaultSumOfLogs.java   |   8 +-
 .../ops2/stats/DefaultSumOfSquares.java       |   8 +-
 .../imagej/ops2/stats/DefaultVariance.java    |   8 +-
 .../net/imagej/ops2/stats/IntegralMean.java   |   8 +-
 .../net/imagej/ops2/stats/IntegralSum.java    |   8 +-
 .../imagej/ops2/stats/IntegralVariance.java   |   8 +-
 .../ops2/stats/IterableGeometricMean.java     |   8 +-
 .../ops2/stats/IterableHarmonicMean.java      |   8 +-
 .../net/imagej/ops2/stats/IterableMax.java    |   8 +-
 .../net/imagej/ops2/stats/IterableMean.java   |   8 +-
 .../net/imagej/ops2/stats/IterableMin.java    |   8 +-
 .../net/imagej/ops2/stats/IterableMinMax.java |   8 +-
 .../ops2/stats/IterableMoment3AboutMean.java  |   8 +-
 .../ops2/stats/IterableMoment4AboutMean.java  |   8 +-
 .../net/imagej/ops2/stats/IterableSize.java   |   8 +-
 .../ops2/stats/IterableStandardDeviation.java |   8 +-
 .../net/imagej/ops2/stats/IterableSum.java    |   8 +-
 .../ops2/stats/IterableSumOfInverses.java     |   8 +-
 .../imagej/ops2/stats/IterableSumOfLogs.java  |   8 +-
 .../ops2/stats/IterableSumOfSquares.java      |   8 +-
 .../imagej/ops2/stats/IterableVariance.java   |   8 +-
 .../regression/leastSquares/Quadric.java      |   8 +-
 .../thread/chunker/ChunkerInterleaved.java    |  10 +-
 .../ops2/thread/chunker/DefaultChunker.java   |  10 +-
 .../AbstractApplyThresholdIterable.java       |   8 +-
 .../threshold/ApplyThresholdMethodLocal.java  |  12 +-
 .../apply/ApplyConstantThreshold.java         |  22 +-
 .../apply/ApplyThresholdComparable.java       |  10 +-
 .../apply/ApplyThresholdComparator.java       |  12 +-
 .../huang/ComputeHuangThreshold.java          |   8 +-
 .../threshold/ij1/ComputeIJ1Threshold.java    |   8 +-
 .../ComputeIntermodesThreshold.java           |   2 -
 .../isoData/ComputeIsoDataThreshold.java      |   8 +-
 .../ops2/threshold/li/ComputeLiThreshold.java |   8 +-
 .../ComputeLocalBernsenThreshold.java         |  14 +-
 .../localBernsen/LocalBernsenThreshold.java   |  16 +-
 .../ComputeLocalContrastThreshold.java        |  10 +-
 .../localContrast/LocalContrastThreshold.java |  12 +-
 .../localMean/ComputeLocalMeanThreshold.java  |  12 +-
 .../ComputeLocalMeanThresholdIntegral.java    |  12 +-
 .../localMean/LocalMeanThreshold.java         |  14 +-
 .../ComputeLocalMedianThreshold.java          |  12 +-
 .../localMedian/LocalMedianThreshold.java     |  14 +-
 .../ComputeLocalMidGreyThreshold.java         |  12 +-
 .../localMidGrey/LocalMidGreyThreshold.java   |  14 +-
 .../ComputeLocalNiblackThreshold.java         |  14 +-
 .../ComputeLocalNiblackThresholdIntegral.java |  14 +-
 .../localNiblack/LocalNiblackThreshold.java   |  16 +-
 .../ComputeLocalPhansalkarThreshold.java      |  14 +-
 ...mputeLocalPhansalkarThresholdIntegral.java |  14 +-
 .../LocalPhansalkarThreshold.java             |  16 +-
 .../ComputeLocalSauvolaThreshold.java         |  14 +-
 .../ComputeLocalSauvolaThresholdIntegral.java |  14 +-
 .../localSauvola/LocalSauvolaThreshold.java   |  16 +-
 .../ComputeMaxEntropyThreshold.java           |   2 -
 .../ComputeMaxLikelihoodThreshold.java        |   8 +-
 .../threshold/mean/ComputeMeanThreshold.java  |   8 +-
 .../minError/ComputeMinErrorThreshold.java    |   8 +-
 .../minimum/ComputeMinimumThreshold.java      |   8 +-
 .../moments/ComputeMomentsThreshold.java      |   8 +-
 .../threshold/otsu/ComputeOtsuThreshold.java  |   8 +-
 .../ComputePercentileThreshold.java           |   2 -
 .../ComputeRenyiEntropyThreshold.java         |   2 -
 .../rosin/ComputeRosinThreshold.java          |   8 +-
 .../shanbhag/ComputeShanbhagThreshold.java    |   8 +-
 .../triangle/ComputeTriangleThreshold.java    |   8 +-
 .../threshold/yen/ComputeYenThreshold.java    |   8 +-
 .../net/imagej/ops2/topology/BoxCount.java    |  16 +-
 .../EulerCharacteristic26N.java               |   8 +-
 .../EulerCharacteristic26NFloating.java       |   8 +-
 .../eulerCharacteristic/EulerCorrection.java  |   8 +-
 .../ops2/types/adapt/LiftComputersToRAI.java  |  10 -
 .../ops2/types/adapt/LiftFunctionsToRAI.java  |  12 +-
 remove-params.sh                              |   8 +
 .../ComputersToFunctionsAndLift.java          |  97 ++-
 .../FunctionsToComputersAndLift.java          | 193 +++--
 .../ComputersToFunctionsViaFunction.java      |  97 ++-
 .../ComputersToFunctionsViaSource.java        | 103 ++-
 .../functional/FunctionsToComputers.java      | 103 ++-
 .../adapt/functional/InplacesToFunctions.java | 818 ++++++++++++------
 .../ops/adapt/lift/ComputerToIterables.java   |  34 -
 .../ops/adapt/lift/FunctionToIterables.java   |  32 -
 .../conversionLoss/IdentityLossReporter.java  |  10 +-
 .../PrimitiveArrayLossReporters.java          |  20 -
 .../ops/create/CreateOpCollection.java        |   1 -
 .../java/org/scijava/ops/math/Normalize.java  |  11 +-
 .../main/java/org/scijava/ops/math/Zero.java  |   1 -
 .../org/scijava/ops/simplify/Identity.java    |  13 +-
 .../ops/simplify/PrimitiveListSimplifier.java |   8 +-
 .../main/java/org/scijava/ops/stats/Mean.java |  13 +-
 .../main/java/org/scijava/ops/stats/Size.java |  25 +-
 .../java/org/scijava/ops/OpCachingTest.java   |   1 -
 .../org/scijava/ops/OpEnvironmentTest.java    |   1 -
 .../java/org/scijava/ops/OpMethodTestOps.java |   1 -
 .../java/org/scijava/ops/OpPriorityTest.java  |   2 -
 .../test/java/org/scijava/ops/TestOps.java    |  12 -
 .../ops/adapt/OpAdaptationPriorityTest.java   |   5 -
 .../ComputerToFunctionAdaptTestOps.java       | 152 ----
 .../FunctionToComputerAdaptTestOps.java       | 152 ----
 .../ops/matcher/MatchingWithAnyTest.java      |  13 -
 .../ops/matcher/MatchingWithGCSTTest.java     |   2 -
 .../scijava/ops/monitor/OpMonitorTest.java    |   5 -
 .../scijava/ops/util/OpsAsParametersTest.java |   7 -
 .../scijava/param/JavadocParameterTest.java   |   1 -
 .../ComputersToFunctionsAndLift.vm            |   7 +-
 .../FunctionsToComputersAndLift.vm            |  13 +-
 .../ComputersToFunctionsViaFunction.vm        |   7 +-
 .../ComputersToFunctionsViaSource.vm          |   7 +-
 .../adapt/functional/FunctionsToComputers.vm  |   7 +-
 .../adapt/functional/InplacesToFunctions.vm   |   8 +-
 .../ops/adapt/lift/ComputerToIterables.vm     |   2 -
 .../ops/adapt/lift/FunctionToIterables.vm     |   2 -
 .../java/org/scijava/ops/OpMethodTestOps.vm   |   1 -
 .../ComputerToFunctionAdaptTestOps.vm         |   3 -
 .../FunctionToComputerAdaptTestOps.vm         |   3 -
 360 files changed, 3340 insertions(+), 2149 deletions(-)
 create mode 100644 remove-params.sh

diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java
index c7fa99e4d..f4b81e2b7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java
@@ -53,11 +53,6 @@
  *            Type of the second image
  */
 @Plugin(type = Op.class, name = "coloc.icq")
-@Parameter(key = "image1")
-@Parameter(key = "image2")
-@Parameter(key = "mean1")
-@Parameter(key = "mean2")
-@Parameter(key = "output")
 public class LiICQ<T extends RealType<T>, U extends RealType<U>, V extends RealType<V>>
 		implements Functions.Arity4<Iterable<T>, Iterable<U>, DoubleType, DoubleType, Double> {
 
@@ -67,6 +62,15 @@ public class LiICQ<T extends RealType<T>, U extends RealType<U>, V extends RealT
 	private Computers.Arity1<Iterable<U>, DoubleType> meanUOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param image1
+	 * @param image2
+	 * @param mean1
+	 * @param mean2
+	 * @return the output
+	 */
 	public Double apply(final Iterable<T> image1, final Iterable<U> image2, final DoubleType mean1, final DoubleType mean2) {
 
 		if (!ColocUtil.sameIterationOrder(image1, image2))
@@ -120,9 +124,6 @@ private double computeMeanUOf(final Iterable<U> in) {
 }
 
 @Plugin(type = Op.class, name = "coloc.icq")
-@Parameter(key = "image1")
-@Parameter(key = "image2")
-@Parameter(key = "output")
 class LiICQSimple<T extends RealType<T>, U extends RealType<U>, V extends RealType<V>>
 		implements BiFunction<Iterable<T>, Iterable<U>, Double> {
 	
@@ -130,6 +131,13 @@ class LiICQSimple<T extends RealType<T>, U extends RealType<U>, V extends RealTy
 	private Functions.Arity4<Iterable<T>, Iterable<U>, DoubleType, DoubleType, Double> colocOp;
 	
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param image1
+	 * @param image2
+	 * @return the output
+	 */
 	public Double apply(Iterable<T> image1, Iterable<U> image2) {
 		return colocOp.apply(image1, image2, null, null);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java
index 66c8e620c..aff6cf41b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java
@@ -76,13 +76,17 @@
  * @param <T>
  */
 @Plugin(type = Op.class, name = "coloc.kendallTau")
-@Parameter(key = "image1")
-@Parameter(key = "image2")
-@Parameter(key = "output")
 public class KendallTauBRank<T extends RealType<T>, U extends RealType<U>>
 		/* extends Algorithm<T> */ implements BiFunction<Iterable<T>, Iterable<U>, Double> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param image1
+	 * @param image2
+	 * @return the output
+	 */
 	public Double apply(Iterable<T> image1, Iterable<U> image2) {
 		if (!ColocUtil.sameIterationOrder(image1, image2))
 			throw new IllegalArgumentException("Input and output must be of the same iteration order!");
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java
index 522025be0..3f93317ce 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java
@@ -68,10 +68,6 @@
  * @author Curtis Rueden
  */
 @Plugin(type = Op.class, name = "coloc.maxTKendallTau")
-@Parameter(key = "image1")
-@Parameter(key = "image2")
-@Parameter(key = "seed")
-@Parameter(key = "output")
 public class MTKT<T extends RealType<T>, U extends RealType<U>>
 	implements Functions.Arity3<RandomAccessibleInterval<T>, RandomAccessibleInterval<U>, Long, Double> 
 {
@@ -87,6 +83,14 @@ public class MTKT<T extends RealType<T>, U extends RealType<U>>
 	private Computers.Arity1<Histogram1d<U>, U> thresholdOpU;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param image1
+	 * @param image2
+	 * @param seed
+	 * @return the output
+	 */
 	public Double apply(final RandomAccessibleInterval<T> image1, final RandomAccessibleInterval<U> image2, final Long seed) {
 		// check image sizes
 		// TODO: Add these checks to conforms().
@@ -248,9 +252,6 @@ static double calculateKendallTau(final double[][] rank,
 }
 
 @Plugin(type = Op.class, name = "coloc.maxTKendallTau")
-@Parameter(key = "image1")
-@Parameter(key = "image2")
-@Parameter(key = "output")
 class MTKTSimple<T extends RealType<T>, U extends RealType<U>>
 	implements BiFunction<RandomAccessibleInterval<T>, RandomAccessibleInterval<U>, Double> 
 {
@@ -261,6 +262,13 @@ class MTKTSimple<T extends RealType<T>, U extends RealType<U>>
 	private long seed = 0x89302341;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param image1
+	 * @param image2
+	 * @return the output
+	 */
 	public Double apply(RandomAccessibleInterval<T> image1, RandomAccessibleInterval<U> image2) {
 		return colocOp.apply(image1, image2, seed);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java
index 69be888e1..399ad6e5e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java
@@ -62,18 +62,22 @@
  * Statistical Approach".
  */
 @Plugin(type = Op.class, name = "coloc.pValue")
-@Parameter(key = "image1")
-@Parameter(key = "image2")
-@Parameter(key = "op")
-@Parameter(key = "nrRandomizations")
-@Parameter(key = "psfSize")
-@Parameter(key = "seed")
-@Parameter(key = "executorService")
-@Parameter(key = "output")
 public class DefaultPValue<T extends RealType<T>, U extends RealType<U>> implements
 		Computers.Arity7<RandomAccessibleInterval<T>, RandomAccessibleInterval<U>, BiFunction<RandomAccessibleInterval<T>, RandomAccessibleInterval<U>, Double>, Integer, Dimensions, Long, ExecutorService, PValueResult> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param image1
+	 * @param image2
+	 * @param op
+	 * @param nrRandomizations
+	 * @param psfSize
+	 * @param seed
+	 * @param executorService
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<T> image1, final RandomAccessibleInterval<U> image2,
 			final BiFunction<RandomAccessibleInterval<T>, RandomAccessibleInterval<U>, Double> op,
 			final Integer nrRandomizations, final Dimensions psfSize, final Long seed, final ExecutorService es,
@@ -191,12 +195,6 @@ private static <V> RandomAccessibleInterval<V> trim(final RandomAccessibleInterv
 }
 
 @Plugin(type = Op.class, name = "coloc.pValue")
-@Parameter(key = "image1")
-@Parameter(key = "image2")
-@Parameter(key = "op")
-@Parameter(key = "nrRandomizations")
-@Parameter(key = "executorService")
-@Parameter(key = "output")
 class PValueSimpleWithRandomizations<T extends RealType<T>, U extends RealType<U>> implements
 		Computers.Arity5<RandomAccessibleInterval<T>, RandomAccessibleInterval<U>, BiFunction<RandomAccessibleInterval<T>, RandomAccessibleInterval<U>, Double>, Integer, ExecutorService, PValueResult> {
 
@@ -204,6 +202,16 @@ class PValueSimpleWithRandomizations<T extends RealType<T>, U extends RealType<U
 	private Computers.Arity7<RandomAccessibleInterval<T>, RandomAccessibleInterval<U>, BiFunction<RandomAccessibleInterval<T>, RandomAccessibleInterval<U>, Double>, Integer, Dimensions, Long, ExecutorService, PValueResult> pValueOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param image1
+	 * @param image2
+	 * @param op
+	 * @param nrRandomizations
+	 * @param executorService
+	 * @param output
+	 */
 	public void compute(RandomAccessibleInterval<T> in1, RandomAccessibleInterval<U> in2,
 			BiFunction<RandomAccessibleInterval<T>, RandomAccessibleInterval<U>, Double> in3, Integer in4,
 			ExecutorService in5, PValueResult out) {
@@ -214,11 +222,6 @@ public void compute(RandomAccessibleInterval<T> in1, RandomAccessibleInterval<U>
 }
 
 @Plugin(type = Op.class, name = "coloc.pValue")
-@Parameter(key = "image1")
-@Parameter(key = "image2")
-@Parameter(key = "op")
-@Parameter(key = "executorService")
-@Parameter(key = "output")
 class PValueSimple<T extends RealType<T>, U extends RealType<U>> implements
 		Computers.Arity4<RandomAccessibleInterval<T>, RandomAccessibleInterval<U>, BiFunction<RandomAccessibleInterval<T>, RandomAccessibleInterval<U>, Double>, ExecutorService, PValueResult> {
 
@@ -226,6 +229,15 @@ class PValueSimple<T extends RealType<T>, U extends RealType<U>> implements
 	private Computers.Arity5<RandomAccessibleInterval<T>, RandomAccessibleInterval<U>, BiFunction<RandomAccessibleInterval<T>, RandomAccessibleInterval<U>, Double>, Integer, ExecutorService, PValueResult> pValueOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param image1
+	 * @param image2
+	 * @param op
+	 * @param executorService
+	 * @param output
+	 */
 	public void compute(RandomAccessibleInterval<T> in1, RandomAccessibleInterval<U> in2,
 			BiFunction<RandomAccessibleInterval<T>, RandomAccessibleInterval<U>, Double> in3, ExecutorService in4,
 			PValueResult out) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java
index 726f4d7dc..b112d4ee6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java
@@ -47,14 +47,18 @@
  * @author Ellen T Arena
  */
 @Plugin(type = Op.class, name = "coloc.pearsons")
-@Parameter(key = "image1")
-@Parameter(key = "image2")
-@Parameter(key = "output")
 public class DefaultPearsons<T extends RealType<T>, U extends RealType<U>> implements
 	BiFunction<Iterable<T>, Iterable<U>, Double> 
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param image1
+	 * @param image2
+	 * @return the output
+	 */
 	public Double apply(final Iterable<T> image1,
 		final Iterable<U> image2)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java
index 41d852383..e0f94486d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java
@@ -44,13 +44,17 @@
  * @author Martin Horn (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "convert.clip")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class ClipRealTypes<I extends RealType<I>, O extends RealType<O>>
 	implements Computers.Arity1<I, O>
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void compute(final I input, final O output) {
 		final double v = input.getRealDouble();
 		final double outMin = output.getMinValue();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java
index 2484c13f7..4ebe89636 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java
@@ -44,13 +44,17 @@
  * @author Martin Horn (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "convert.copy")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class CopyRealTypes<I extends RealType<I>, O extends RealType<O>>
 	implements Computers.Arity1<I, O> 
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void compute(final I input, final O output) {
 		output.setReal(input.getRealDouble());
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java
index 1edce1c98..ba3a27ad0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java
@@ -52,11 +52,15 @@
  * @param <T>
  */
 @Plugin(type = Op.class, name = "copy, copy.img", priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "copy")
 public class CopyArrayImg<T extends NativeType<T>, A extends ArrayDataAccess<A>>
 		implements Computers.Arity1<ArrayImg<T, A>, ArrayImg<T, A>> {
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param copy
+	 */
 	public void compute(final ArrayImg<T, A> input, final ArrayImg<T, A> output) {
 
 		if (!Intervals.equalDimensions(input, output))
@@ -69,8 +73,6 @@ public void compute(final ArrayImg<T, A> input, final ArrayImg<T, A> output) {
 }
 
 @Plugin(type = Op.class, name = "copy, copy.img", priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "copy")
 class CopyArrayImgFunction<T extends NativeType<T>, A extends ArrayDataAccess<A>>
 		implements Function<ArrayImg<T, A>, ArrayImg<T, A>> {
 
@@ -78,6 +80,12 @@ class CopyArrayImgFunction<T extends NativeType<T>, A extends ArrayDataAccess<A>
 	private Computers.Arity1<ArrayImg<T, A>, ArrayImg<T, A>> copyOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param copy
+	 */
 	public ArrayImg<T, A> apply(ArrayImg<T, A> input) {
 		// NB: Workaround for ArrayImgFactory not overriding create(Dimensions, T).
 		final long[] dims = new long[input.numDimensions()];
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java
index 6033bf832..f0453fde0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java
@@ -50,8 +50,6 @@
  * @param <T>
  */
 @Plugin(type = Op.class, name = "copy, copy.iterableInterval", priority = 1.0)
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class CopyII<T> implements Computers.Arity1<IterableInterval<T>, IterableInterval<T>> {
 
 	// used internally
@@ -60,6 +58,12 @@ public class CopyII<T> implements Computers.Arity1<IterableInterval<T>, Iterable
 	private Computers.Arity1<T, T> copyOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void compute(final IterableInterval<T> input, final IterableInterval<T> output) {
 		if (!input.iterationOrder().equals(output.iterationOrder()))
 			throw new IllegalArgumentException("input and output must be of the same dimensions!");
@@ -69,8 +73,6 @@ public void compute(final IterableInterval<T> input, final IterableInterval<T> o
 }
 
 @Plugin(type = Op.class, name = "copy, copy.iterableInterval", priority = 1.0)
-@Parameter(key = "input")
-@Parameter(key = "output")
 class CopyIIFunction<T> implements Function<IterableInterval<T>, IterableInterval<T>> {
 
 	@OpDependency(name = "create.img")
@@ -79,6 +81,12 @@ class CopyIIFunction<T> implements Function<IterableInterval<T>, IterableInterva
 	private Computers.Arity1<IterableInterval<T>, IterableInterval<T>> copyOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @return the output
+	 */
 	public IterableInterval<T> apply(IterableInterval<T> input) {
 		IterableInterval<T> output = imgCreator.apply(input, input.firstElement());
 		copyOp.compute(input, output);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java
index 947ac5b29..e4e543c25 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java
@@ -49,14 +49,18 @@
  * @param <T>
  */
 @Plugin(type = Op.class, name = "copy, copy.img")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class CopyImg<T extends NativeType<T>> implements Computers.Arity1<Img<T>, Img<T>> {
 
 	@OpDependency(name = "copy.iterableInterval")
 	private Computers.Arity1<Iterable<T>, Iterable<T>> copyComputer;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void compute(final Img<T> input, final Img<T> output) {
 		if (!input.iterationOrder().equals(output.iterationOrder()))
 			throw new IllegalArgumentException("input and output must have the same iteration order!");
@@ -65,8 +69,6 @@ public void compute(final Img<T> input, final Img<T> output) {
 }
 
 @Plugin(type = Op.class, name = "copy, copy.img")
-@Parameter(key = "input")
-@Parameter(key = "output")
 class CopyImgFunction<T extends NativeType<T>> implements Function<Img<T>, Img<T>> {
 
 	@OpDependency(name = "copy.img")
@@ -76,6 +78,12 @@ class CopyImgFunction<T extends NativeType<T>> implements Function<Img<T>, Img<T
 	private Function<Img<T>, Img<T>> createFunc;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @return the output
+	 */
 	public Img<T> apply(Img<T> input) {
 		Img<T> output = createFunc.apply(input);
 		copyComputer.compute(input, output);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java
index ec5a60eac..0a97b53cd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java
@@ -51,8 +51,6 @@
  * @param <T>
  */
 @Plugin(type = Op.class, name = "copy, copy.imgLabeling")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class CopyImgLabeling<T extends IntegerType<T> & NativeType<T>, L>
 		implements Computers.Arity1<ImgLabeling<L, T>, ImgLabeling<L, T>> {
 
@@ -62,6 +60,12 @@ public class CopyImgLabeling<T extends IntegerType<T> & NativeType<T>, L>
 	private Computers.Arity1<LabelingMapping<L>, LabelingMapping<L>> mappingCopyOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void compute(final ImgLabeling<L, T> input, final ImgLabeling<L, T> output) {
 		if (!Intervals.equalDimensions(input, output))
 			throw new IllegalArgumentException("input and output must be of the same size!");
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java
index 9185783db..4d4602af6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java
@@ -49,11 +49,15 @@
  * @param <L>
  */
 @Plugin(type = Op.class, name = "copy, copy.labelingMapping", priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class CopyLabelingMapping<L> implements Computers.Arity1<LabelingMapping<L>, LabelingMapping<L>> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void compute(final LabelingMapping<L> input, final LabelingMapping<L> output) {
 
 		final LabelingMappingSerializationAccess<L> access = new LabelingMappingSerializationAccess<>(output);
@@ -63,8 +67,6 @@ public void compute(final LabelingMapping<L> input, final LabelingMapping<L> out
 }
 
 //@Plugin(type = Op.class, name = "copy.labelingMapping", priority = Priority.VERY_HIGH)
-//@Parameter(key = "input")
-//@Parameter(key = "output")
 //class CopyLabelingMappingFunction<L> implements Function<LabelingMapping<L>, LabelingMapping<L>> {
 //
 //	@OpDependency(name = "copy.labelingMapping")
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java
index c00fb770e..a169cb9de 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java
@@ -49,14 +49,18 @@
  * @param <T>
  */
 @Plugin(type = Op.class, name = "copy, copy.rai", priority = 1.0)
-@Parameter(key = "input")
-@Parameter(key = "copy")
 public class CopyRAI<T> implements Computers.Arity1<RandomAccessibleInterval<T>, RandomAccessibleInterval<T>> {
 
 	@OpDependency(name = "copy")
 	private Computers.Arity1<T, T> mapComputer;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param copy
+	 */
 	public void compute(final RandomAccessibleInterval<T> input, final RandomAccessibleInterval<T> output) {
 		if (!Intervals.equalDimensions(input, output))
 			throw new IllegalArgumentException("input and output must be of the same dimensionality!");
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java
index 3c45565df..c85980681 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java
@@ -44,11 +44,15 @@
  * @param <T>
  */
 @Plugin(type = Op.class, name = "copy, copy.type")
-@Parameter(key = "input")
-@Parameter(key = "copy")
 public class CopyType<T extends Type<T>> implements Computers.Arity1<T, T> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param copy
+	 */
 	public void compute(final T input, final T output) {
 		output.set(input);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java
index 88c0a5a43..7f5368743 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java
@@ -61,10 +61,6 @@
  */
 
 @Plugin(type = Op.class, name = "deconvolve.firstGuess", priority = Priority.LOW)
-@Parameter(key = "input")
-@Parameter(key = "outType")
-@Parameter(key = "k")
-@Parameter(key = "output")
 public class NonCirculantFirstGuess<I extends RealType<I>, O extends RealType<O>, K extends RealType<K>, C extends ComplexType<C>>
 	implements
 	Functions.Arity3<RandomAccessibleInterval<I>, O, Dimensions, RandomAccessibleInterval<O>>
@@ -83,6 +79,14 @@ public class NonCirculantFirstGuess<I extends RealType<I>, O extends RealType<O>
 	 * normalization factor
 	 */
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param outType
+	 * @param k
+	 * @return the output
+	 */
 	public RandomAccessibleInterval<O> apply(RandomAccessibleInterval<I> in, final O outType, final Dimensions k) {
 
 		final Img<O> firstGuess = create.apply(in, outType);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java
index a14c92da2..a0066200a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java
@@ -70,12 +70,6 @@
 
 @Plugin(type = Op.class, name = "deconvolve.normalizationFactor",
 	priority = Priority.LOW)
-@Parameter(key = "io")
-@Parameter(key = "k")
-@Parameter(key = "l")
-@Parameter(key = "fftInput")
-@Parameter(key = "fftKernel")
-@Parameter(key = "executorService")
 public class NonCirculantNormalizationFactor<I extends RealType<I>, O extends RealType<O>, K extends RealType<K>, C extends ComplexType<C>>
 	implements Inplaces.Arity6_1<RandomAccessibleInterval<O>, Dimensions, Dimensions, RandomAccessibleInterval<C>, RandomAccessibleInterval<C>, ExecutorService>
 {
@@ -123,6 +117,13 @@ public class NonCirculantNormalizationFactor<I extends RealType<I>, O extends Re
 	/**
 	 * apply the normalization image needed for semi noncirculant model see
 	 * http://bigwww.epfl.ch/deconvolution/challenge2013/index.html?p=doc_math_rl
+	 *
+	 * @param io
+	 * @param k
+	 * @param l
+	 * @param fftInput
+	 * @param fftKernel
+	 * @param executorService
 	 */
 	@Override
 	public void mutate(RandomAccessibleInterval<O> arg, final Dimensions k, final Dimensions l, final RandomAccessibleInterval<C> fftInput, final RandomAccessibleInterval<C> fftKernel, final ExecutorService es) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java
index d887a24f0..55bf627e6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java
@@ -64,20 +64,6 @@
  */
 
 @Plugin(type = Op.class, name = "deconvolve.richardsonLucy", priority = Priority.HIGH)
-@Parameter(key = "input")
-@Parameter(key = "kernel")
-@Parameter(key = "fftInput")
-@Parameter(key = "fftKernel")
-@Parameter(key = "performInputFFT")
-@Parameter(key = "performKernelFFT")
-@Parameter(key = "complexType")
-@Parameter(key = "maxIterations")
-@Parameter(key = "accelerator")
-@Parameter(key = "updateOp", description = "by default, this should be RichardsonLucyUpdate")
-@Parameter(key = "raiExtendedEstimate")
-@Parameter(key = "iterativePostProcessingOps")
-@Parameter(key = "executorService")
-@Parameter(key = "output")
 public class RichardsonLucyC<I extends RealType<I>, O extends RealType<O>, K extends RealType<K>, C extends ComplexType<C>>
 		implements Computers.Arity13<RandomAccessibleInterval<I>, RandomAccessibleInterval<K>, RandomAccessibleInterval<C>, //
 			RandomAccessibleInterval<C>, Boolean, Boolean, C, Integer, Inplaces.Arity1<RandomAccessibleInterval<O>>, //
@@ -135,6 +121,24 @@ public class RichardsonLucyC<I extends RealType<I>, O extends RealType<O>, K ext
 	private Computers.Arity1<RandomAccessibleInterval<O>, RandomAccessibleInterval<O>> copy2Op;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param kernel
+	 * @param fftInput
+	 * @param fftKernel
+	 * @param performInputFFT
+	 * @param performKernelFFT
+	 * @param complexType
+	 * @param maxIterations
+	 * @param accelerator
+	 * @param updateOp by default, this should be RichardsonLucyUpdate
+	 * @param raiExtendedEstimate
+	 * @param iterativePostProcessingOps
+	 * @param executorService
+	 * @param output
+	 */
 	public void compute(RandomAccessibleInterval<I> in, RandomAccessibleInterval<K> kernel,
 			RandomAccessibleInterval<C> fftInput, RandomAccessibleInterval<C> fftKernel, Boolean performInputFFT,
 			Boolean performKernelFFT, C complexType, Integer maxIterations,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java
index 4420bedb1..6ff12742d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java
@@ -62,12 +62,6 @@
  */
 @Plugin(type = Op.class, name = "deconvolve.richardsonLucyCorrection",
 	priority = Priority.HIGH)
-@Parameter(key = "input")
-@Parameter(key = "reblurred")
-@Parameter(key = "fftBuffer")
-@Parameter(key = "fftKernel")
-@Parameter(key = "executorService")
-@Parameter(key = "output")
 public class RichardsonLucyCorrection<I extends RealType<I>, O extends RealType<O>, C extends ComplexType<C>>
 	implements
 	Computers.Arity5<RandomAccessibleInterval<I>, RandomAccessibleInterval<O>, RandomAccessibleInterval<C>, RandomAccessibleInterval<C>, ExecutorService, RandomAccessibleInterval<O>>
@@ -105,6 +99,13 @@ public class RichardsonLucyCorrection<I extends RealType<I>, O extends RealType<
 
 	/**
 	 * computes the correction factor of the Richardson Lucy Algorithm
+	 *
+	 * @param input
+	 * @param reblurred
+	 * @param fftBuffer
+	 * @param fftKernel
+	 * @param executorService
+	 * @param output
 	 */
 	@Override
 	public void compute(RandomAccessibleInterval<I> observed,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java
index 61ec30465..f0ec2c36d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java
@@ -65,18 +65,6 @@
  * @param <C>
  */
 @Plugin(type = Op.class, name = "deconvolve.richardsonLucy", priority = Priority.HIGH)
-@Parameter(key = "input")
-@Parameter(key = "kernel")
-@Parameter(key = "borderSize")
-@Parameter(key = "obfInput")
-@Parameter(key = "obfKernel")
-@Parameter(key = "outType")
-@Parameter(key = "fftType")
-@Parameter(key = "maxIterations", description = "max number of iterations")
-@Parameter(key = "nonCirculant", description = "indicates whether to use non-circulant edge handling")
-@Parameter(key = "accelerate", description = "indicates whether or not to use acceleration")
-@Parameter(key = "executorService")
-@Parameter(key = "output")
 public class RichardsonLucyF<I extends RealType<I> & NativeType<I>, O extends RealType<O> & NativeType<O>, K extends RealType<K> & NativeType<K>, C extends ComplexType<C> & NativeType<C>>
 		implements
 		Functions.Arity11<RandomAccessibleInterval<I>, RandomAccessibleInterval<K>, long[], OutOfBoundsFactory<I, RandomAccessibleInterval<I>>, OutOfBoundsFactory<K, RandomAccessibleInterval<K>>, O, C, Integer, Boolean, Boolean, ExecutorService, RandomAccessibleInterval<O>> {
@@ -195,6 +183,22 @@ private void computeFilter(final RandomAccessibleInterval<I> input,
 	}
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param kernel
+	 * @param borderSize
+	 * @param obfInput
+	 * @param obfKernel
+	 * @param outType
+	 * @param fftType
+	 * @param maxIterations max number of iterations
+	 * @param nonCirculant indicates whether to use non-circulant edge handling
+	 * @param accelerate indicates whether or not to use acceleration
+	 * @param executorService
+	 * @return the output
+	 */
 	public RandomAccessibleInterval<O> apply(RandomAccessibleInterval<I> input, RandomAccessibleInterval<K> kernel,
 			long[] borderSize, OutOfBoundsFactory<I, RandomAccessibleInterval<I>> obfInput,
 			OutOfBoundsFactory<K, RandomAccessibleInterval<K>> obfKernel, O outType, C complexType,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java
index f10177997..b18ecaaa4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java
@@ -68,19 +68,6 @@
  */
 @Plugin(type = Op.class, name = "deconvolve.richardsonLucyTV",
 	priority = Priority.HIGH)
-@Parameter(key = "input")
-@Parameter(key = "kernel")
-@Parameter(key = "borderSize")
-@Parameter(key = "obfInput")
-@Parameter(key = "obfKernel")
-@Parameter(key = "outType")
-@Parameter(key = "fftType")
-@Parameter(key = "maxIterations", description = "max number of iterations")
-@Parameter(key = "nonCirculant", description = "indicates whether to use non-circulant edge handling")
-@Parameter(key = "accelerate", description = "indicates whether or not to use acceleration")
-@Parameter(key = "regularizationFactor")
-@Parameter(key = "executorService")
-@Parameter(key = "output")
 public class RichardsonLucyTVF<I extends RealType<I> & NativeType<I>, O extends RealType<O> & NativeType<O>, K extends RealType<K> & NativeType<K>, C extends ComplexType<C> & NativeType<C>>
 	implements Functions.Arity12<RandomAccessibleInterval<I>, RandomAccessibleInterval<K>, long[], OutOfBoundsFactory<I, RandomAccessibleInterval<I>>, OutOfBoundsFactory<K, RandomAccessibleInterval<K>>, O, C, Integer, Boolean, Boolean, Float, ExecutorService, RandomAccessibleInterval<O>> {
 
@@ -186,6 +173,23 @@ public void computeFilter(final RandomAccessibleInterval<I> input, final RandomA
 		filter.compute(input, kernel, output);
 	}
 
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param kernel
+	 * @param borderSize
+	 * @param obfInput
+	 * @param obfKernel
+	 * @param outType
+	 * @param fftType
+	 * @param maxIterations max number of iterations
+	 * @param nonCirculant indicates whether to use non-circulant edge handling
+	 * @param accelerate indicates whether or not to use acceleration
+	 * @param regularizationFactor
+	 * @param executorService
+	 * @param output
+	 */
 	@Override
 	public RandomAccessibleInterval<O> apply(RandomAccessibleInterval<I> input, RandomAccessibleInterval<K> kernel,
 			long[] borderSize, OutOfBoundsFactory<I, RandomAccessibleInterval<I>> obfInput,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java
index 1b30e0e00..085ca3849 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java
@@ -63,10 +63,6 @@
  */
 @Plugin(type = Op.class, name = "deconvolve.richardsonLucyUpdate",
 	priority = Priority.HIGH)
-@Parameter(key = "input")
-@Parameter(key = "regularizationFactor")
-@Parameter(key = "variation")
-@Parameter(key = "output")
 public class RichardsonLucyTVUpdate<T extends RealType<T> & NativeType<T>, I extends RandomAccessibleInterval<T>>
 	implements Computers.Arity3<I, Float, RandomAccessibleInterval<T>, I> 
 {
@@ -76,6 +72,11 @@ public class RichardsonLucyTVUpdate<T extends RealType<T> & NativeType<T>, I ext
 
 	/**
 	 * performs update step of the Richardson Lucy with Total Variation Algorithm
+	 *
+	 * @param input
+	 * @param regularizationFactor
+	 * @param variation
+	 * @param output
 	 */
 	@Override
 	public void compute(final I correction, final Float regularizationFactor, RandomAccessibleInterval<T> variation, final I estimate) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java
index c1aa6abff..dd05d356a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java
@@ -51,8 +51,6 @@
  */
 @Plugin(type = Op.class, name = "deconvolve.richardsonLucyUpdate",
 	priority = Priority.HIGH)
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class RichardsonLucyUpdate<T extends RealType<T>> implements
 	Computers.Arity1<RandomAccessibleInterval<T>, RandomAccessibleInterval<T>>
 {
@@ -62,6 +60,9 @@ public class RichardsonLucyUpdate<T extends RealType<T>> implements
 
 	/**
 	 * performs update step of the Richardson Lucy Algorithm
+	 *
+	 * @param input
+	 * @param output
 	 */
 	@Override
 	public void compute(RandomAccessibleInterval<T> correction,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java
index a8a9fa49d..72c79d62e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java
@@ -63,7 +63,6 @@
  */
 @Plugin(type = Op.class, name = "deconvolve.accelerate",
 	priority = Priority.NORMAL)
-@Parameter(key = "io")
 public class VectorAccelerator<T extends RealType<T> & NativeType<T>> implements
 	Inplaces.Arity1<RandomAccessibleInterval<T>> 
 {
@@ -84,6 +83,11 @@ public class VectorAccelerator<T extends RealType<T> & NativeType<T>> implements
 
 	ArrayImgFactory<T> factory;
 
+	/**
+	 * TODO
+	 *
+	 * @param io
+	 */
 	@Override
 	public void mutate(RandomAccessibleInterval<T> yk_iterated) {
 		T type = Util.getTypeFromInterval(yk_iterated);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java
index 331072c64..1b0b59a2f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java
@@ -50,14 +50,18 @@
  * @see OpEvaluator
  */
 @Plugin(type = Op.class, name = "eval")
-@Parameter(key = "input")
-@Parameter(key = "vars")
-@Parameter(key = "opService")
-@Parameter(key = "output")
 public class DefaultEval implements Functions.Arity3<String, Map<String, Object>, OpService, Object>
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param vars
+	 * @param opService
+	 * @return the output
+	 */
 	public Object apply(final String input, final Map<String, Object> vars, final OpService ops) {
 		OpEvaluator e = new OpEvaluator(ops);
 		if (vars != null) e.setAll(vars);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java
index c6135c6a6..375331d2d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java
@@ -47,14 +47,18 @@
  *
  */
 @Plugin(type = Op.class, name = "features.haralick.asm")
-@Parameter(key = "input")
-@Parameter(key = "numGreyLevels")
-@Parameter(key = "distance")
-@Parameter(key = "matrixOrientation")
-@Parameter(key = "output")
 public class DefaultASM<T extends RealType<T>> extends AbstractHaralickFeature<T> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param numGreyLevels
+	 * @param distance
+	 * @param matrixOrientation
+	 * @return the output
+	 */
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java
index cfac37ec5..eb4d848d9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java
@@ -50,11 +50,6 @@
  *
  */
 @Plugin(type = Op.class, name = "features.haralick.clusterPromenence")
-@Parameter(key = "input")
-@Parameter(key = "numGreyLevels")
-@Parameter(key = "distance")
-@Parameter(key = "matrixOrientation")
-@Parameter(key = "output")
 public class DefaultClusterPromenence<T extends RealType<T>> extends AbstractHaralickFeature<T> {
 
 	@OpDependency(name = "features.haralick.coocMeanX")
@@ -63,6 +58,15 @@ public class DefaultClusterPromenence<T extends RealType<T>> extends AbstractHar
 	private Function<double[][], DoubleType> coocMeanYFunc;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param numGreyLevels
+	 * @param distance
+	 * @param matrixOrientation
+	 * @return the output
+	 */
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java
index 30322dcc3..06eaae991 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java
@@ -49,11 +49,6 @@
  *
  */
 @Plugin(type = Op.class, name = "features.haralick.clusterShade")
-@Parameter(key = "input")
-@Parameter(key = "numGreyLevels")
-@Parameter(key = "distance")
-@Parameter(key = "matrixOrientation")
-@Parameter(key = "output")
 public class DefaultClusterShade<T extends RealType<T>> extends AbstractHaralickFeature<T> {
 
 	@OpDependency(name = "features.haralick.coocMeanX")
@@ -62,6 +57,15 @@ public class DefaultClusterShade<T extends RealType<T>> extends AbstractHaralick
 	private Function<double[][], DoubleType> coocMeanYFunc;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param numGreyLevels
+	 * @param distance
+	 * @param matrixOrientation
+	 * @return the output
+	 */
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java
index 51c542567..83e3afb0c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java
@@ -50,17 +50,21 @@
  *
  */
 @Plugin(type = Op.class, name = "features.haralick.contrast")
-@Parameter(key = "input")
-@Parameter(key = "numGreyLevels")
-@Parameter(key = "distance")
-@Parameter(key = "matrixOrientation")
-@Parameter(key = "output")
 public class DefaultContrast<T extends RealType<T>> extends AbstractHaralickFeature<T> {
 
 	@OpDependency(name = "features.haralick.coocPXMinusY")
 	private Function<double[][], double[]> coocPXMinusYFunc;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param numGreyLevels
+	 * @param distance
+	 * @param matrixOrientation
+	 * @return the output
+	 */
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java
index e5c9ae3fe..e34ed7be8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java
@@ -51,11 +51,6 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "features.haralick.correlation")
-@Parameter(key = "input")
-@Parameter(key = "numGreyLevels")
-@Parameter(key = "distance")
-@Parameter(key = "matrixOrientation")
-@Parameter(key = "output")
 public class DefaultCorrelation<T extends RealType<T>> extends
 		AbstractHaralickFeature<T> {
 
@@ -70,6 +65,15 @@ public class DefaultCorrelation<T extends RealType<T>> extends
 	private Function<double[][], DoubleType> coocStdXFunc;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param numGreyLevels
+	 * @param distance
+	 * @param matrixOrientation
+	 * @return the output
+	 */
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java
index d8d637b7f..eb3e839c7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java
@@ -50,11 +50,6 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "features.haralick.differenceEntropy")
-@Parameter(key = "input")
-@Parameter(key = "numGreyLevels")
-@Parameter(key = "distance")
-@Parameter(key = "matrixOrientation")
-@Parameter(key = "output")
 public class DefaultDifferenceEntropy<T extends RealType<T>> extends AbstractHaralickFeature<T> {
 
 	// Avoid log 0
@@ -64,6 +59,15 @@ public class DefaultDifferenceEntropy<T extends RealType<T>> extends AbstractHar
 	private Function<double[][], double[]> coocPXMinusYFunc;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param numGreyLevels
+	 * @param distance
+	 * @param matrixOrientation
+	 * @return the output
+	 */
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java
index e1d8ea9b9..7f7b5fd13 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java
@@ -52,17 +52,21 @@
  *         Formula based on: http://haralick.org/journals/TexturalFeatures.pdf
  */
 @Plugin(type = Op.class, name = "features.haralick.differenceVariance")
-@Parameter(key = "input")
-@Parameter(key = "numGreyLevels")
-@Parameter(key = "distance")
-@Parameter(key = "matrixOrientation")
-@Parameter(key = "output")
 public class DefaultDifferenceVariance<T extends RealType<T>> extends AbstractHaralickFeature<T> {
 
 	@OpDependency(name = "features.haralick.coocPXMinusY")
 	private Function<double[][], double[]> coocPXMinusYFunc;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param numGreyLevels
+	 * @param distance
+	 * @param matrixOrientation
+	 * @return the output
+	 */
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java
index 09ce21277..bd3a20927 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java
@@ -48,17 +48,21 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "features.haralick.entropy")
-@Parameter(key = "input")
-@Parameter(key = "numGreyLevels")
-@Parameter(key = "distance")
-@Parameter(key = "matrixOrientation")
-@Parameter(key = "output")
 public class DefaultEntropy<T extends RealType<T>> extends AbstractHaralickFeature<T> {
 
 	// Avoid log 0
 	private static final double EPSILON = Double.MIN_NORMAL;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param numGreyLevels
+	 * @param distance
+	 * @param matrixOrientation
+	 * @return the output
+	 */
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java
index feeb429eb..ef826226a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java
@@ -51,11 +51,6 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "features.haralick.icm1")
-@Parameter(key = "input")
-@Parameter(key = "numGreyLevels")
-@Parameter(key = "distance")
-@Parameter(key = "matrixOrientation")
-@Parameter(key = "output")
 public class DefaultICM1<T extends RealType<T>> extends AbstractHaralickFeature<T> {
 
 	@OpDependency(name = "features.haralick.coocHXY")
@@ -64,6 +59,15 @@ public class DefaultICM1<T extends RealType<T>> extends AbstractHaralickFeature<
 	private Functions.Arity4<RandomAccessibleInterval<T>, Integer, Integer, MatrixOrientation, DoubleType> entropy;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param numGreyLevels
+	 * @param distance
+	 * @param matrixOrientation
+	 * @return the output
+	 */
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java
index e1b5ad7fd..718a07cb5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java
@@ -50,11 +50,6 @@
  * @author Christian Dietz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "features.haralick.icm2")
-@Parameter(key = "input")
-@Parameter(key = "numGreyLevels")
-@Parameter(key = "distance")
-@Parameter(key = "matrixOrientation")
-@Parameter(key = "output")
 public class DefaultICM2<T extends RealType<T>> extends AbstractHaralickFeature<T> {
 
 	@OpDependency(name = "features.haralick.coocHXY")
@@ -63,6 +58,15 @@ public class DefaultICM2<T extends RealType<T>> extends AbstractHaralickFeature<
 	private Functions.Arity4<RandomAccessibleInterval<T>, Integer, Integer, MatrixOrientation, DoubleType> entropy;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param numGreyLevels
+	 * @param distance
+	 * @param matrixOrientation
+	 * @return the output
+	 */
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java
index eac728e63..33e166d71 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java
@@ -48,14 +48,18 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "features.haralick.ifdm")
-@Parameter(key = "input")
-@Parameter(key = "numGreyLevels")
-@Parameter(key = "distance")
-@Parameter(key = "matrixOrientation")
-@Parameter(key = "output")
 public class DefaultIFDM<T extends RealType<T>> extends AbstractHaralickFeature<T> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param numGreyLevels
+	 * @param distance
+	 * @param matrixOrientation
+	 * @return the output
+	 */
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java
index 56b6c8b3b..80cd08d6c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java
@@ -46,14 +46,18 @@
  *
  */
 @Plugin(type = Op.class, name = "features.haralick.maxProbability")
-@Parameter(key = "input")
-@Parameter(key = "numGreyLevels")
-@Parameter(key = "distance")
-@Parameter(key = "matrixOrientation")
-@Parameter(key = "output")
 public class DefaultMaxProbability<T extends RealType<T>> extends AbstractHaralickFeature<T> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param numGreyLevels
+	 * @param distance
+	 * @param matrixOrientation
+	 * @return the output
+	 */
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java
index 0b9d2310b..79436f755 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java
@@ -49,17 +49,21 @@
  * @author Christian Dietz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "features.haralick.sumAverage")
-@Parameter(key = "input")
-@Parameter(key = "numGreyLevels")
-@Parameter(key = "distance")
-@Parameter(key = "matrixOrientation")
-@Parameter(key = "output")
 public class DefaultSumAverage<T extends RealType<T>> extends AbstractHaralickFeature<T> {
 
 	@OpDependency(name = "features.haralick.coocPXPlusY")
 	private Function<double[][], double[]> coocPXPlusFunc;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param numGreyLevels
+	 * @param distance
+	 * @param matrixOrientation
+	 * @return the output
+	 */
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java
index 20e6cc257..6159485ae 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java
@@ -50,11 +50,6 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "features.haralick.sumEntropy")
-@Parameter(key = "input")
-@Parameter(key = "numGreyLevels")
-@Parameter(key = "distance")
-@Parameter(key = "matrixOrientation")
-@Parameter(key = "output")
 public class DefaultSumEntropy<T extends RealType<T>> extends
 		AbstractHaralickFeature<T> {
 
@@ -65,6 +60,15 @@ public class DefaultSumEntropy<T extends RealType<T>> extends
 	private Function<double[][], double[]> coocPXPlusFunc;
 	
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param numGreyLevels
+	 * @param distance
+	 * @param matrixOrientation
+	 * @return the output
+	 */
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java
index 0c76782f1..4bbed0c26 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java
@@ -52,11 +52,6 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "features.haralick.sumVariance")
-@Parameter(key = "input")
-@Parameter(key = "numGreyLevels")
-@Parameter(key = "distance")
-@Parameter(key = "matrixOrientation")
-@Parameter(key = "output")
 public class DefaultSumVariance<T extends RealType<T>> extends AbstractHaralickFeature<T> {
 
 	@OpDependency(name = "features.haralick.coocPXPlusY")
@@ -66,6 +61,15 @@ public class DefaultSumVariance<T extends RealType<T>> extends AbstractHaralickF
 	private Functions.Arity4<RandomAccessibleInterval<T>, Integer, Integer, MatrixOrientation, RealType> sumEntropyFunc;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param numGreyLevels
+	 * @param distance
+	 * @param matrixOrientation
+	 * @return the output
+	 */
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java
index 648f0c0fb..9d6028fe8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java
@@ -46,14 +46,18 @@
  * @author Christian Dietz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "features.haralick.textureHomogeneity")
-@Parameter(key = "input")
-@Parameter(key = "numGreyLevels")
-@Parameter(key = "distance")
-@Parameter(key = "matrixOrientation")
-@Parameter(key = "output")
 public class DefaultTextureHomogeneity<T extends RealType<T>> extends AbstractHaralickFeature<T> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param numGreyLevels
+	 * @param distance
+	 * @param matrixOrientation
+	 * @return the output
+	 */
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java
index 11cd6b1d9..86e7f6ccb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java
@@ -48,14 +48,18 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "features.haralick.variance")
-@Parameter(key = "input")
-@Parameter(key = "numGreyLevels")
-@Parameter(key = "distance")
-@Parameter(key = "matrixOrientation")
-@Parameter(key = "output")
 public class DefaultVariance<T extends RealType<T>> extends AbstractHaralickFeature<T> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param numGreyLevels
+	 * @param distance
+	 * @param matrixOrientation
+	 * @return the output
+	 */
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java
index d51cf347f..89649ee5f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java
@@ -45,8 +45,6 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "features.haralick.coocHXY")
-@Parameter(key = "matix")
-@Parameter(key = "output")
 public class CoocHXY implements Function<double[][], double[]> {
 
 	private static final double EPSILON = Double.MIN_NORMAL;
@@ -57,6 +55,12 @@ public class CoocHXY implements Function<double[][], double[]> {
 	private Function<double[][], double[]> coocPYFunc;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param matix
+	 * @return the output
+	 */
 	public double[] apply(double[][] matrix) {
 		double hx = 0.0d;
 		double hy = 0.0d;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java
index abd21172c..bce77a2cd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java
@@ -45,14 +45,18 @@
  * @author Christian Dietz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "features.haralick.coocMeanX")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class CoocMeanX implements Function<double[][], DoubleType> {
 
 	@OpDependency(name = "features.haralick.coocPX")
 	private Function<double[][], double[]> coocPXFunc;
 	
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @return the output
+	 */
 	public DoubleType apply(double[][] input) {
 
 		double res = 0;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java
index b135b7050..a827c3af7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java
@@ -46,8 +46,6 @@
  * @author Christian Dietz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "features.haralick.coocMeanY")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class CoocMeanY implements Function<double[][], DoubleType> {
 
 	@OpDependency(name = "features.haralick.coocPY")
@@ -55,6 +53,12 @@ public class CoocMeanY implements Function<double[][], DoubleType> {
 
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @return the output
+	 */
 	public DoubleType apply(double[][] input) {
 
 		double res = 0;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java
index 3d6529588..a71042ebf 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java
@@ -42,11 +42,15 @@
  * @author Christian Dietz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "features.haralick.coocPX")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class CoocPX implements Function<double[][], double[]> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @return the output
+	 */
 	public double[] apply(double[][] input) {
 		final int nrGrayLevels = input.length;
 		final double[] output = new double[nrGrayLevels];
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java
index afef130aa..6ac21ae25 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java
@@ -42,11 +42,15 @@
  * @author Christian Dietz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "features.haralick.coocPXMinusY")
-@Parameter(key = "matrix")
-@Parameter(key = "output")
 public class CoocPXMinusY implements Function<double[][], double[]> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param matrix
+	 * @return the output
+	 */
 	public double[] apply(final double[][] matrix) {
 
 		final int nrGrayLevels = matrix.length;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java
index d4b0ee6bf..996fb487b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java
@@ -42,11 +42,15 @@
  * @author Christian Dietz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "features.haralick.coocPXPlusY")
-@Parameter(key = "matrix")
-@Parameter(key = "output")
 public class CoocPXPlusY implements Function<double[][], double[]> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param matrix
+	 * @return the output
+	 */
 	public double[] apply(double[][] matrix) {
 
 		final int nrGrayLevels = matrix.length;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java
index a71d87435..e95df36e4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java
@@ -42,11 +42,15 @@
  * @author Christian Dietz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "features.haralick.coocPY")
-@Parameter(key = "matrix")
-@Parameter(key = "output")
 public class CoocPY implements Function<double[][], double[]> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param matrix
+	 * @return the output
+	 */
 	public double[] apply(final double[][] matrix) {
 		final int nrGrayLevels = matrix.length;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java
index 1e98c9e1f..2cb307218 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java
@@ -46,8 +46,6 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "features.haralick.coocStdX")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class CoocStdX implements Function<double[][], DoubleType> {
 
 	@OpDependency(name = "features.haralick.coocMeanX")
@@ -56,6 +54,12 @@ public class CoocStdX implements Function<double[][], DoubleType> {
 	private Function<double[][], double[]> coocPXFunc;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @return the output
+	 */
 	public DoubleType apply(double[][] input) {
 
 		double res = 0;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java
index 160311891..448db0baf 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java
@@ -47,8 +47,6 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "features.haralick.coocStdY")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class CoocStdY implements Function<double[][], DoubleType> {
 
 	@OpDependency(name = "features.haralick.coocMeanY")
@@ -57,6 +55,12 @@ public class CoocStdY implements Function<double[][], DoubleType> {
 	private Function<double[][], double[]> coocPYFunc;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @return the output
+	 */
 	public DoubleType apply(double[][] input) {
 		double res = 0;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java
index 9c5dd00a3..7fb80ca52 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java
@@ -80,11 +80,6 @@
  * @author Simon Schmid (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "features.hog")
-@Parameter(key = "input")
-@Parameter(key = "numOrientations")
-@Parameter(key = "spanOfNeighborhood")
-@Parameter(key = "executorService")
-@Parameter(key = "output")
 public class HistogramOfOrientedGradients2D<T extends RealType<T>> implements
 		Computers.Arity4<RandomAccessibleInterval<T>, Integer, Integer, ExecutorService, RandomAccessibleInterval<T>> {
 
@@ -100,6 +95,15 @@ public class HistogramOfOrientedGradients2D<T extends RealType<T>> implements
 
 	@SuppressWarnings("unchecked")
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param numOrientations
+	 * @param spanOfNeighborhood
+	 * @param executorService
+	 * @param output
+	 */
 	public void compute(RandomAccessibleInterval<T> in, Integer numOrientations, Integer spanOfNeighborhood,
 			ExecutorService es, RandomAccessibleInterval<T> out) {
 		Interval imgOpInterval = new FinalInterval(in.dimension(0), in.dimension(1));
@@ -274,11 +278,6 @@ private double getMagnitude(final double x, final double y) {
 }
 
 @Plugin(type = Op.class, name = "features.hog")
-@Parameter(key = "input")
-@Parameter(key = "numOrientations")
-@Parameter(key = "spanOfNeighborhood")
-@Parameter(key = "executorService")
-@Parameter(key = "output")
 class HistogramOfOrientedGradients2DFunction<T extends RealType<T>> implements
 		Functions.Arity4<RandomAccessibleInterval<T>, Integer, Integer, ExecutorService, RandomAccessibleInterval<T>> {
 
@@ -289,6 +288,15 @@ class HistogramOfOrientedGradients2DFunction<T extends RealType<T>> implements
 	private Computers.Arity4<RandomAccessibleInterval<T>, Integer, Integer, ExecutorService, RandomAccessibleInterval<T>> hogOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param numOrientations
+	 * @param spanOfNeighborhood
+	 * @param executorService
+	 * @return the output
+	 */
 	public RandomAccessibleInterval<T> apply(final RandomAccessibleInterval<T> input, final Integer numOrientations,
 			final Integer spanOfNeighborhood, final ExecutorService es) {
 		final T inType = Util.getTypeFromInterval(input);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java
index a68e06242..652907617 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java
@@ -56,10 +56,6 @@
  * @param <I>
  */
 @Plugin(type = Op.class, name = "features.lbp2d")
-@Parameter(key = "input")
-@Parameter(key = "distance")
-@Parameter(key = "histogramSize")
-@Parameter(key = "output")
 public class DefaultLBP2D<I extends RealType<I>>
 		implements Functions.Arity3<RandomAccessibleInterval<I>, Integer, Integer, ArrayList<LongType>> {
 
@@ -67,6 +63,14 @@ public class DefaultLBP2D<I extends RealType<I>>
 	private BiFunction<ArrayList<LongType>, Integer, Histogram1d<LongType>> histOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param distance
+	 * @param histogramSize
+	 * @return the output
+	 */
 	public ArrayList<LongType> apply(RandomAccessibleInterval<I> input, Integer distance, Integer histogramSize) {
 		ArrayList<LongType> output = new ArrayList<>();
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java
index 07dbe8dcf..4e6217756 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java
@@ -64,8 +64,6 @@
  * @param <O>
  */
 @Plugin(type = Op.class, name = "features.tamura.coarseness")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultCoarsenessFeature<I extends RealType<I>, O extends RealType<O>>
 		implements Computers.Arity1<RandomAccessibleInterval<I>, O> {
 
@@ -75,6 +73,12 @@ public class DefaultCoarsenessFeature<I extends RealType<I>, O extends RealType<
 
 	@SuppressWarnings("unchecked")
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 		if (input.numDimensions() != 2)
 			throw new IllegalArgumentException("Only 2 dimensional images allowed!");
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java
index 394242a66..0ac6c721f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java
@@ -46,8 +46,6 @@
  * @author Andreas Graumann (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "features.tamura.contrast")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultContrastFeature<I extends RealType<I>, O extends RealType<O>>
 		implements Computers.Arity1<IterableInterval<I>, O> {
 
@@ -59,6 +57,12 @@ public class DefaultContrastFeature<I extends RealType<I>, O extends RealType<O>
 	private Function<Iterable<I>, O> stdOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void compute(final IterableInterval<I> input, final O output) {
 		if (input.numDimensions() != 2)
 			throw new IllegalArgumentException("Only 2 dimensional images allowed!");
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java
index b4c5baad8..656161d5b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java
@@ -60,9 +60,6 @@
  */
 @SuppressWarnings("rawtypes")
 @Plugin(type = Op.class, name = "features.tamura.directionality")
-@Parameter(key = "input")
-@Parameter(key = "histogramSize")
-@Parameter(key = "output")
 public class DefaultDirectionalityFeature<I extends RealType<I>, O extends RealType<O>>
 	implements Computers.Arity2<RandomAccessibleInterval<I>, Integer, O> {
 
@@ -75,6 +72,13 @@ public class DefaultDirectionalityFeature<I extends RealType<I>, O extends RealT
 
 	@SuppressWarnings("unchecked")
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param histogramSize
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<I> input,
 		Integer histogramSize, final O output)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java
index 184425dea..c65f35bae 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java
@@ -51,10 +51,6 @@
  *            Input Type
  */
 @Plugin(type = Op.class, name = "features.zernike.magnitude")
-@Parameter(key = "input")
-@Parameter(key = "order")
-@Parameter(key = "repetition")
-@Parameter(key = "output")
 public class DefaultMagnitudeFeature<T extends RealType<T>>
 		implements Computers.Arity3<IterableInterval<T>, Integer, Integer, DoubleType> {
 
@@ -62,6 +58,14 @@ public class DefaultMagnitudeFeature<T extends RealType<T>>
 	private Functions.Arity3<IterableInterval<T>, Integer, Integer, ZernikeMoment> zernikeOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param order
+	 * @param repetition
+	 * @param output
+	 */
 	public void compute(IterableInterval<T> input, Integer order, Integer repetition, DoubleType output) {
 		if (input.numDimensions() != 2)
 			throw new IllegalArgumentException("Only 2 dimensional inputs allowed!");
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java
index 20cc83e62..e8e80f961 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java
@@ -53,10 +53,6 @@
  *            Output Type
  */
 @Plugin(type = Op.class, name = "features.zernike.phase")
-@Parameter(key = "input")
-@Parameter(key = "order")
-@Parameter(key = "repetition")
-@Parameter(key = "output")
 public class DefaultPhaseFeature<T extends RealType<T>>
 		implements Computers.Arity3<IterableInterval<T>, Integer, Integer, DoubleType> {
 
@@ -64,6 +60,14 @@ public class DefaultPhaseFeature<T extends RealType<T>>
 	private Functions.Arity3<IterableInterval<T>, Integer, Integer, ZernikeMoment> zernikeOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param order
+	 * @param repetition
+	 * @param output
+	 */
 	public void compute(IterableInterval<T> input, Integer order, Integer repetition, DoubleType output) {
 		if (input.numDimensions() != 2)
 			throw new IllegalArgumentException("Only 2 dimensional inputs allowed!");
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java
index 49db9fb4d..017bf3132 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java
@@ -46,14 +46,18 @@
  * @author Andreas Graumann (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "features.zernike.computer")
-@Parameter(key = "input")
-@Parameter(key = "order")
-@Parameter(key = "repetition")
-@Parameter(key = "zernikeMoment")
 public class ZernikeComputer<T extends RealType<T>>
 		implements Functions.Arity3<IterableInterval<T>, Integer, Integer, ZernikeMoment> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param order
+	 * @param repetition
+	 * @param zernikeMoment
+	 */
 	public ZernikeMoment apply(final IterableInterval<T> ii, final Integer order, final Integer repetition) {
 
 		final double width2 = (ii.dimension(0) - 1) / 2.0;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java
index ee104ee03..3447b69ce 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java
@@ -56,15 +56,6 @@
  * @param <C>
  */
 @Plugin(type = Op.class, name = "filter.linearFilter", priority = Priority.LOW)
-@Parameter(key = "input")
-@Parameter(key = "kernel")
-@Parameter(key = "fftInput")
-@Parameter(key = "fftKernel")
-@Parameter(key = "performInputFFT")
-@Parameter(key = "performKernelFFT")
-@Parameter(key = "executorService")
-@Parameter(key = "frequencyOp")
-@Parameter(key = "output")
 public class FFTMethodsLinearFFTFilterC<I extends RealType<I>, O extends RealType<O>, K extends RealType<K>, C extends ComplexType<C>>
 		implements Computers.Arity8<RandomAccessibleInterval<I>, RandomAccessibleInterval<K>, RandomAccessibleInterval<C>, RandomAccessibleInterval<C>, Boolean, Boolean, ExecutorService, Computers.Arity2<RandomAccessibleInterval<C>, RandomAccessibleInterval<C>, RandomAccessibleInterval<C>>, RandomAccessibleInterval<O>> {
 
@@ -84,6 +75,19 @@ public class FFTMethodsLinearFFTFilterC<I extends RealType<I>, O extends RealTyp
 	 * Perform convolution by multiplying the FFTs in the frequency domain
 	 */
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param kernel
+	 * @param fftInput
+	 * @param fftKernel
+	 * @param performInputFFT
+	 * @param performKernelFFT
+	 * @param executorService
+	 * @param frequencyOp
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<I> in, final RandomAccessibleInterval<K> kernel,
 			final RandomAccessibleInterval<C> fftInput, final RandomAccessibleInterval<C> fftKernel,
 			final Boolean performInputFFT, final Boolean performKernelFFT, final ExecutorService es,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java
index 98ed14dc1..eca555dbf 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java
@@ -55,11 +55,6 @@
  */
 
 @Plugin(type = Op.class, name = "filter.bilateral")
-@Parameter(key = "inputRAI", description = "the input data")
-@Parameter(key = "sigmaR", description = "range smoothing param, larger sigma means larger effect of intensity differences.")
-@Parameter(key = "sigmaS", description = "spatial smoothing param, larger sigma means smoother image.")
-@Parameter(key = "radius", description = "defines size of the square of pixels considered at each iteration.")
-@Parameter(key = "outputRAI")
 public class DefaultBilateral<I extends RealType<I>, O extends RealType<O>>
 		implements Computers.Arity4<RandomAccessibleInterval<I>, Double, Double, Integer, RandomAccessibleInterval<O>> {
 
@@ -86,6 +81,15 @@ private double getDistance(long[] x, long[] y) {
 		return Math.sqrt(distance);
 	}
 
+	/**
+	 * TODO
+	 *
+	 * @param inputRAI the input data
+	 * @param sigmaR range smoothing param, larger sigma means larger effect of intensity differences.
+	 * @param sigmaS spatial smoothing param, larger sigma means smoother image.
+	 * @param radius defines size of the square of pixels considered at each iteration.
+	 * @param outputRAI
+	 */
 	@Override
 	public void compute(final RandomAccessibleInterval<I> input, final Double sigmaR, final Double sigmaS,
 			final Integer radius, final RandomAccessibleInterval<O> output) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java
index 39bb7a2ad..d3738f714 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java
@@ -53,14 +53,6 @@
  * @param <C>
  */
 @Plugin(type = Op.class, name = "filter.convolve", priority = Priority.LOW)
-@Parameter(key = "input")
-@Parameter(key = "kernel")
-@Parameter(key = "fftInput")
-@Parameter(key = "fftKernel")
-@Parameter(key = "performInputFFT")
-@Parameter(key = "performKernelFFT")
-@Parameter(key = "executorService")
-@Parameter(key = "output")
 public class ConvolveFFTC<I extends RealType<I>, O extends RealType<O>, K extends RealType<K>, C extends ComplexType<C>>
 		implements Computers.Arity7<RandomAccessibleInterval<I>, RandomAccessibleInterval<K>, RandomAccessibleInterval<C>, RandomAccessibleInterval<C>, Boolean, Boolean, ExecutorService, RandomAccessibleInterval<O>> {
 
@@ -74,6 +66,18 @@ public class ConvolveFFTC<I extends RealType<I>, O extends RealType<O>, K extend
 	 * Call the linear filter that is set up to perform convolution
 	 */
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param kernel
+	 * @param fftInput
+	 * @param fftKernel
+	 * @param performInputFFT
+	 * @param performKernelFFT
+	 * @param executorService
+	 * @param output
+	 */
 	public void compute(RandomAccessibleInterval<I> in, RandomAccessibleInterval<K> kernel,
 			RandomAccessibleInterval<C> fftInput, RandomAccessibleInterval<C> fftKernel, Boolean performInputFFT,
 			Boolean performKernelFFT, ExecutorService es, RandomAccessibleInterval<O> out) {
@@ -82,12 +86,6 @@ public void compute(RandomAccessibleInterval<I> in, RandomAccessibleInterval<K>
 }
 
 @Plugin(type = Op.class, name = "filter.convolve", priority = Priority.LOW)
-@Parameter(key = "input")
-@Parameter(key = "kernel")
-@Parameter(key = "fftInput")
-@Parameter(key = "fftKernel")
-@Parameter(key = "executorService")
-@Parameter(key = "output")
 class ConvolveFFTCSimple<I extends RealType<I>, O extends RealType<O>, K extends RealType<K>, C extends ComplexType<C>>
 		implements
 		Computers.Arity5<RandomAccessibleInterval<I>, RandomAccessibleInterval<K>, RandomAccessibleInterval<C>, RandomAccessibleInterval<C>, ExecutorService, RandomAccessibleInterval<O>> {
@@ -96,6 +94,16 @@ class ConvolveFFTCSimple<I extends RealType<I>, O extends RealType<O>, K extends
 	private Computers.Arity7<RandomAccessibleInterval<I>, RandomAccessibleInterval<K>, RandomAccessibleInterval<C>, RandomAccessibleInterval<C>, Boolean, Boolean, ExecutorService, RandomAccessibleInterval<O>> convolveOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param kernel
+	 * @param fftInput
+	 * @param fftKernel
+	 * @param executorService
+	 * @param output
+	 */
 	public void compute(RandomAccessibleInterval<I> in, RandomAccessibleInterval<K> kernel,
 			RandomAccessibleInterval<C> fftInput, RandomAccessibleInterval<C> fftKernel, ExecutorService es,
 			RandomAccessibleInterval<O> output) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java
index 0006e1812..8c8f0e7d8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java
@@ -63,14 +63,6 @@
  * @param <C>
  */
 @Plugin(type = Op.class, name = "filter.convolve", priority = Priority.HIGH)
-@Parameter(key = "input")
-@Parameter(key = "kernel")
-@Parameter(key = "borderSize")
-@Parameter(key = "obfInput")
-@Parameter(key = "outType")
-@Parameter(key = "fftType")
-@Parameter(key = "executorService")
-@Parameter(key = "output")
 public class ConvolveFFTF<I extends RealType<I> & NativeType<I>, O extends RealType<O> & NativeType<O>, K extends RealType<K> & NativeType<K>, C extends ComplexType<C> & NativeType<C>>
 		/* extends AbstractFFTFilterF<I, O, K, C> */ implements
 		Functions.Arity7<RandomAccessibleInterval<I>, RandomAccessibleInterval<K>, long[], OutOfBoundsFactory<I, RandomAccessibleInterval<I>>, O, C, ExecutorService, RandomAccessibleInterval<O>> {
@@ -92,6 +84,18 @@ public class ConvolveFFTF<I extends RealType<I> & NativeType<I>, O extends RealT
 	private Computers.Arity7<RandomAccessibleInterval<I>, RandomAccessibleInterval<K>, RandomAccessibleInterval<C>, RandomAccessibleInterval<C>, Boolean, Boolean, ExecutorService, RandomAccessibleInterval<O>> convolveOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param kernel
+	 * @param borderSize
+	 * @param obfInput
+	 * @param outType
+	 * @param fftType
+	 * @param executorService
+	 * @return the output
+	 */
 	public RandomAccessibleInterval<O> apply(final RandomAccessibleInterval<I> input,
 			final RandomAccessibleInterval<K> kernel, final long[] borderSize,
 			final OutOfBoundsFactory<I, RandomAccessibleInterval<I>> obfInput,
@@ -164,10 +168,6 @@ public Computers.Arity2<RandomAccessibleInterval<I>, RandomAccessibleInterval<K>
 }
 
 @Plugin(type = Op.class, name = "filter.convolve", priority = Priority.HIGH)
-@Parameter(key = "input")
-@Parameter(key = "kernel")
-@Parameter(key = "executorService")
-@Parameter(key = "output")
 class SimpleConvolveFFTF<I extends RealType<I> & NativeType<I>, O extends RealType<O> & NativeType<O>, K extends RealType<K> & NativeType<K>, C extends ComplexType<C> & NativeType<C>>
 		implements
 		Functions.Arity3<RandomAccessibleInterval<I>, RandomAccessibleInterval<K>, ExecutorService, RandomAccessibleInterval<FloatType>> {
@@ -176,6 +176,14 @@ class SimpleConvolveFFTF<I extends RealType<I> & NativeType<I>, O extends RealTy
 		Functions.Arity7<RandomAccessibleInterval<I>, RandomAccessibleInterval<K>, long[], OutOfBoundsFactory<I, RandomAccessibleInterval<I>>, FloatType, ComplexFloatType, ExecutorService, RandomAccessibleInterval<FloatType>> convolveOp;
 
 		@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param kernel
+	 * @param executorService
+	 * @return the output
+	 */
 		public RandomAccessibleInterval<FloatType> apply(RandomAccessibleInterval<I> t, RandomAccessibleInterval<K> u, ExecutorService es) {
 			OutOfBoundsFactory<I, RandomAccessibleInterval<I>> obfInput = new OutOfBoundsConstantValueFactory<>(Util
 					.getTypeFromInterval(t).createVariable());
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java
index 537e77a5d..15a989db1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java
@@ -48,9 +48,6 @@
  * Convolves an image naively.
  */
 @Plugin(type = Op.class, name = "filter.convolve")
-@Parameter(key = "input")
-@Parameter(key = "kernel")
-@Parameter(key = "output")
 public class ConvolveNaiveC<I extends RealType<I>, K extends RealType<K>, O extends RealType<O>>
 		implements Computers.Arity2<RandomAccessible<I>, RandomAccessibleInterval<K>, RandomAccessibleInterval<O>> {
 	// TODO: should this be binary so we can use different kernels?? Not sure.. what
@@ -58,6 +55,13 @@ public class ConvolveNaiveC<I extends RealType<I>, K extends RealType<K>, O exte
 	// with a big kernel that should be matched with ConvolveFFT
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param kernel
+	 * @param output
+	 */
 	public void compute(final RandomAccessible<I> input, final RandomAccessibleInterval<K> kernel,
 			final RandomAccessibleInterval<O> output) {
 		// conforms only if the kernel is sufficiently small
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java
index 797544e74..ed28edf5f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java
@@ -55,11 +55,6 @@
  * Convolves an image naively (no FFTs).
  */
 @Plugin(type = Op.class, name = "filter.convolve", priority = Priority.HIGH + 1)
-@Parameter(key = "input")
-@Parameter(key = "kernel")
-@Parameter(key = "outOfBoundsFactory")
-@Parameter(key = "outType")
-@Parameter(key = "output")
 public class ConvolveNaiveF<I extends RealType<I>, O extends RealType<O> & NativeType<O>, K extends RealType<K>>
 		implements
 		Functions.Arity4<RandomAccessibleInterval<I>, RandomAccessibleInterval<K>, OutOfBoundsFactory<I, RandomAccessibleInterval<I>>, O, RandomAccessibleInterval<O>> {
@@ -98,6 +93,15 @@ public RandomAccessibleInterval<O> createOutput(RandomAccessibleInterval<I> inpu
 	}
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param kernel
+	 * @param outOfBoundsFactory
+	 * @param outType
+	 * @return the output
+	 */
 	public RandomAccessibleInterval<O> apply(final RandomAccessibleInterval<I> input,
 			final RandomAccessibleInterval<K> kernel, OutOfBoundsFactory<I, RandomAccessibleInterval<I>> obf,
 			final O outType) {
@@ -131,9 +135,6 @@ public RandomAccessibleInterval<O> apply(final RandomAccessibleInterval<I> input
 }
 
 @Plugin(type = Op.class, name = "filter.convolve", priority = Priority.HIGH + 1)
-@Parameter(key = "input")
-@Parameter(key = "kernel")
-@Parameter(key = "output")
 class SimpleConvolveNaiveF<I extends RealType<I>, O extends RealType<O> & NativeType<O>, K extends RealType<K>>
 		implements
 		BiFunction<RandomAccessibleInterval<I>, RandomAccessibleInterval<K>, RandomAccessibleInterval<O>> {
@@ -142,6 +143,13 @@ class SimpleConvolveNaiveF<I extends RealType<I>, O extends RealType<O> & Native
 	Functions.Arity4<RandomAccessibleInterval<I>, RandomAccessibleInterval<K>, OutOfBoundsFactory<I, RandomAccessibleInterval<I>>, O, RandomAccessibleInterval<O>> convolveOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param kernel
+	 * @return the output
+	 */
 	public RandomAccessibleInterval<O> apply(RandomAccessibleInterval<I> t, RandomAccessibleInterval<K> u) {
 		return convolveOp.apply(t, u, null, null);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java
index 03c1bf7ab..14bc03052 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java
@@ -52,14 +52,6 @@
  * @param <C>
  */
 @Plugin(type = Op.class, name = "filter.correlate")
-@Parameter(key = "input")
-@Parameter(key = "kernel")
-@Parameter(key = "fftInput")
-@Parameter(key = "fftKernel")
-@Parameter(key = "performInputFFT")
-@Parameter(key = "performKernelFFT")
-@Parameter(key = "executorService")
-@Parameter(key = "output")
 public class CorrelateFFTC<I extends RealType<I>, O extends RealType<O>, K extends RealType<K>, C extends ComplexType<C>>
 		implements Computers.Arity7<RandomAccessibleInterval<I>, RandomAccessibleInterval<K>, RandomAccessibleInterval<C>, RandomAccessibleInterval<C>, Boolean, Boolean, ExecutorService, RandomAccessibleInterval<O>> {
 
@@ -78,6 +70,18 @@ public class CorrelateFFTC<I extends RealType<I>, O extends RealType<O>, K exten
 	 * Call the linear filter that is set up to perform correlation
 	 */
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param kernel
+	 * @param fftInput
+	 * @param fftKernel
+	 * @param performInputFFT
+	 * @param performKernelFFT
+	 * @param executorService
+	 * @param output
+	 */
 	public void compute(RandomAccessibleInterval<I> input, RandomAccessibleInterval<K> kernel,
 			RandomAccessibleInterval<C> fftInput, RandomAccessibleInterval<C> fftKernel, Boolean performInputFFT,
 			Boolean performKernelFFT, ExecutorService es, RandomAccessibleInterval<O> out) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java
index 3b4569530..3802fd8fb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java
@@ -60,15 +60,6 @@
  * @param <C>
  */
 @Plugin(type = Op.class, name = "filter.correlate", priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "kernel")
-@Parameter(key = "borderSize")
-@Parameter(key = "obfInput")
-@Parameter(key = "obfKernel")
-@Parameter(key = "outType")
-@Parameter(key = "fftType")
-@Parameter(key = "executorService")
-@Parameter(key = "output")
 public class CorrelateFFTF<I extends RealType<I> & NativeType<I>, O extends RealType<O> & NativeType<O>, K extends RealType<K> & NativeType<K>, C extends ComplexType<C> & NativeType<C>>
 //	extends AbstractFFTFilterF<I, O, K, C>
 implements Functions.Arity8<RandomAccessibleInterval<I>, RandomAccessibleInterval<K>, long[], OutOfBoundsFactory<I, RandomAccessibleInterval<I>>, OutOfBoundsFactory<K, RandomAccessibleInterval<K>>, O, C, ExecutorService, RandomAccessibleInterval<O>> {
@@ -90,6 +81,19 @@ public class CorrelateFFTF<I extends RealType<I> & NativeType<I>, O extends Real
 	private Computers.Arity7<RandomAccessibleInterval<I>, RandomAccessibleInterval<K>, RandomAccessibleInterval<C>, RandomAccessibleInterval<C>, Boolean, Boolean, ExecutorService, RandomAccessibleInterval<O>> correlateOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param kernel
+	 * @param borderSize
+	 * @param obfInput
+	 * @param obfKernel
+	 * @param outType
+	 * @param fftType
+	 * @param executorService
+	 * @return the output
+	 */
 	public RandomAccessibleInterval<O> apply(final RandomAccessibleInterval<I> input,
 			final RandomAccessibleInterval<K> kernel, final long[] borderSize,
 			final OutOfBoundsFactory<I, RandomAccessibleInterval<I>> obfInput,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java
index f65b8beb9..8abe51ab3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java
@@ -57,9 +57,6 @@
  *            type of input
  */
 @Plugin(type = Op.class, name = "filter.partialDerivative")
-@Parameter(key = "input")
-@Parameter(key = "dimension")
-@Parameter(key = "output")
 public class PartialDerivativeRAI<T extends RealType<T>>
 		implements Computers.Arity2<RandomAccessibleInterval<T>, Integer, RandomAccessibleInterval<T>> {
 
@@ -173,6 +170,13 @@ public void setupConvolves(RandomAccessibleInterval<T> input, Integer dimension)
 	}
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param dimension
+	 * @param output
+	 */
 	public void compute(RandomAccessibleInterval<T> input, final Integer dimension,
 			RandomAccessibleInterval<T> output) {
 		setupConvolves(input, dimension);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java
index 7bff4e2ee..96482e269 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java
@@ -56,8 +56,6 @@
  */
 
 @Plugin(type = Op.class, name = "filter.partialDerivative")
-@Parameter(key = "input")
-@Parameter(key = "outputComposite")
 public class PartialDerivativesRAI<T extends RealType<T>>
 		implements Function<RandomAccessibleInterval<T>, CompositeIntervalView<T, RealComposite<T>>> {
 
@@ -68,6 +66,12 @@ public class PartialDerivativesRAI<T extends RealType<T>>
 	private Function<RandomAccessibleInterval<T>, RandomAccessibleInterval<T>> imgCreator;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @return the outputComposite
+	 */
 	public CompositeIntervalView<T, RealComposite<T>> apply(RandomAccessibleInterval<T> input) {
 		List<RandomAccessibleInterval<T>> derivatives = new ArrayList<>();
 		for (int i = 0; i < input.numDimensions(); i++) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java
index 2ad2d5201..0cf7b4899 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java
@@ -55,10 +55,6 @@
  * @author Gabe Selzer
  */
 @Plugin(type = Op.class, name = "filter.derivativeGauss")
-@Parameter(key = "input")
-@Parameter(key = "sigma", description = "the sigma in each dimension of the gaussian")
-@Parameter(key = "derivatives", description = "the value at each index indicates the derivative to take in each dimension of the image.")
-@Parameter(key = "output")
 public class DefaultDerivativeGauss<T extends RealType<T>>
 		implements Computers.Arity3<RandomAccessibleInterval<T>, double[], int[], RandomAccessibleInterval<DoubleType>> {
 	
@@ -280,6 +276,14 @@ private <T extends RealType<T>> void convolve_n(final RandomAccessibleInterval<T
 
 	@SuppressWarnings("unchecked")
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param sigma the sigma in each dimension of the gaussian
+	 * @param derivatives the value at each index indicates the derivative to take in each dimension of the image.
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<T> input, final double[] sigma, final int[] derivatives, final RandomAccessibleInterval<DoubleType> output) {
 
 		// throw exception if not enough derivative values were given
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java
index b7f8bf174..42e4914f7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java
@@ -54,10 +54,6 @@
  * @param <T>
  */
 @Plugin(type = Op.class, name = "filter.DoG")
-@Parameter(key = "input")
-@Parameter(key = "gauss1")
-@Parameter(key = "gauss2")
-@Parameter(key = "output")
 public class DefaultDoG<T extends NumericType<T> & NativeType<T>> implements
 		Computers.Arity3<RandomAccessibleInterval<T>, Computers.Arity1<RandomAccessibleInterval<T>, RandomAccessibleInterval<T>>, Computers.Arity1<RandomAccessibleInterval<T>, RandomAccessibleInterval<T>>, RandomAccessibleInterval<T>> {
 
@@ -68,6 +64,14 @@ public class DefaultDoG<T extends NumericType<T> & NativeType<T>> implements
 	private Computers.Arity2<RandomAccessibleInterval<T>, RandomAccessibleInterval<T>, RandomAccessibleInterval<T>> subtractor;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param gauss1
+	 * @param gauss2
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<T> input,
 			final Computers.Arity1<RandomAccessibleInterval<T>, RandomAccessibleInterval<T>> gauss1,
 			final Computers.Arity1<RandomAccessibleInterval<T>, RandomAccessibleInterval<T>> gauss2,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java
index ac8df07b9..1133def2a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java
@@ -51,12 +51,6 @@
  * @param <T>
  */
 @Plugin(type = Op.class, name = "filter.DoG")
-@Parameter(key = "input")
-@Parameter(key = "sigmas1")
-@Parameter(key = "sigmas2")
-@Parameter(key = "outOfBoundsFactory")
-@Parameter(key = "executorService")
-@Parameter(key = "output")
 public class DoGVaryingSigmas<T extends NumericType<T> & NativeType<T>> implements
 		Computers.Arity5<RandomAccessibleInterval<T>, double[], double[], OutOfBoundsFactory<T, RandomAccessibleInterval<T>>, ExecutorService, RandomAccessibleInterval<T>> {
 
@@ -70,6 +64,16 @@ public class DoGVaryingSigmas<T extends NumericType<T> & NativeType<T>> implemen
 
 	//TODO: make the outOfBoundsFactory optional (see DoGTest for the default).
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param sigmas1
+	 * @param sigmas2
+	 * @param outOfBoundsFactory
+	 * @param executorService
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<T> t, final double[] sigmas1, //
 			final double[] sigmas2, final OutOfBoundsFactory<T, RandomAccessibleInterval<T>> fac,
 			final ExecutorService es, final RandomAccessibleInterval<T> output) {
@@ -87,12 +91,6 @@ public void compute(final RandomAccessibleInterval<T> t, final double[] sigmas1,
 }
 
 @Plugin(type = Op.class, name = "filter.DoG")
-@Parameter(key = "input")
-@Parameter(key = "sigma1")
-@Parameter(key = "sigma2")
-@Parameter(key = "outOfBoundsFactory")
-@Parameter(key = "executorService")
-@Parameter(key = "output")
 class DoGSingleSigma<T extends NumericType<T> & NativeType<T>> implements
 		Computers.Arity5<RandomAccessibleInterval<T>, Double, Double, OutOfBoundsFactory<T, RandomAccessibleInterval<T>>, ExecutorService, RandomAccessibleInterval<T>> {
 
@@ -101,6 +99,16 @@ class DoGSingleSigma<T extends NumericType<T> & NativeType<T>> implements
 			OutOfBoundsFactory<T, RandomAccessibleInterval<T>>, ExecutorService, RandomAccessibleInterval<T>> dogOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param sigma1
+	 * @param sigma2
+	 * @param outOfBoundsFactory
+	 * @param executorService
+	 * @param output
+	 */
 	public void compute(RandomAccessibleInterval<T> in1, Double in2, Double in3,
 			OutOfBoundsFactory<T, RandomAccessibleInterval<T>> in4, ExecutorService in5,
 			RandomAccessibleInterval<T> out) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java
index 2b42c4656..ea0561d97 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java
@@ -48,16 +48,20 @@
  * @param <T>
  */
 @Plugin(type = Op.class, name = "filter.createFFTOutput")
-@Parameter(key = "Dimensions")
-@Parameter(key = "outType")
-@Parameter(key = "fast")
-@Parameter(key = "output")
 public class CreateOutputFFTMethods<T> implements Functions.Arity3<Dimensions, T, Boolean, Img<T>> {
 
 	@OpDependency(name = "create.img")
 	private BiFunction<Dimensions, T, Img<T>> create;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param Dimensions
+	 * @param outType
+	 * @param fast
+	 * @return the output
+	 */
 	public Img<T> apply(Dimensions paddedDimensions, T outType, Boolean fast) {
 
 		Dimensions paddedFFTMethodsFFTDimensions = FFTMethodsUtility.getFFTDimensionsRealToComplex(fast,
@@ -69,14 +73,18 @@ public Img<T> apply(Dimensions paddedDimensions, T outType, Boolean fast) {
 }
 
 @Plugin(type = Op.class, name = "filter.createFFTOutput")
-@Parameter(key = "Dimensions")
-@Parameter(key = "outType")
-@Parameter(key = "output")
 class CreateOutputFFTMethodsSimple<T> implements BiFunction<Dimensions, T, Img<T>> {
 	@OpDependency(name = "filter.createFFTOutput")
 	private Functions.Arity3<Dimensions, T, Boolean, Img<T>> create;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param Dimensions
+	 * @param outType
+	 * @return the output
+	 */
 	public Img<T> apply(Dimensions paddedDimensions, T outType) {
 		return create.apply(paddedDimensions, outType, true);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java
index 3af33a528..f971103c3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java
@@ -54,9 +54,6 @@
  * @param <C>
  */
 @Plugin(type = Op.class, name = "filter.fft", priority = Priority.NORMAL)
-@Parameter(key = "input")
-@Parameter(key = "executorService")
-@Parameter(key = "output")
 public class FFTMethodsOpC<T extends RealType<T>, C extends ComplexType<C>>
 	implements Computers.Arity2<RandomAccessibleInterval<T>, ExecutorService, RandomAccessibleInterval<C>>
 {
@@ -65,6 +62,13 @@ public class FFTMethodsOpC<T extends RealType<T>, C extends ComplexType<C>>
 	 * Computes an ND FFT using FFTMethods
 	 */
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param executorService
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<T> input,
 		final ExecutorService es, final RandomAccessibleInterval<C> output)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java
index 66418d2ed..d331e7ad1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java
@@ -57,12 +57,6 @@
  *            TODO Documentation
  */
 @Plugin(type = Op.class, name = "filter.fft", priority = Priority.HIGH)
-@Parameter(key = "input")
-@Parameter(key = "borderSize", description = "the size of border to apply in each dimension")
-@Parameter(key = "fast", description = "whether to perform a fast FFT; default true")
-@Parameter(key = "fftType", description = "the complex type of the output")
-@Parameter(key = "executorService")
-@Parameter(key = "output")
 public class FFTMethodsOpF<T extends RealType<T>, C extends ComplexType<C>> implements
 		Functions.Arity5<RandomAccessibleInterval<T>, long[], Boolean, C, ExecutorService, RandomAccessibleInterval<C>> {
 
@@ -83,6 +77,16 @@ public class FFTMethodsOpF<T extends RealType<T>, C extends ComplexType<C>> impl
 	 * supported.
 	 */
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param borderSize the size of border to apply in each dimension
+	 * @param fast whether to perform a fast FFT; default true
+	 * @param fftType the complex type of the output
+	 * @param executorService
+	 * @return the output
+	 */
 	public RandomAccessibleInterval<C> apply(final RandomAccessibleInterval<T> input, final long[] borderSize,
 			final Boolean fast, final C fftType, final ExecutorService es) {
 		// calculate the padded size
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java
index 4e24a3aee..f1edd938f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java
@@ -44,13 +44,17 @@
  * @author Brian Northan
  */
 @Plugin(type = Op.class, name = "filter.fftSize")
-@Parameter(key = "dimensions")
-@Parameter(key = "forward")
-@Parameter(key = "fast")
-@Parameter(key = "output")
 public class ComputeFFTMethodsSize implements Functions.Arity3<Dimensions, Boolean, Boolean, long[][]> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param dimensions
+	 * @param forward
+	 * @param fast
+	 * @return the output
+	 */
 	public long[][] apply(Dimensions inputDimensions, Boolean forward, Boolean fast) {
 
 		long[][] size = new long[2][];
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java
index 48306651f..24134353d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java
@@ -48,15 +48,19 @@
  * @author Brian Northan
  */
 @Plugin(type = Op.class, name = "filter.fftSize")
-@Parameter(key = "inputDimensions")
-@Parameter(key = "paddedSize")
-@Parameter(key = "fftSize")
-@Parameter(key = "forward")
-@Parameter(key = "fast")
-@Parameter(key = "outputs")
 public class ComputeFFTSize implements Functions.Arity5<Dimensions, long[], long[], Boolean, Boolean, Pair<long[], long[]>> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param inputDimensions
+	 * @param paddedSize
+	 * @param fftSize
+	 * @param forward
+	 * @param fast
+	 * @return the outputs
+	 */
 	public Pair<long[], long[]> apply(Dimensions inputDimensions, long[] paddedSize, long[] fftSize, Boolean forward,
 			Boolean fast) {
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java
index 3d876ad81..0ac6f1f7c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java
@@ -48,12 +48,16 @@
  * @author Brian Northan
  */
 @Plugin(type = Op.class, name = "filter.fftSize")
-@Parameter(key = "dimensions")
-@Parameter(key = "powerOfTwo")
-@Parameter(key = "outputSizes")
 public class DefaultComputeFFTSize implements BiFunction<Dimensions, Boolean, long[][]> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param dimensions
+	 * @param powerOfTwo
+	 * @return the outputSizes
+	 */
 	public long[][] apply(Dimensions inputDimensions, Boolean powerOfTwo) {
 
 		long[][] size = new long[2][];
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java
index 225b75627..a7232e360 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java
@@ -55,8 +55,6 @@
  */
 
 @Plugin(type = Op.class, name = "filter.hessian")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class HessianRAI<T extends RealType<T>>
 		implements Function<RandomAccessibleInterval<T>, CompositeIntervalView<T, RealComposite<T>>> {
 
@@ -67,6 +65,12 @@ public class HessianRAI<T extends RealType<T>>
 	private Function<RandomAccessibleInterval<T>, RandomAccessibleInterval<T>> createRAI;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @return the output
+	 */
 	public CompositeIntervalView<T, RealComposite<T>> apply(RandomAccessibleInterval<T> input) {
 		List<RandomAccessibleInterval<T>> derivatives = new ArrayList<>();
 		for (int i = 0; i < input.numDimensions(); i++) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java
index 248e836ac..43db89f5a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java
@@ -55,9 +55,6 @@
  * @param <T>
  */
 @Plugin(type = Op.class, name = "filter.ifft")
-@Parameter(key = "input")
-@Parameter(key = "executorService")
-@Parameter(key = "output")
 public class IFFTMethodsOpC<C extends ComplexType<C>, T extends RealType<T>>
 		implements Computers.Arity2<RandomAccessibleInterval<C>, ExecutorService, RandomAccessibleInterval<T>> {
 
@@ -68,6 +65,13 @@ public class IFFTMethodsOpC<C extends ComplexType<C>, T extends RealType<T>>
 	 * Compute an ND inverse FFT
 	 */
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param executorService
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<C> input, final ExecutorService es,
 			final RandomAccessibleInterval<T> output) {
 		if (!conforms(input))
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java
index 9b7397701..2ffe531b4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java
@@ -50,8 +50,6 @@
  * @author Brian Northan
  */
 @Plugin(type = Op.class, name = "filter.ifft")
-@Parameter(key = "input")
-@Parameter(key = "executorService")
 public class IFFTMethodsOpI<C extends ComplexType<C>>
 		implements Inplaces.Arity2_1<RandomAccessibleInterval<C>, ExecutorService> {
 
@@ -59,6 +57,12 @@ public class IFFTMethodsOpI<C extends ComplexType<C>>
 	 * Compute an ND inverse FFT
 	 */
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param executorService
+	 */
 	public void mutate(final RandomAccessibleInterval<C> inout, final ExecutorService es) {
 		if (!conforms(inout))
 			throw new IllegalArgumentException("The input size does not conform to a supported FFT size!");
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java
index 151f2dfe5..b1d416aca 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java
@@ -50,10 +50,6 @@
  *            type
  */
 @Plugin(type = Op.class, name = "filter.max")
-@Parameter(key = "input")
-@Parameter(key = "shape")
-@Parameter(key = "outOfBoundsFactory")
-@Parameter(key = "output")
 public class DefaultMaxFilter<T, V> implements
 		Computers.Arity3<RandomAccessibleInterval<T>, Shape, OutOfBoundsFactory<T, RandomAccessibleInterval<T>>, RandomAccessibleInterval<V>> {
 
@@ -64,6 +60,14 @@ public class DefaultMaxFilter<T, V> implements
 	private Computers.Arity3<RandomAccessibleInterval<T>, Shape, Computers.Arity1<Iterable<T>, V>, RandomAccessibleInterval<V>> mapper;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param shape
+	 * @param outOfBoundsFactory
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<T> input, final Shape inputNeighborhoodShape,
 			final OutOfBoundsFactory<T, RandomAccessibleInterval<T>> outOfBoundsFactory,
 			final RandomAccessibleInterval<V> output) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java
index 0e017e7c9..ae064f427 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java
@@ -50,10 +50,6 @@
  *            type
  */
 @Plugin(type = Op.class, name = "filter.mean")
-@Parameter(key = "input")
-@Parameter(key = "shape")
-@Parameter(key = "outOfBoundsFactory")
-@Parameter(key = "output")
 public class DefaultMeanFilter<T, V> implements
 		Computers.Arity3<RandomAccessibleInterval<T>, Shape, OutOfBoundsFactory<T, RandomAccessibleInterval<T>>, RandomAccessibleInterval<V>> {
 
@@ -64,6 +60,14 @@ public class DefaultMeanFilter<T, V> implements
 	private Computers.Arity3<RandomAccessibleInterval<T>, Shape, Computers.Arity1<Iterable<T>, V>, RandomAccessibleInterval<V>> mapper;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param shape
+	 * @param outOfBoundsFactory
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<T> input, final Shape inputNeighborhoodShape,
 			final OutOfBoundsFactory<T, RandomAccessibleInterval<T>> outOfBoundsFactory,
 			final RandomAccessibleInterval<V> output) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java
index 3908c0217..a400f8b60 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java
@@ -49,10 +49,6 @@
  *            type
  */
 @Plugin(type = Op.class, name = "filter.median")
-@Parameter(key = "input")
-@Parameter(key = "shape")
-@Parameter(key = "outOfBoundsFactory")
-@Parameter(key = "output")
 public class DefaultMedianFilter<T, V> implements
 		Computers.Arity3<RandomAccessibleInterval<T>, Shape, OutOfBoundsFactory<T, RandomAccessibleInterval<T>>, RandomAccessibleInterval<V>> {
 
@@ -63,6 +59,14 @@ public class DefaultMedianFilter<T, V> implements
 	private Computers.Arity3<RandomAccessibleInterval<T>, Shape, Computers.Arity1<Iterable<T>, V>, RandomAccessibleInterval<V>> mapper;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param shape
+	 * @param outOfBoundsFactory
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<T> input, final Shape inputNeighborhoodShape,
 			final OutOfBoundsFactory<T, RandomAccessibleInterval<T>> outOfBoundsFactory,
 			final RandomAccessibleInterval<V> output) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java
index d4a2622aa..20d930bd5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java
@@ -49,10 +49,6 @@
  *            type
  */
 @Plugin(type = Op.class, name = "filter.min")
-@Parameter(key = "input")
-@Parameter(key = "shape")
-@Parameter(key = "outOfBoundsFactory")
-@Parameter(key = "output")
 public class DefaultMinFilter<T, V> implements
 		Computers.Arity3<RandomAccessibleInterval<T>, Shape, OutOfBoundsFactory<T, RandomAccessibleInterval<T>>, RandomAccessibleInterval<V>> {
 
@@ -63,6 +59,14 @@ public class DefaultMinFilter<T, V> implements
 	private Computers.Arity3<RandomAccessibleInterval<T>, Shape, Computers.Arity1<Iterable<T>, V>, RandomAccessibleInterval<V>> mapper;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param shape
+	 * @param outOfBoundsFactory
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<T> input, final Shape inputNeighborhoodShape,
 			final OutOfBoundsFactory<T, RandomAccessibleInterval<T>> outOfBoundsFactory,
 			final RandomAccessibleInterval<V> output) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java
index 6d6677baa..19ce5cd95 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java
@@ -53,11 +53,6 @@
  * @author Brian Northan
  */
 @Plugin(type = Op.class, name = "filter.padInputFFT", priority = Priority.NORMAL)
-@Parameter(key = "input")
-@Parameter(key = "paddedDimensions")
-@Parameter(key = "fast")
-@Parameter(key = "outOfBoundsFactory")
-@Parameter(key = "output")
 public class DefaultPadInputFFT<T extends ComplexType<T>, I extends RandomAccessibleInterval<T>, O extends RandomAccessibleInterval<T>>
 		extends PadInputFFT<T, I, O> {
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java
index 8de884891..468fd01ad 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java
@@ -54,9 +54,6 @@
  * @param <O>
  */
 @Plugin(type = Op.class, name = "filter.padShiftFFTKernel", priority = Priority.HIGH)
-@Parameter(key = "input")
-@Parameter(key = "paddedDimensions")
-@Parameter(key = "output")
 public class DefaultPadShiftKernelFFT<T extends ComplexType<T>, I extends RandomAccessibleInterval<T>, O extends RandomAccessibleInterval<T>>
 		extends PadShiftKernel<T, I, O> {
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java
index 717afcd28..567be2eb9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java
@@ -57,10 +57,6 @@
  * @param <O>
  */
 @Plugin(type = Op.class, name = "filter.padInput", priority = Priority.HIGH)
-@Parameter(key = "input")
-@Parameter(key = "paddedDimensions")
-@Parameter(key = "outOfBoundsFactory", description = "The OutOfBoundsFactory used to extend the image")
-@Parameter(key = "output")
 public class PadInput<T extends ComplexType<T>, I extends RandomAccessibleInterval<T>, O extends RandomAccessibleInterval<T>>
 		implements Functions.Arity3<I, Dimensions, OutOfBoundsFactory<T, RandomAccessibleInterval<T>>, O> {
 
@@ -69,6 +65,14 @@ public class PadInput<T extends ComplexType<T>, I extends RandomAccessibleInterv
 
 	@Override
 	@SuppressWarnings("unchecked")
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param paddedDimensions
+	 * @param outOfBoundsFactory The OutOfBoundsFactory used to extend the image
+	 * @return the output
+	 */
 	public O apply(final I input, final Dimensions paddedDimensions,
 			OutOfBoundsFactory<T, RandomAccessibleInterval<T>> obf) {
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java
index 969bb082c..f41a5cde6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java
@@ -53,11 +53,6 @@
  * @param <O>
  */
 @Plugin(type = Op.class, name = "filter.padInputFFTMethods", priority = Priority.HIGH)
-@Parameter(key = "input")
-@Parameter(key = "paddedDimensions")
-@Parameter(key = "fast")
-@Parameter(key = "outOfBoundsFactory")
-@Parameter(key = "output")
 public class PadInputFFTMethods<T extends ComplexType<T>, I extends RandomAccessibleInterval<T>, O extends RandomAccessibleInterval<T>>
 		extends PadInputFFT<T, I, O> {
 	
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java
index f46fc3f42..9f39745ec 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java
@@ -55,9 +55,6 @@
  * @param <O>
  */
 @Plugin(type = Op.class, name = "filter.padShiftKernel")
-@Parameter(key = "kernel")
-@Parameter(key = "paddedDimensions")
-@Parameter(key = "output")
 public class PadShiftKernel<T extends ComplexType<T>, I extends RandomAccessibleInterval<T>, O extends RandomAccessibleInterval<T>>
 	implements BiFunction<I, Dimensions, O> 
 {
@@ -70,6 +67,13 @@ public class PadShiftKernel<T extends ComplexType<T>, I extends RandomAccessible
 
 	@Override
 	@SuppressWarnings("unchecked")
+	/**
+	 * TODO
+	 *
+	 * @param kernel
+	 * @param paddedDimensions
+	 * @return the output
+	 */
 	public O apply(final I kernel, final Dimensions paddedDimensions) {
 
 		Dimensions paddedFFTInputDimensions;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java
index 853134f9a..fdae8b070 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java
@@ -55,9 +55,6 @@
  */
 @Plugin(type = Op.class, name = "filter.padShiftKernelFFTMethods",
 	priority = Priority.HIGH)
-@Parameter(key = "input")
-@Parameter(key = "paddedDimensions")
-@Parameter(key = "output")
 public class PadShiftKernelFFTMethods<T extends ComplexType<T>, I extends RandomAccessibleInterval<T>, O extends RandomAccessibleInterval<T>>
 	extends PadShiftKernel<T, I, O>
 {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java
index 7283233f0..9ca202e33 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java
@@ -54,14 +54,18 @@
  * @param <O>
  */
 @Plugin(type = Op.class, name = "filter.padIntervalCentered", priority = Priority.HIGH)
-@Parameter(key = "input")
-@Parameter(key = "paddedDimensions")
-@Parameter(key = "output")
 public class PaddingIntervalCentered<T extends ComplexType<T>, I extends RandomAccessibleInterval<T>, O extends Interval>
 		implements BiFunction<I, Dimensions, O> {
 
 	@Override
 	@SuppressWarnings("unchecked")
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param paddedDimensions
+	 * @return the output
+	 */
 	public O apply(final I input, final Dimensions paddedDimensions) {
 
 		final long[] paddedSize = new long[paddedDimensions.numDimensions()];
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java
index 6f4d426bb..413d5ae2f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java
@@ -52,14 +52,18 @@
  * @param <O>
  */
 @Plugin(type = Op.class, name = "filter.padIntervalOrigin", priority = Priority.HIGH)
-@Parameter(key = "input")
-@Parameter(key = "interval")
-@Parameter(key = "output")
 public class PaddingIntervalOrigin<T extends ComplexType<T>, I extends RandomAccessibleInterval<T>, O extends Interval>
 		implements BiFunction<I, Interval, O> {
 
 	@Override
 	@SuppressWarnings("unchecked")
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param interval
+	 * @return the output
+	 */
 	public O apply(final I input, final Interval centeredInterval) {
 
 		int numDimensions = input.numDimensions();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java
index 1ee6ec4c4..994ed2dd7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java
@@ -52,12 +52,6 @@
  *            type
  */
 @Plugin(type = Op.class, name = "filter.sigma", priority = Priority.LOW)
-@Parameter(key = "input")
-@Parameter(key = "inputNeighborhoodShape")
-@Parameter(key = "outOfBoundsFactory")
-@Parameter(key = "range")
-@Parameter(key = "minPixelFraction")
-@Parameter(key = "output")
 public class DefaultSigmaFilter<T extends RealType<T>, V extends RealType<V>> implements
 		Computers.Arity5<RandomAccessibleInterval<T>, Shape, OutOfBoundsFactory<T, RandomAccessibleInterval<T>>, Double, Double, RandomAccessibleInterval<V>> {
 
@@ -68,6 +62,16 @@ public class DefaultSigmaFilter<T extends RealType<T>, V extends RealType<V>> im
 	private Computers.Arity3<RandomAccessibleInterval<T>, Shape, Computers.Arity2<Iterable<T>, T, V>, RandomAccessibleInterval<V>> mapper;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param inputNeighborhoodShape
+	 * @param outOfBoundsFactory
+	 * @param range
+	 * @param minPixelFraction
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<T> input, final Shape inputNeighborhoodShape,
 			OutOfBoundsFactory<T, RandomAccessibleInterval<T>> outOfBoundsFactory, final Double range,
 			final Double minPixelFraction, final RandomAccessibleInterval<V> output) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java
index 5c3a7c368..a3631c753 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java
@@ -50,8 +50,6 @@
  */
 
 @Plugin(type = Op.class, name = "filter.sobel")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class SobelRAI<T extends RealType<T>>
 		implements Computers.Arity1<RandomAccessibleInterval<T>, RandomAccessibleInterval<T>> {
 	
@@ -71,6 +69,12 @@ public class SobelRAI<T extends RealType<T>>
 	private Computers.Arity2<RandomAccessibleInterval<T>, Integer, RandomAccessibleInterval<T>> derivativeComputer;
 	
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void compute(RandomAccessibleInterval<T> input, RandomAccessibleInterval<T> output) {
 
 		for (int i = 0; i < input.numDimensions(); i++) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java
index 8bf70a8ad..d54c82665 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java
@@ -96,11 +96,6 @@
  *            the type of the source pixels. Must extends {@link RealType}.
  */
 @Plugin(type = Op.class, name = "filter.tubeness")
-@Parameter(key = "input")
-@Parameter(key = "executorService")
-@Parameter(key = "sigma")
-@Parameter(key = "calibration")
-@Parameter(key = "output")
 public class DefaultTubeness<T extends RealType<T>> implements
 		Computers.Arity4<RandomAccessibleInterval<T>, ExecutorService, Double, double[], IterableInterval<DoubleType>>,
 		Cancelable {
@@ -116,6 +111,15 @@ public class DefaultTubeness<T extends RealType<T>> implements
 	private Computers.Arity3<RandomAccessibleInterval<DoubleType>, Computers.Arity1<Iterable<DoubleType>, DoubleType>, Integer, IterableInterval<DoubleType>> projector;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param executorService
+	 * @param sigma
+	 * @param calibration
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<T> input, ExecutorService es, final Double sigma,
 			final double[] calibration, final IterableInterval<DoubleType> tubeness) {
 		cancelReason = null;
@@ -253,10 +257,6 @@ public String getCancelReason() {
 }
 
 @Plugin(type = Op.class, name = "filter.tubeness")
-@Parameter(key = "input")
-@Parameter(key = "executorService")
-@Parameter(key = "sigma")
-@Parameter(key = "output")
 class DefaultTubenessWithoutCalibration<T extends RealType<T>> implements
 		Computers.Arity3<RandomAccessibleInterval<T>, ExecutorService, Double, IterableInterval<DoubleType>> {
 
@@ -264,6 +264,14 @@ class DefaultTubenessWithoutCalibration<T extends RealType<T>> implements
 	Computers.Arity4<RandomAccessibleInterval<T>, ExecutorService, Double, double[], IterableInterval<DoubleType>> tubenessOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param executorService
+	 * @param sigma
+	 * @param output
+	 */
 	public void compute(RandomAccessibleInterval<T> in1, ExecutorService in2, Double in3,
 			IterableInterval<DoubleType> out) {
 		tubenessOp.compute(in1, in2, in3, new double[] {}, out);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java
index 1e1893c47..44d1c361c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java
@@ -50,10 +50,6 @@
  *            type
  */
 @Plugin(type = Op.class, name = "filter.variance")
-@Parameter(key = "input")
-@Parameter(key = "shape")
-@Parameter(key = "outOfBoundsFactory")
-@Parameter(key = "output")
 public class DefaultVarianceFilter<T, V> implements
 		Computers.Arity3<RandomAccessibleInterval<T>, Shape, OutOfBoundsFactory<T, RandomAccessibleInterval<T>>, RandomAccessibleInterval<V>> {
 
@@ -64,6 +60,14 @@ public class DefaultVarianceFilter<T, V> implements
 	private Computers.Arity3<RandomAccessibleInterval<T>, Shape, Computers.Arity1<Iterable<T>, V>, RandomAccessibleInterval<V>> mapper;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param shape
+	 * @param outOfBoundsFactory
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<T> input, final Shape inputNeighborhoodShape,
 			final OutOfBoundsFactory<T, RandomAccessibleInterval<T>> outOfBoundsFactory,
 			final RandomAccessibleInterval<V> output) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java
index 8667a1a4b..e5201b554 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java
@@ -59,10 +59,6 @@
  * @author Gabe Selzer
  */
 @Plugin(type = Op.class, name = "filter.frangiVesselness")
-@Parameter(key = "input")
-@Parameter(key = "spacing", description = "physicl distance between data points")
-@Parameter(key = "scale", description = "size of vessels to search for")
-@Parameter(key = "output")
 public class DefaultFrangi<T extends RealType<T>, U extends RealType<U>>
 		implements Computers.Arity3<RandomAccessibleInterval<T>, double[], Integer, RandomAccessibleInterval<U>> {
 
@@ -102,6 +98,14 @@ private double derive(double val1, double val2, double distance) {
 	}
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param spacing physicl distance between data points
+	 * @param scale size of vessels to search for
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<T> input, final double[] spacing, final Integer scale,
 			final RandomAccessibleInterval<U> output) {
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java
index b023b3119..d95bc6237 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java
@@ -47,11 +47,15 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.centroid", priority = 1)
-@Parameter(key = "input")
-@Parameter(key = "centroid")
 public class CentroidII implements Function<IterableInterval<?>, RealLocalizable> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param centroid
+	 */
 	public RealLocalizable apply(final IterableInterval<?> input) {
 		int numDimensions = input.numDimensions();
 		double[] output = new double[numDimensions];
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java
index 1db843e60..faf9b4a1a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java
@@ -47,11 +47,15 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.centroid", priority = 2)
-@Parameter(key = "input")
-@Parameter(key = "centroid")
 public class CentroidLabelRegion implements Function<LabelRegion<?>, RealLocalizable> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param centroid
+	 */
 	public RealLocalizable apply(final LabelRegion<?> input) {
 
 		return new RealPoint(input.getCenterOfMass());
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java
index 062690ae8..13db03291 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java
@@ -50,14 +50,18 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.centroid", label = "Geometric: Centroid")
-@Parameter(key = "input")
-@Parameter(key = "centroid")
 public class CentroidMesh implements Function<Mesh, RealLocalizable> {
 
 	@OpDependency(name = "geom.size")
 	private Function<Mesh, DoubleType> sizeFunc;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param centroid
+	 */
 	public RealLocalizable apply(final Mesh input) {
 
 		double c_x = 0;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java
index 99520c13f..19449d34b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java
@@ -48,14 +48,18 @@
  * @author Daniel Seebacher (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.centroid", label = "Geometric: Center of Gravity")
-@Parameter(key = "input")
-@Parameter(key = "centroid")
 public class CentroidPolygon implements Function<Polygon2D, RealLocalizable> {
 
 	@OpDependency(name = "geom.size")
 	private Function<Polygon2D, DoubleType> sizeFunc;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param centroid
+	 */
 	public RealLocalizable apply(final Polygon2D input) {
 
 		double area = sizeFunc.apply(input).get();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java
index ac6635ad0..0e6ae0b54 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java
@@ -50,11 +50,15 @@
  * @author Daniel Seebacher (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.centerOfGravity")
-@Parameter(key = "input")
-@Parameter(key = "centerOfGravity")
 public class DefaultCenterOfGravity<T extends RealType<T>> implements Function<IterableInterval<T>, RealLocalizable> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param centerOfGravity
+	 */
 	public RealLocalizable apply(final IterableInterval<T> input) {
 		final int numDimensions = input.numDimensions();
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java
index b192e7053..668e276ba 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java
@@ -46,11 +46,15 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.size", label = "Geometric: Size", priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "size")
 public class SizeII implements Function<IterableInterval<?>, DoubleType> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param size
+	 */
 	public DoubleType apply(IterableInterval<?> input) {
 		return new DoubleType(input.size());
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java
index a3f193347..4a2c81edf 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java
@@ -42,6 +42,4 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.boundarySizeConvexHull", label = "Geometric (2D): Perimeter Convex Hull", priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "boundarySizeConvexHull")
 public class DefaultBoundarySizeConvexHullPolygon extends AbstractBoundarySizeConvexHull<Polygon2D> {}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java
index 6225edb02..14d7b0535 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java
@@ -50,11 +50,15 @@
  * @author Daniel Seebacher (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.boundingBox")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultBoundingBox implements Function<Polygon2D, Polygon2D> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @return the output
+	 */
 	public Polygon2D apply(final Polygon2D input) {
 		double min_x = Double.POSITIVE_INFINITY;
 		double max_x = Double.NEGATIVE_INFINITY;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java
index 54bc5a822..6e9356fab 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java
@@ -42,6 +42,4 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.boxivity", label = "Geometric (2D): Rectangularity", priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "boxivity")
 public class DefaultBoxivityPolygon extends AbstractBoxivity<Polygon2D> {}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java
index 3a20ec25a..c49630ce5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java
@@ -49,8 +49,6 @@
  * @author Daniel Seebacher (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.circularity", label = "Geometric (2D): Circularity")
-@Parameter(key = "input")
-@Parameter(key = "circularity")
 public class DefaultCircularity implements Computers.Arity1<Polygon2D, DoubleType> {
 
 	@OpDependency(name = "geom.size")
@@ -59,6 +57,12 @@ public class DefaultCircularity implements Computers.Arity1<Polygon2D, DoubleTyp
 	private Function<Polygon2D, DoubleType> perimeterFunc;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param circularity
+	 */
 	public void compute(Polygon2D input, DoubleType output) {
 		output.set(4 * Math.PI
 				* (areaFunc.apply(input).getRealDouble() / Math.pow(perimeterFunc.apply(input).getRealDouble(), 2)));
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java
index 6f032e4c2..f1d0451e9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java
@@ -60,9 +60,6 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.contour")
-@Parameter(key = "input")
-@Parameter(key = "useJacobs", description = "Set this flag to use refined Jacobs stopping criteria")
-@Parameter(key = "contour")
 public class DefaultContour<B extends BooleanType<B>>
 		implements BiFunction<RandomAccessibleInterval<B>, Boolean, Polygon2D> {
 
@@ -187,6 +184,13 @@ public void backtrackSpecial() {
 	}
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param useJacobs Set this flag to use refined Jacobs stopping criteria
+	 * @param contour
+	 */
 	public Polygon2D apply(final RandomAccessibleInterval<B> input, final Boolean useJacobs) {
 
 		// ensure validity of inputs
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java
index c9066467f..7d99188bc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java
@@ -51,11 +51,15 @@
  * @author Daniel Seebacher (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.convexHull")
-@Parameter(key = "input")
-@Parameter(key = "convexHull")
 public class DefaultConvexHull2D implements Function<Polygon2D, Polygon2D> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param convexHull
+	 */
 	public Polygon2D apply(final Polygon2D input) {
 		// create a copy of points because se will get resorted, etc.
 		List<? extends RealLocalizable> RealPoints = new ArrayList<>(GeomUtils.vertices(input));
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java
index b454deb6a..ee49c49be 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java
@@ -41,6 +41,4 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.convexity", label = "Geometric (2D): Convexity", priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "convexity")
 public class DefaultConvexityPolygon extends AbstractConvexity<Polygon2D> {}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java
index 791483e14..86a05130f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java
@@ -50,8 +50,6 @@
  * @author Tim-Oliver Buchholz, University of Konstanz
  */
 @Plugin(type = Op.class, name = "geom.eccentricity", label = "Geometric (2D): Eccentricity")
-@Parameter(key = "input")
-@Parameter(key = "eccentricity")
 public class DefaultEccentricity implements Computers.Arity1<Polygon2D, DoubleType> {
 
 	@OpDependency(name = "geom.minorAxis")
@@ -60,6 +58,12 @@ public class DefaultEccentricity implements Computers.Arity1<Polygon2D, DoubleTy
 	private Function<Polygon2D, DoubleType> majorAxisFunc;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param eccentricity
+	 */
 	public void compute(final Polygon2D input, final DoubleType output) {
 
 		final double a = majorAxisFunc.apply(input).get() / 2.0;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java
index cc97bdf64..c091841b9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java
@@ -52,14 +52,18 @@
  * @author Tim-Oliver Buchholz, University of Konstanz
  */
 @Plugin(type = Op.class, name = "geom.mainElongation", label = "Geometric (2D): Elongation")
-@Parameter(key = "input")
-@Parameter(key = "elongation")
 public class DefaultElongation implements Computers.Arity1<Polygon2D, DoubleType> {
 
 	@OpDependency(name = "geom.smallestEnclosingBoundingBox")
 	private Function<Polygon2D, Polygon2D> minimumBoundingBoxFunc;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param elongation
+	 */
 	public void compute(final Polygon2D input, final DoubleType output) {
 		final List<? extends RealLocalizable> minBB = GeomUtils.vertices(minimumBoundingBoxFunc.apply(input));
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java
index 592532b78..845103423 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java
@@ -45,11 +45,15 @@
  * @author Tim-Oliver Buchholz, University of Konstanz
  */
 @Plugin(type = Op.class, name = "geom.feretsAngle", label = "Geometric (2D): Ferets Angle")
-@Parameter(key = "points")
-@Parameter(key = "feretsAngle")
 public class DefaultFeretsAngle implements Computers.Arity1<Pair<RealLocalizable, RealLocalizable>, DoubleType> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param points
+	 * @param feretsAngle
+	 */
 	public void compute(final Pair<RealLocalizable, RealLocalizable> input, final DoubleType output) {
 
 		final RealLocalizable p1 = input.getA();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java
index 820bb73c6..ae51246c8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java
@@ -45,11 +45,15 @@
  * @author Tim-Oliver Buchholz, University of Konstanz
  */
 @Plugin(type = Op.class, name = "geom.feretsDiameter", label = "Geometric (2D): Ferets Diameter")
-@Parameter(key = "points")
-@Parameter(key = "feretsDiameter")
 public class DefaultFeretsDiameter implements Computers.Arity1<Pair<RealLocalizable, RealLocalizable>, DoubleType> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param points
+	 * @param feretsDiameter
+	 */
 	public void compute(final Pair<RealLocalizable, RealLocalizable> input, final DoubleType output) {
 
 		final RealLocalizable p1 = input.getA();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java
index 096574a81..534f10366 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java
@@ -50,15 +50,19 @@
  * @author Tim-Oliver Buchholz, University of Konstanz
  */
 @Plugin(type = Op.class, name = "geom.feretsDiameter")
-@Parameter(key = "input")
-@Parameter(key = "angle")
-@Parameter(key = "feretsDiameter")
 public class DefaultFeretsDiameterForAngle implements Computers.Arity2<Polygon2D, Double, DoubleType> {
 
 	@OpDependency(name = "geom.convexHull")
 	private Function<Polygon2D, Polygon2D> function;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param angle
+	 * @param feretsDiameter
+	 */
 	public void compute(Polygon2D input, final Double angle, DoubleType output) {
 		final List<? extends RealLocalizable> points = GeomUtils.vertices(function.apply(input));
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java
index 7f765dd54..71df6e048 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java
@@ -48,14 +48,18 @@
  * @author Daniel Seebacher (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.majorAxis", label = "Geometric (2D): Major Axis")
-@Parameter(key = "input")
-@Parameter(key = "majorAxis")
 public class DefaultMajorAxis implements Computers.Arity1<Polygon2D, DoubleType> {
 
 	@OpDependency(name = "geom.secondMoment")
 	private Function<Polygon2D, Pair<DoubleType, DoubleType>> minorMajorAxisFunc;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param majorAxis
+	 */
 	public void compute(final Polygon2D input, final DoubleType output) {
 		output.set(minorMajorAxisFunc.apply(input).getB());
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java
index 6108694af..292b3e9f4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java
@@ -50,14 +50,18 @@
  * @author Tim-Oliver Buchholz, University of Konstanz
  */
 @Plugin(type = Op.class, name = "geom.maximumFeret")
-@Parameter(key = "input")
-@Parameter(key = "maximumFeret")
 public class DefaultMaximumFeret implements Function<Polygon2D, Pair<RealLocalizable, RealLocalizable>> {
 
 	@OpDependency(name = "geom.convexHull")
 	private Function<Polygon2D, Polygon2D> function;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param maximumFeret
+	 */
 	public Pair<RealLocalizable, RealLocalizable> apply(Polygon2D input) {
 		final List<? extends RealLocalizable> points = GeomUtils.vertices(function.apply(input));
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java
index 6bf5a59df..943865fed 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java
@@ -43,8 +43,6 @@
 import org.scijava.struct.ItemIO;
 
 @Plugin(type = Op.class, name = "geom.maximumFeretsAngle")
-@Parameter(key = "input")
-@Parameter(key = "maxFeretsAngle")
 public class DefaultMaximumFeretAngle implements Computers.Arity1<Polygon2D, DoubleType> {
 
 	@OpDependency(name = "geom.maximumFeret")
@@ -53,6 +51,12 @@ public class DefaultMaximumFeretAngle implements Computers.Arity1<Polygon2D, Dou
 	private Function<Pair<RealLocalizable, RealLocalizable>, DoubleType> feretAngle;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param maxFeretsAngle
+	 */
 	public void compute(Polygon2D input, DoubleType output) {
 		output.set(feretAngle.apply(maxFeret.apply(input)).get());
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java
index 69d967c99..c08626018 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java
@@ -43,8 +43,6 @@
 import org.scijava.struct.ItemIO;
 
 @Plugin(type = Op.class, name = "geom.maximumFeretsDiameter")
-@Parameter(key = "input")
-@Parameter(key = "maxFeretsDiameter")
 public class DefaultMaximumFeretDiameter implements Computers.Arity1<Polygon2D, DoubleType> {
 
 	@OpDependency(name = "geom.maximumFeret")
@@ -53,6 +51,12 @@ public class DefaultMaximumFeretDiameter implements Computers.Arity1<Polygon2D,
 	private Function<Pair<RealLocalizable, RealLocalizable>, DoubleType> feretDiameter;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param maxFeretsDiameter
+	 */
 	public void compute(Polygon2D input, DoubleType output) {
 		output.set(feretDiameter.apply(maxFeret.apply(input)).get());
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java
index 90755c5d2..dd7c13c5e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java
@@ -53,14 +53,18 @@
  * @author Tim-Oliver Buchholz, University of Konstanz
  */
 @Plugin(type = Op.class, name = "geom.minimumFeret")
-@Parameter(key = "input")
-@Parameter(key = "minFeret")
 public class DefaultMinimumFeret implements Function<Polygon2D, Pair<RealLocalizable, RealLocalizable>> {
 
 	@OpDependency(name = "geom.convexHull")
 	private Function<Polygon2D, Polygon2D> function;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param minFeret
+	 */
 	public Pair<RealLocalizable, RealLocalizable> apply(Polygon2D input) {
 		final List<? extends RealLocalizable> points = GeomUtils.vertices(function.apply(input));
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java
index 3f692f141..8208a967d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java
@@ -43,8 +43,6 @@
 import org.scijava.struct.ItemIO;
 
 @Plugin(type = Op.class, name = "geom.minimumFeretsAngle")
-@Parameter(key = "input")
-@Parameter(key = "minFeretAngle")
 public class DefaultMinimumFeretAngle implements Computers.Arity1<Polygon2D, DoubleType> {
 
 	@OpDependency(name = "geom.minimumFeret")
@@ -53,6 +51,12 @@ public class DefaultMinimumFeretAngle implements Computers.Arity1<Polygon2D, Dou
 	private Function<Pair<RealLocalizable, RealLocalizable>, DoubleType> feretAngle;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param minFeretAngle
+	 */
 	public void compute(Polygon2D input, DoubleType output) {
 		output.set(feretAngle.apply(minFeret.apply(input)).get());
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java
index 2011676c6..425118f0c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java
@@ -43,8 +43,6 @@
 import org.scijava.struct.ItemIO;
 
 @Plugin(type = Op.class, name = "geom.minimumFeretsDiameter")
-@Parameter(key = "input")
-@Parameter(key = "minFeretDiameter")
 public class DefaultMinimumFeretDiameter implements Computers.Arity1<Polygon2D, DoubleType> {
 
 	@OpDependency(name = "geom.minimumFeret")
@@ -53,6 +51,12 @@ public class DefaultMinimumFeretDiameter implements Computers.Arity1<Polygon2D,
 	private Function<Pair<RealLocalizable, RealLocalizable>, DoubleType> feretDiameter;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param minFeretDiameter
+	 */
 	public void compute(Polygon2D input, DoubleType output) {
 		output.set(feretDiameter.apply(minFeret.apply(input)).get());
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java
index 05129a14e..2e9b7b550 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java
@@ -48,14 +48,18 @@
  * @author Daniel Seebacher (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.minorAxis", label = "Geometric (2D): Minor Axis")
-@Parameter(key = "input")
-@Parameter(key = "minorAxis")
 public class DefaultMinorAxis implements Computers.Arity1<Polygon2D, DoubleType> {
 
 	@OpDependency(name = "geom.secondMoment")
 	private Function<Polygon2D, Pair<DoubleType, DoubleType>> minorMajorAxisFunc;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param minorAxis
+	 */
 	public void compute(final Polygon2D input, final DoubleType output) {
 		output.set(minorMajorAxisFunc.apply(input).getA());
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java
index ee0fccedc..bd1510f11 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java
@@ -53,8 +53,6 @@
  * @author Daniel Seebacher (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.secondMoment")
-@Parameter(key = "input")
-@Parameter(key = "minorMajorAxisPair")
 public class DefaultMinorMajorAxis implements Function<Polygon2D, Pair<DoubleType, DoubleType>> {
 
 	/**
@@ -193,6 +191,12 @@ private double getX(final Polygon2D input, final int index) {
 	}
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param minorMajorAxisPair
+	 */
 	public Pair<DoubleType, DoubleType> apply(final Polygon2D input) {
 		
 		List<RealLocalizable> points = new ArrayList<>(GeomUtils.vertices(input));
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java
index 7a362083d..0bf9bca42 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java
@@ -48,11 +48,15 @@
  * @author Daniel Seebacher (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.boundarySize", label = "Geometric (2D): Perimeter")
-@Parameter(key = "input")
-@Parameter(key = "boundarySize")
 public class DefaultPerimeterLength implements Computers.Arity1<Polygon2D, DoubleType> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param boundarySize
+	 */
 	public void compute(final Polygon2D input, final DoubleType output) {
 		double perimeter = 0;
 		final List<? extends RealLocalizable> vertices = GeomUtils.vertices(input);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java
index 97e14420a..34d761b11 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java
@@ -49,8 +49,6 @@
  * @author Daniel Seebacher (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.roundness", label = "Geometric (2D): Roundness")
-@Parameter(key = "input")
-@Parameter(key = "roundness")
 public class DefaultRoundness implements Computers.Arity1<Polygon2D, DoubleType> {
 
 	@OpDependency(name = "geom.size")
@@ -59,6 +57,12 @@ public class DefaultRoundness implements Computers.Arity1<Polygon2D, DoubleType>
 	private Function<Polygon2D, DoubleType> majorAxisFunc;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param roundness
+	 */
 	public void compute(final Polygon2D input, final DoubleType output) {
 		output.set(4 * (areaFunc.apply(input).getRealDouble()
 				/ (Math.PI * Math.pow(majorAxisFunc.apply(input).getRealDouble(), 2))));
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java
index 23123f3de..8db07c9b1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java
@@ -42,6 +42,4 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.sizeConvexHull", label = "Geometric (2D): Size ConvexHull", priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "sizeConvexHull")
 public class DefaultSizeConvexHullPolygon extends AbstractSizeConvexHull<Polygon2D> {}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java
index f75d3c0c3..4a3a9cbd4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java
@@ -48,11 +48,15 @@
  * @author Daniel Seebacher (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.size", label = "Geometric (2D): Size", priority = Priority.VERY_HIGH - 1)
-@Parameter(key = "input")
-@Parameter(key = "size")
 public class DefaultSizePolygon implements Computers.Arity1<Polygon2D, DoubleType> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param size
+	 */
 	public void compute(Polygon2D input, DoubleType output) {
 		double sum = 0;
 		final int numVertices = input.numVertices();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java
index d19802bd1..f8aad4851 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java
@@ -52,8 +52,6 @@
  * @author Daniel Seebacher (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.smallestEnclosingBoundingBox", label = "Geometric (2D): Smallest Enclosing Rectangle")
-@Parameter(key = "input")
-@Parameter(key = "smallestEnclosingBoundingBox")
 public class DefaultSmallestEnclosingRectangle implements Function<Polygon2D, Polygon2D> {
 
 	@OpDependency(name = "geom.convexHull")
@@ -102,6 +100,12 @@ private Polygon2D rotate(final Polygon2D inPoly, final double angle, final RealL
 	}
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param smallestEnclosingBoundingBox
+	 */
 	public Polygon2D apply(final Polygon2D input) {
 		// ensure validity of inputs
 		if (input == null)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java
index 19a5cad19..40250b6b1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java
@@ -42,6 +42,4 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.solidity", label = "Geometric (2D): Solidity", priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "solidity")
 public class DefaultSolidityPolygon extends AbstractSolidity<Polygon2D> {}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java
index 035fc69ee..e4140e520 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java
@@ -46,14 +46,18 @@
  * @author Tim-Oliver Buchholz, University of Konstanz
  */
 @Plugin(type = Op.class, name = "geom.verticesCountConvexHull", label = "Geometric (2D): Convex Hull Vertices Count", priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "verticesCountConvexHull")
 public class DefaultVerticesCountConvexHullPolygon implements Computers.Arity1<Polygon2D, DoubleType> {
 
 	@OpDependency(name = "geom.convexHull")
 	private Function<Polygon2D, Polygon2D> convexHullFunc;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param verticesCountConvexHull
+	 */
 	public void compute(Polygon2D input, DoubleType output) {
 		output.set(convexHullFunc.apply(input).numVertices());
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java
index 83234aa3b..3bdd5df34 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java
@@ -43,11 +43,15 @@
  * @author Tim-Oliver Buchholz, University of Konstanz
  */
 @Plugin(type = Op.class, name = "geom.verticesCount", label = "Geometric (2D): Convex Hull Vertices Count", priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "verticesCount")
 public class DefaultVerticesCountPolygon implements Computers.Arity1<Polygon2D, DoubleType> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param verticesCount
+	 */
 	public void compute(Polygon2D input, DoubleType output) {
 		output.set(input.numVertices());
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java
index 7cd6be9c0..3f442a1c4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java
@@ -43,7 +43,5 @@
  */
 @Plugin(type = Op.class, name = "geom.boxivity",
 	label = "Geometric (3D): Boxivity", priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "boxivity")
 public class DefaultBoxivityMesh extends AbstractBoxivity<Mesh> {
 }
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java
index db66992cb..e304f4a10 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java
@@ -54,8 +54,6 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.compactness", label = "Geometric (3D): Compactness", priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "compactness")
 public class DefaultCompactness implements Computers.Arity1<Mesh, DoubleType> {
 
 	@OpDependency(name = "geom.boundarySize")
@@ -65,6 +63,12 @@ public class DefaultCompactness implements Computers.Arity1<Mesh, DoubleType> {
 	private Function<Mesh, DoubleType> volume;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param compactness
+	 */
 	public void compute(final Mesh input, final DoubleType output) {
 		final double s3 = Math.pow(surfaceArea.apply(input).get(), 3);
 		final double v2 = Math.pow(volume.apply(input).get(), 2);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java
index 7ca2e10d0..e7dbf2875 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java
@@ -62,8 +62,6 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.convexHull")
-@Parameter(key = "input")
-@Parameter(key = "convexHull")
 public class DefaultConvexHull3D implements Function<Mesh, Mesh>
 {
 
@@ -81,6 +79,12 @@ public class DefaultConvexHull3D implements Function<Mesh, Mesh>
 //	}
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param convexHull
+	 */
 	public Mesh apply(final Mesh input) {
 		Mesh output = new NaiveDoubleMesh();
 		Set<Vertex> vertices = new LinkedHashSet<>();
@@ -612,12 +616,16 @@ else if (v.getZ() < minZ) {
 }
 
 @Plugin(type = Op.class, name = "geom.convexHullEpsilon")
-@Parameter(key = "input")
-@Parameter(key = "epsilon")
 class DefaultConvexHull3DEpsilon implements Function<Mesh, Double>
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param epsilon
+	 */
 	public Double apply(final Mesh input) {
 		Set<Vertex> vertices = new LinkedHashSet<>();
 		for (final net.imagej.mesh.Vertex v : input.vertices()) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java
index 00046d460..55e5e64d6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java
@@ -42,6 +42,4 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.convexity", label = "Geometric (3D): Convexity", priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "convexity")
 public class DefaultConvexityMesh extends AbstractConvexity<Mesh> {}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java
index 603d45c26..c4acf6762 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java
@@ -53,14 +53,18 @@
  *            BooleanType
  */
 @Plugin(type = Op.class, name = "geom.secondMoment")
-@Parameter(key = "iterableRegion")
-@Parameter(key = "inertiaTensor")
 public class DefaultInertiaTensor3D<B extends BooleanType<B>> implements Function<IterableRegion<B>, RealMatrix> {
 
 	@OpDependency(name = "geom.centroid")
 	private Function<IterableRegion<B>, RealLocalizable> centroid;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableRegion
+	 * @param inertiaTensor
+	 */
 	public RealMatrix apply(final IterableRegion<B> input) {
 		// ensure validity of inputs
 		if (input.numDimensions() != 3)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java
index ed543fefd..2ef45fcd0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java
@@ -50,14 +50,18 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.secondMoment")
-@Parameter(key = "input")
-@Parameter(key = "inertiaTensor")
 public class DefaultInertiaTensor3DMesh implements Function<Mesh, RealMatrix> {
 
 	@OpDependency(name = "geom.centroid")
 	private Function<Mesh, RealLocalizable> centroid;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param inertiaTensor
+	 */
 	public RealMatrix apply(final Mesh input) {
 		// ensure validity of inputs
 		if (input == null)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java
index 574bf3417..90af474be 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java
@@ -53,14 +53,18 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.mainElongation", label = "Geometric (3D): Main Elongation", priority = Priority.VERY_HIGH)
-@Parameter(key = "inputMesh")
-@Parameter(key = "output")
 public class DefaultMainElongation implements Computers.Arity1<Mesh, DoubleType> {
 
 	@OpDependency(name = "geom.secondMoment")
 	private Function<Mesh, RealMatrix> inertiaTensor;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param inputMesh
+	 * @param output
+	 */
 	public void compute(final Mesh input, final DoubleType output) {
 		final RealMatrix it = inertiaTensor.apply(input);
 		final EigenDecomposition ed = new EigenDecomposition(it);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java
index 2d2b6e5c9..54a6b298e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java
@@ -61,10 +61,6 @@
  *            BooleanType
  */
 @Plugin(type = Op.class, name = "geom.marchingCubes")
-@Parameter(key = "input")
-@Parameter(key = "isolevel")
-@Parameter(key = "interpolatorClass")
-@Parameter(key = "output")
 public class DefaultMarchingCubes<T extends BooleanType<T>>
 		implements Functions.Arity3<RandomAccessibleInterval<T>, Double, VertexInterpolator, Mesh> {
 
@@ -76,6 +72,14 @@ public class DefaultMarchingCubes<T extends BooleanType<T>>
 
 	@SuppressWarnings({ "unchecked" })
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param isolevel
+	 * @param interpolatorClass
+	 * @return the output
+	 */
 	public Mesh apply(final RandomAccessibleInterval<T> input, Double isolevel, VertexInterpolator interpolatorClass) {
 
 		// ensure validity of inputs
@@ -557,8 +561,6 @@ private Cursor<T> getCube(final ExtendedRandomAccessibleInterval<T, RandomAccess
 }
 
 @Plugin(type = Op.class, name = "geom.marchingCubes")
-@Parameter(key = "input")
-@Parameter(key = "output")
 class SimpleMarchingCubes<T extends BooleanType<T>>
 		implements Function<RandomAccessibleInterval<T>, Mesh> {
 	
@@ -566,6 +568,12 @@ class SimpleMarchingCubes<T extends BooleanType<T>>
 	private Functions.Arity3<RandomAccessibleInterval<T>, Double, VertexInterpolator, Mesh> marchingOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @return the output
+	 */
 	public Mesh apply(RandomAccessibleInterval<T> t) {
 		return marchingOp.apply(t, null, null);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java
index 828ce0a9a..a9cc3e99b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java
@@ -54,14 +54,18 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.medianElongation", label = "Geometric (3D): Median Elongation", priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "medianElongation")
 public class DefaultMedianElongation implements Computers.Arity1<Mesh, DoubleType> {
 
 	@OpDependency(name = "geom.secondMoment")
 	private Function<Mesh, RealMatrix> inertiaTensor;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param medianElongation
+	 */
 	public void compute(final Mesh input, final DoubleType output) {
 		final RealMatrix it = inertiaTensor.apply(input);
 		final EigenDecomposition ed = new EigenDecomposition(it);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java
index 7a8c6ac4e..b5b86e601 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java
@@ -42,6 +42,4 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.solidity", label = "Geometric (3D): Solidity", priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "solidity")
 public class DefaultSolidityMesh extends AbstractSolidity<Mesh> {}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java
index f57b7c8d1..6af1fab97 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java
@@ -52,8 +52,6 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.spareness", label = "Geometric (3D): Spareness", priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "spareness")
 public class DefaultSparenessMesh implements Computers.Arity1<Mesh, DoubleType> {
 
 	@OpDependency(name = "geom.secondMoment")
@@ -63,6 +61,12 @@ public class DefaultSparenessMesh implements Computers.Arity1<Mesh, DoubleType>
 	private Function<Mesh, DoubleType> volume;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param spareness
+	 */
 	public void compute(final Mesh input, final DoubleType output) {
 
 		final RealMatrix it = inertiaTensor.apply(input);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java
index c1354cbcb..0ee6f52ae 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java
@@ -50,8 +50,6 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.sphericity", label = "Geometric (3D): Sphericity", priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "sphericity")
 public class DefaultSphericity implements Computers.Arity1<Mesh, DoubleType> {
 
 	@OpDependency(name = "geom.size")
@@ -60,6 +58,12 @@ public class DefaultSphericity implements Computers.Arity1<Mesh, DoubleType> {
 	private Function<Mesh, DoubleType> areaFunc;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param sphericity
+	 */
 	public void compute(final Mesh input, final DoubleType output) {
 		final double sphereArea = Math.pow(Math.PI, 1 / 3d) * Math.pow(6 * volumeFunc.apply(input).get(), 2 / 3d);
 		output.set(sphereArea / areaFunc.apply(input).get());
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java
index 1d500c58f..789217db3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java
@@ -47,11 +47,15 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.boundarySize", label = "Geometric (3D): Surface Area", priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "boundarySize")
 public class DefaultSurfaceArea implements Computers.Arity1<Mesh, DoubleType> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param boundarySize
+	 */
 	public void compute(final Mesh input, final DoubleType output) {
 		double total = 0;
 		for (final Triangle tri : input.triangles()) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java
index 355754bd8..0b544ac84 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java
@@ -42,6 +42,4 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.boundarySizeConvexHull", label = "Geometric (3D): Surface Area Convex Hull", priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "boundarySizeConvexHull")
 public class DefaultSurfaceAreaConvexHullMesh extends AbstractBoundarySizeConvexHull<Mesh> {}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java
index 718dde97d..ae8b991cf 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java
@@ -46,14 +46,18 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.verticesCountConvexHull", label = "Geometric (3D): Convex Hull Vertices Count", priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "verticesCountConvexHull")
 public class DefaultVerticesCountConvexHullMesh implements Computers.Arity1<Mesh, DoubleType> {
 
 	@OpDependency(name = "geom.convexHull")
 	private Function<Mesh, Mesh> convexHullFunc;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param verticesCountConvexHull
+	 */
 	public void compute(final Mesh input, final DoubleType output) {
 		output.set(convexHullFunc.apply(input).vertices().size());
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java
index a2548a674..fc0ab8edf 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java
@@ -45,11 +45,15 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.verticesCount", label = "Geometric3D: Surface Vertices Count", priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "verticesCountMesh")
 public class DefaultVerticesCountMesh implements Computers.Arity1<Mesh, DoubleType> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param verticesCountMesh
+	 */
 	public void compute(final Mesh input, final DoubleType output) {
 		output.set(input.vertices().size());
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java
index 5925f4c7f..65a5bd81f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java
@@ -42,6 +42,4 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.sizeConvexHull", label = "Geometric (3D): Convex Hull Volume", priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "volumeConvexHullMesh")
 public class DefaultVolumeConvexHullMesh extends AbstractSizeConvexHull<Mesh> {}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java
index 70e9b954c..1689fd57e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java
@@ -47,11 +47,15 @@
  * @author Tim-Oliver Buchholz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "geom.size", label = "Geometric3D: Volume", priority = Priority.VERY_HIGH - 1)
-@Parameter(key = "input")
-@Parameter(key = "volume")
 public class DefaultVolumeMesh implements Function<Mesh, DoubleType> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param volume
+	 */
 	public DoubleType apply(final Mesh input) {
 		double volume = 0;
 		for (final Triangle triangle : input.triangles()) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java
index 8f4ce35e7..0f1b0410b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java
@@ -63,11 +63,6 @@
  * @author Kyle Harrington (University of Idaho)
  */
 @Plugin(type = Op.class, name = "geom.voxelization")
-@Parameter(key = "input")
-@Parameter(key = "width", required = false)
-@Parameter(key = "height", required = false)
-@Parameter(key = "depth", required = false)
-@Parameter(key = "voxelizedImage")
 public class DefaultVoxelization3D
 		implements Functions.Arity4<Mesh, Integer, Integer, Integer, RandomAccessibleInterval<BitType>> {
 
@@ -84,6 +79,15 @@ public class DefaultVoxelization3D
 	private BiFunction<Dimensions, BitType, Img<BitType>> imgCreator;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param width
+	 * @param height
+	 * @param depth
+	 * @param voxelizedImage
+	 */
 	public RandomAccessibleInterval<BitType> apply(Mesh input, Integer width, Integer height, Integer depth) {
 		if (width == null)
 			width = 10;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java
index 9a8e0e7be..eb1daeb35 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java
@@ -46,11 +46,14 @@
  */
 @Plugin(type = Op.class, name = "help", priority = Priority.HIGH,
 	description = "Gets documentation for all Ops with the given name")
-@Parameter(key = "name")
-@Parameter(key = "opService")
-@Parameter(key = "opInfo")
 public class HelpForName extends AbstractHelp implements BiFunction<String, OpService, String> {
 
+	/**
+	 * TODO
+	 *
+	 * @param name
+	 * @param opService
+	 */
 	@Override
 	public String apply(String name, OpService ops) {
 		final Iterable<OpInfo> allOps = ops.env().infos(name);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java
index 1c6401559..6523d677e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java
@@ -41,11 +41,15 @@
  * @author Curtis Rueden
  */
 @Plugin(type = Op.class, name = "identity")
-@Parameter(key = "io")
 public class DefaultIdentity<A> implements Inplaces.Arity1<A>
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param io
+	 */
 	public void mutate(final A input) {
 		// NB: No implementation needed.
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java
index d5afe0064..32a74f012 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java
@@ -52,10 +52,6 @@
  * @author Curtis Rueden
  */
 @Plugin(type = Op.class, name = "image.ascii")
-@Parameter(key = "iterableInput")
-@Parameter(key = "min")
-@Parameter(key = "max")
-@Parameter(key = "ASCIIArt")
 public class DefaultASCII<T extends RealType<T>> implements Functions.Arity3<IterableInterval<T>, T, T, String>
 {
 
@@ -65,6 +61,14 @@ public class DefaultASCII<T extends RealType<T>> implements Functions.Arity3<Ite
 	private Function<IterableInterval<T>, Pair<T, T>> minMaxFunc;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param min
+	 * @param max
+	 * @param ASCIIArt
+	 */
 	public String apply(final IterableInterval<T> input, T min, T max) {
 		if (min == null || max == null) {
 			final Pair<T, T> minMax = minMaxFunc.apply(input);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java
index af0133b3d..c4b6886a3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java
@@ -22,11 +22,6 @@
  * @param <T> - the input {@link RealType}.
  */
 @Plugin(type = Op.class, name = "image.cooccurrenceMatrix")
-@Parameter(key = "iterableInput")
-@Parameter(key = "nrGreyLevels", min = "0", max = "128", stepSize = "1", initializer = "32")
-@Parameter(key = "distance", min = "0", max = "128", stepSize = "1", initializer = "1")
-@Parameter(key = "matrixOrientation")
-@Parameter(key = "cooccurrenceMatrix")
 public class CooccurrenceMatrix<T extends RealType<T>>
 		implements Functions.Arity4<RandomAccessibleInterval<T>, Integer, Integer, MatrixOrientation, double[][]> {
 
@@ -34,6 +29,15 @@ public class CooccurrenceMatrix<T extends RealType<T>>
 	private Function<RandomAccessibleInterval<T>, Pair<T, T>> minmax;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param nrGreyLevels
+	 * @param distance
+	 * @param matrixOrientation
+	 * @param cooccurrenceMatrix
+	 */
 	public double[][] apply(RandomAccessibleInterval<T> input, Integer nrGreyLevels, Integer distance,
 			MatrixOrientation orientation) {
 		if (input.numDimensions() == 3 && orientation.isCompatible(3)) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java
index 645db9d9e..e81e4defb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java
@@ -55,14 +55,18 @@
  *            - the {@link RealType} of the output image
  */
 @Plugin(type = Op.class, name = "image.distanceTransform")
-@Parameter(key = "binaryInput")
-@Parameter(key = "calibration")
-@Parameter(key = "executorService")
-@Parameter(key = "output")
 public class CalibratedDistanceTransformer<B extends BooleanType<B>, T extends RealType<T>>
 		implements Computers.Arity3<RandomAccessibleInterval<B>, double[], ExecutorService, RandomAccessibleInterval<T>> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param binaryInput
+	 * @param calibration
+	 * @param executorService
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<B> in, final double[] calibration, final ExecutorService es,
 			final RandomAccessibleInterval<T> out) {
 		// make sure that the output type is suitable to be able to hold the maximum
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java
index 078cf7361..b5dc5c614 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java
@@ -309,13 +309,17 @@ public Void call() throws Exception {
 }
 
 @Plugin(type = Op.class, name = "image.distanceTransform", priority = Priority.LAST)
-@Parameter(key = "binaryInput")
-@Parameter(key = "calibration")
-@Parameter(key = "executorService")
-@Parameter(key = "output")
 class DefaultDistanceTransformCalibrationOp <B extends BooleanType<B>, T extends RealType<T>>implements Computers.Arity3<RandomAccessibleInterval<B>, double[], ExecutorService, RandomAccessibleInterval<T>>{
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param binaryInput
+	 * @param calibration
+	 * @param executorService
+	 * @param output
+	 */
 	public void compute(RandomAccessibleInterval<B> in, double[] calibration, ExecutorService es,
 			RandomAccessibleInterval<T> out) {
 		DefaultDistanceTransformCalibration.compute(in, calibration, es, out);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java
index e47059294..12e9bae69 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java
@@ -53,13 +53,17 @@
  * @param <T> - the {@link RealType} of the output image
  */
 @Plugin(type = Op.class, name = "image.distanceTransform")
-@Parameter(key = "binaryInput")
-@Parameter(key = "executorService")
-@Parameter(key = "output")
 public class DistanceTransformer<B extends BooleanType<B>, T extends RealType<T>>
 		implements Computers.Arity2<RandomAccessibleInterval<B>, ExecutorService, RandomAccessibleInterval<T>> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param binaryInput
+	 * @param executorService
+	 * @param output
+	 */
 	public void compute(RandomAccessibleInterval<B> in, ExecutorService es, RandomAccessibleInterval<T> out) {
 		// make sure that the output type is suitable to be able to hold the maximum
 		// possible distance (replaces Conforms)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java
index 404140f14..da830a5d6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java
@@ -49,12 +49,16 @@
  * @author Brian Northan
  */
 @Plugin(type = Op.class, name = "image.equation")
-@Parameter(key = "op")
-@Parameter(key = "output")
 public class DefaultCoordinatesEquation<T extends RealType<T>, N extends Number>
 		implements Computers.Arity1<Function<long[], N>, IterableInterval<T>> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param op
+	 * @param output
+	 */
 	public void compute(final Function<long[], N> op, final IterableInterval<T> output) {
 
 		final Cursor<T> c = output.localizingCursor();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java
index 2cf453670..6a99f2cf3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java
@@ -64,14 +64,18 @@
  * @author Curtis Rueden
  */
 @Plugin(type = Op.class, name = "image.equation")
-@Parameter(key = "input")
-@Parameter(key = "scriptService")
-@Parameter(key = "output")
 public class DefaultEquation<T extends RealType<T>> implements
 	Computers.Arity2<String, ScriptService, IterableInterval<T>> 
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param scriptService
+	 * @param output
+	 */
 	public void compute(final String input, final ScriptService scriptService, final IterableInterval<T> output) {
 		final String equation = input + ";";
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java
index 5bb153a57..d511eaafd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java
@@ -46,14 +46,18 @@
  * @author Leon Yang
  */
 @Plugin(type = Op.class, name = "image.fill")
-@Parameter(key = "constant")
-@Parameter(key = "iterableOutput")
 public class DefaultFill<T extends Type<T>> implements
 	Computers.Arity1<T, Iterable<T>> 
 {
 
 	//TODO can we find a way to parallelize this (or use lift?)
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param constant
+	 * @param iterableOutput
+	 */
 	public void compute(final T constant, final Iterable<T> output) {
 		Iterator<T> iterator = output.iterator();
 		while(iterator.hasNext()) iterator.next().set(constant);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java
index ddc9e793a..5a26d8619 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java
@@ -47,13 +47,15 @@
  * @author Gabriel Selzer
  */
 @Plugin(type = Op.class, name = "image.fill", priority = Priority.HIGH)
-@Parameter(key = "constant")
-@Parameter(key = "iterableOutput")
 public class FillRAI<T extends Type<T>> implements
 	Computers.Arity1<T, RandomAccessibleInterval<T>> 
 {
 
 	//TODO can we find a way to parallelize this (or use lift?)
+	/**
+	 * @param constant
+	 * @param output
+	 */
 	@Override
 	public void compute(final T constant, final RandomAccessibleInterval<T> output) {
 		LoopBuilder.setImages(output).multiThreaded().forEachPixel(pixel -> pixel.set(constant));
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java
index e6fb82714..34a18a2a3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java
@@ -48,9 +48,6 @@
  * @author Christian Dietz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "image.histogram")
-@Parameter(key = "iterable")
-@Parameter(key = "numBins", required = false)
-@Parameter(key = "histogram")
 public class HistogramCreate<T extends RealType<T>> implements BiFunction<Iterable<T>, Integer, Histogram1d<T>> {
 
 	public static final int DEFAULT_NUM_BINS = 256;
@@ -59,6 +56,13 @@ public class HistogramCreate<T extends RealType<T>> implements BiFunction<Iterab
 	private Function<Iterable<T>, Pair<T, T>> minMaxFunc;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterable
+	 * @param numBins
+	 * @param histogram
+	 */
 	public Histogram1d<T> apply(final Iterable<T> input, Integer numBins) {
 		if (numBins == null)
 			numBins = DEFAULT_NUM_BINS;
@@ -76,14 +80,18 @@ public Histogram1d<T> apply(final Iterable<T> input, Integer numBins) {
 }
 
 @Plugin(type = Op.class, name = "image.histogram")
-@Parameter(key = "iterable")
-@Parameter(key = "histogram")
 class HistogramCreateSimple<T extends RealType<T>> implements Function<Iterable<T>, Histogram1d<T>> {
 
 	@OpDependency(name = "image.histogram")
 	private BiFunction<Iterable<T>, Integer, Histogram1d<T>> histogramOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterable
+	 * @param histogram
+	 */
 	public Histogram1d<T> apply(final Iterable<T> input) {
 		return histogramOp.apply(input, null);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java
index 595aed5f5..926e3cb56 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java
@@ -53,8 +53,6 @@
  * @author Stefan Helfrich (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "image.integral", priority = Priority.LOW + 1)
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultIntegralImg<I extends RealType<I>, O extends RealType<O>> extends AbstractIntegralImg<I, O> {
 
 	@Override
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java
index 0e6d743ed..a0e1c9e22 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java
@@ -54,8 +54,6 @@
  * @author Stefan Helfrich (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "image.squareIntegral", priority = Priority.LOW + 1)
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class SquareIntegralImg<I extends RealType<I>, O extends RealType<O>> extends AbstractIntegralImg<I, O>
 {
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java
index 8faa39643..89bb90134 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java
@@ -51,8 +51,6 @@
  * @author Stefan Helfrich (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "image.integral", priority = Priority.LOW)
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class WrappedIntegralImg<I extends RealType<I>>
 	implements Function<RandomAccessibleInterval<I>, RandomAccessibleInterval<DoubleType>>
 {
@@ -60,6 +58,12 @@ public class WrappedIntegralImg<I extends RealType<I>>
 	private IntegralImg<I, DoubleType> integralImg;
 
 	@Override
+		/**
+		 * TODO
+		 *
+		 * @param input
+		 * @return the output
+		 */
 	public RandomAccessibleInterval<DoubleType> apply(
 		final RandomAccessibleInterval<I> input)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertII.java
index c1db8be72..b5777815d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertII.java
@@ -50,10 +50,6 @@
 // * @author Gabe Selzer
 // */
 //@Plugin(type = Op.class, name = "image.invert") 
-//@Parameter(key = "input")
-//@Parameter(key = "min")
-//@Parameter(key = "max")
-//@Parameter(key = "invertedOutput")
 //public class InvertII<T extends RealType<T>> implements
 //	Computers.Arity3<IterableInterval<T>, T, T, IterableInterval<T>> 
 //{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertIIInteger.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertIIInteger.java
index 65fdaa8c7..40ad067f7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertIIInteger.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertIIInteger.java
@@ -52,10 +52,6 @@
 // * @author Gabe Selzer
 // */
 //@Plugin(type = Op.class, name = "image.invert", priority = Priority.HIGH)
-//@Parameter(key = "input")
-//@Parameter(key = "min")
-//@Parameter(key = "max")
-//@Parameter(key = "invertedOutput")
 //public class InvertIIInteger<T extends IntegerType<T>> implements
 //	Computers.Arity3<IterableInterval<T>, T, T, IterableInterval<T>> 
 //{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java
index 4717b0708..a684c4575 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java
@@ -58,12 +58,6 @@
  *            input.
  */
 @Plugin(type = Op.class, name = "image.normalize")
-@Parameter(key = "input")
-@Parameter(key = "sourceMin")
-@Parameter(key = "sourceMax")
-@Parameter(key = "targetMin")
-@Parameter(key = "targetMax")
-@Parameter(key = "output")
 public class NormalizeIIComputer<I extends RealType<I>, O extends RealType<O>>
 		implements Computers.Arity5<RandomAccessibleInterval<I>, I, I, O, O, RandomAccessibleInterval<O>> {
 
@@ -91,6 +85,16 @@ private double[] getBounds(final RandomAccessibleInterval<I> input, final I sour
 	}
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param sourceMin
+	 * @param sourceMax
+	 * @param targetMin
+	 * @param targetMax
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<I> input, final I sourceMin, final I sourceMax, final O targetMin,
 			final O targetMax, final RandomAccessibleInterval<O> output) {
 		normalizer = new NormalizeRealTypeComputer<>();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java
index ad3cf8745..5680dfed3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java
@@ -52,12 +52,6 @@
  * @param <T>
  */
 @Plugin(type = Op.class, name = "image.normalize")
-@Parameter(key = "input")
-@Parameter(key = "sourceMin")
-@Parameter(key = "sourceMax")
-@Parameter(key = "targetMin")
-@Parameter(key = "targetMax")
-@Parameter(key = "output")
 public class NormalizeIIFunction<I extends RealType<I>, O extends RealType<O>>
 	implements
 	Functions.Arity5<RandomAccessibleInterval<I>, I, I, O, O, RandomAccessibleInterval<O>>
@@ -70,6 +64,16 @@ public class NormalizeIIFunction<I extends RealType<I>, O extends RealType<O>>
 	private Computers.Arity5<RandomAccessibleInterval<I>, I, I, O, O, RandomAccessibleInterval<O>> normalizer;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param sourceMin
+	 * @param sourceMax
+	 * @param targetMin
+	 * @param targetMax
+	 * @return the output
+	 */
 	public RandomAccessibleInterval<O> apply(
 		final RandomAccessibleInterval<I> input, final I sourceMin,
 		final I sourceMax, final O targetMin, final O targetMax)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java
index 235686836..105ebb564 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java
@@ -55,8 +55,6 @@
  * @param <O> - the type of the output image
  */
 @Plugin(type = Op.class, name = "image.normalize")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class NormalizeIILazy<I extends RealType<I>, O extends RealType<O>>
 		implements Computers.Arity1<RandomAccessibleInterval<I>, RandomAccessibleInterval<O>> {
 
@@ -67,6 +65,12 @@ public class NormalizeIILazy<I extends RealType<I>, O extends RealType<O>>
 	private Computers.Arity5<RandomAccessibleInterval<I>, I, I, O, O, RandomAccessibleInterval<O>> normalizerFunc;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void compute(RandomAccessibleInterval<I> img, RandomAccessibleInterval<O> output) {
 		Pair<I, I> sourceMinMax = minMaxFunc.apply(img);
 		O min = Util.getTypeFromInterval(output).createVariable();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java
index 15b375dca..6e9d7b4cf 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java
@@ -53,8 +53,6 @@
  * @param <O> - the type of the output image
  */
 @Plugin(type = Op.class, name = "image.normalize")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class NormalizeIILazyFunction<I extends RealType<I>>
 		implements Function<RandomAccessibleInterval<I>, RandomAccessibleInterval<I>> {
 
@@ -65,6 +63,12 @@ public class NormalizeIILazyFunction<I extends RealType<I>>
 	private Computers.Arity1<RandomAccessibleInterval<I>, RandomAccessibleInterval<I>> normalizer;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @return the output
+	 */
 	public RandomAccessibleInterval<I> apply(RandomAccessibleInterval<I> img) {
 		RandomAccessibleInterval<I> output = createFunc.apply(img);
 		normalizer.compute(img, output);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java
index e13d0525b..dea651b68 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java
@@ -93,11 +93,6 @@
  * @author Simon Schmid (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "image.watershed")
-@Parameter(key = "input")
-@Parameter(key = "useEightConnectivity")
-@Parameter(key = "drawWatersheds")
-@Parameter(key = "mask")
-@Parameter(key = "outputLabeling")
 public class Watershed<T extends RealType<T>, B extends BooleanType<B>> implements
 		Computers.Arity4<RandomAccessibleInterval<T>, Boolean, Boolean, RandomAccessibleInterval<B>, ImgLabeling<Integer, IntType>> {
 
@@ -117,6 +112,15 @@ public class Watershed<T extends RealType<T>, B extends BooleanType<B>> implemen
 	private static final int MASK = -3;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param useEightConnectivity
+	 * @param drawWatersheds
+	 * @param mask
+	 * @param outputLabeling
+	 */
 	public void compute(final RandomAccessibleInterval<T> in, final Boolean useEightConnectivity,
 			final Boolean drawWatersheds, final RandomAccessibleInterval<B> mask,
 			final ImgLabeling<Integer, IntType> out) {
@@ -385,10 +389,6 @@ public void compute(final RandomAccessibleInterval<T> in, final Boolean useEight
 }
 
 @Plugin(type = Op.class, name = "image.watershed")
-@Parameter(key = "input")
-@Parameter(key = "useEightConnectivity")
-@Parameter(key = "drawWatersheds")
-@Parameter(key = "outputLabeling")
 class WatershedMaskless<T extends RealType<T>, B extends BooleanType<B>> implements
 		Computers.Arity3<RandomAccessibleInterval<T>, Boolean, Boolean, ImgLabeling<Integer, IntType>> {
 	
@@ -396,6 +396,14 @@ class WatershedMaskless<T extends RealType<T>, B extends BooleanType<B>> impleme
 	private Computers.Arity4<RandomAccessibleInterval<T>, Boolean, Boolean, RandomAccessibleInterval<B>, ImgLabeling<Integer, IntType>> watershedOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param useEightConnectivity
+	 * @param drawWatersheds
+	 * @param outputLabeling
+	 */
 	public void compute(RandomAccessibleInterval<T> in, Boolean useEightConnectivity, Boolean drawWatersheds,
 			ImgLabeling<Integer, IntType> outputLabeling) {
 		watershedOp.compute(in, useEightConnectivity, drawWatersheds, null, outputLabeling);
@@ -404,11 +412,6 @@ public void compute(RandomAccessibleInterval<T> in, Boolean useEightConnectivity
 }
 
 @Plugin(type = Op.class, name = "image.watershed")
-@Parameter(key = "input")
-@Parameter(key = "useEightConnectivity")
-@Parameter(key = "drawWatersheds")
-@Parameter(key = "mask")
-@Parameter(key = "outputLabeling")
 class WatershedFunction<T extends RealType<T>, B extends BooleanType<B>>
 		implements Functions.Arity4<RandomAccessibleInterval<T>, Boolean, Boolean, RandomAccessibleInterval<B>, ImgLabeling<Integer, IntType>> {
 
@@ -418,6 +421,15 @@ class WatershedFunction<T extends RealType<T>, B extends BooleanType<B>>
 	private BiFunction<Dimensions, IntType, ImgLabeling<Integer, IntType>> labelingCreator;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param useEightConnectivity
+	 * @param drawWatersheds
+	 * @param mask
+	 * @return the outputLabeling
+	 */
 	public ImgLabeling<Integer, IntType> apply(RandomAccessibleInterval<T> in, Boolean useEightConnectivity,
 			Boolean drawWatersheds, RandomAccessibleInterval<B> mask) {
 		ImgLabeling<Integer, IntType> outputLabeling = labelingCreator.apply(in, new IntType());
@@ -427,10 +439,6 @@ public ImgLabeling<Integer, IntType> apply(RandomAccessibleInterval<T> in, Boole
 }
 
 @Plugin(type = Op.class, name = "image.watershed")
-@Parameter(key = "input")
-@Parameter(key = "useEightConnectivity")
-@Parameter(key = "drawWatersheds")
-@Parameter(key = "outputLabeling")
 class WatershedFunctionMaskless<T extends RealType<T>, B extends BooleanType<B>>
 		implements Functions.Arity3<RandomAccessibleInterval<T>, Boolean, Boolean, ImgLabeling<Integer, IntType>> {
 
@@ -440,6 +448,14 @@ class WatershedFunctionMaskless<T extends RealType<T>, B extends BooleanType<B>>
 	private BiFunction<Dimensions, IntType, ImgLabeling<Integer, IntType>> labelingCreator;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param useEightConnectivity
+	 * @param drawWatersheds
+	 * @return the outputLabeling
+	 */
 	public ImgLabeling<Integer, IntType> apply(RandomAccessibleInterval<T> in, Boolean useEightConnectivity,
 			Boolean drawWatersheds) {
 		ImgLabeling<Integer, IntType> outputLabeling = labelingCreator.apply(in, new IntType());
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java
index 5ad31ca7e..481bde7c9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java
@@ -84,13 +84,6 @@
  * @author Simon Schmid (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "image.watershed")
-@Parameter(key = "input")
-@Parameter(key = "useEightConnectivity")
-@Parameter(key = "drawWatersheds")
-@Parameter(key = "sigma")
-@Parameter(key = "mask")
-@Parameter(key = "executorService")
-@Parameter(key = "outputLabeling")
 public class WatershedBinary<T extends BooleanType<T>, B extends BooleanType<B>> implements
 		Computers.Arity6<RandomAccessibleInterval<T>, Boolean, Boolean, double[], RandomAccessibleInterval<B>, ExecutorService, ImgLabeling<Integer, IntType>> {
 
@@ -109,6 +102,17 @@ public class WatershedBinary<T extends BooleanType<T>, B extends BooleanType<B>>
 	private Computers.Arity4<RandomAccessibleInterval<FloatType>, Boolean, Boolean, RandomAccessibleInterval<B>, ImgLabeling<Integer, IntType>> watershedOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param useEightConnectivity
+	 * @param drawWatersheds
+	 * @param sigma
+	 * @param mask
+	 * @param executorService
+	 * @param outputLabeling
+	 */
 	public void compute(final RandomAccessibleInterval<T> in, final Boolean useEightConnectivity,
 			final Boolean drawWatersheds, final double[] sigma, final RandomAccessibleInterval<B> mask,
 			final ExecutorService es, final ImgLabeling<Integer, IntType> out) {
@@ -141,12 +145,6 @@ public void compute(final RandomAccessibleInterval<T> in, final Boolean useEight
 }
 
 @Plugin(type = Op.class, name = "image.watershed")
-@Parameter(key = "input")
-@Parameter(key = "useEightConnectivity")
-@Parameter(key = "drawWatersheds")
-@Parameter(key = "sigma")
-@Parameter(key = "executorService")
-@Parameter(key = "outputLabeling")
 class WatershedBinaryMaskless<T extends BooleanType<T>, B extends BooleanType<B>> implements
 		Computers.Arity5<RandomAccessibleInterval<T>, Boolean, Boolean, double[], ExecutorService, ImgLabeling<Integer, IntType>> {
 
@@ -154,6 +152,16 @@ class WatershedBinaryMaskless<T extends BooleanType<T>, B extends BooleanType<B>
 	private Computers.Arity6<RandomAccessibleInterval<T>, Boolean, Boolean, double[], RandomAccessibleInterval<B>, ExecutorService, ImgLabeling<Integer, IntType>> watershedOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param useEightConnectivity
+	 * @param drawWatersheds
+	 * @param sigma
+	 * @param executorService
+	 * @param outputLabeling
+	 */
 	public void compute(RandomAccessibleInterval<T> in, Boolean useEightConnectivity, Boolean drawWatersheds,
 			double[] sigma, ExecutorService es, ImgLabeling<Integer, IntType> outputLabeling) {
 		watershedOp.compute(in, useEightConnectivity, drawWatersheds, sigma, null, es, outputLabeling);
@@ -162,13 +170,6 @@ public void compute(RandomAccessibleInterval<T> in, Boolean useEightConnectivity
 }
 
 @Plugin(type = Op.class, name = "image.watershed")
-@Parameter(key = "input")
-@Parameter(key = "useEightConnectivity")
-@Parameter(key = "drawWatersheds")
-@Parameter(key = "sigma")
-@Parameter(key = "mask")
-@Parameter(key = "executorService")
-@Parameter(key = "outputLabeling")
 class WatershedBinaryFunction<T extends BooleanType<T>, B extends BooleanType<B>> implements
 		Functions.Arity6<RandomAccessibleInterval<T>, Boolean, Boolean, double[], RandomAccessibleInterval<B>, ExecutorService, ImgLabeling<Integer, IntType>> {
 
@@ -178,6 +179,17 @@ class WatershedBinaryFunction<T extends BooleanType<T>, B extends BooleanType<B>
 	private BiFunction<Dimensions, IntType, ImgLabeling<Integer, IntType>> labelingCreator;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param useEightConnectivity
+	 * @param drawWatersheds
+	 * @param sigma
+	 * @param mask
+	 * @param executorService
+	 * @return the outputLabeling
+	 */
 	public ImgLabeling<Integer, IntType> apply(RandomAccessibleInterval<T> in, Boolean useEightConnectivity,
 			Boolean drawWatersheds, double[] sigma, RandomAccessibleInterval<B> mask, ExecutorService es) {
 		ImgLabeling<Integer, IntType> outputLabeling = labelingCreator.apply(in, new IntType());
@@ -187,12 +199,6 @@ public ImgLabeling<Integer, IntType> apply(RandomAccessibleInterval<T> in, Boole
 }
 
 @Plugin(type = Op.class, name = "image.watershed")
-@Parameter(key = "input")
-@Parameter(key = "useEightConnectivity")
-@Parameter(key = "drawWatersheds")
-@Parameter(key = "sigma")
-@Parameter(key = "executorService")
-@Parameter(key = "outputLabeling")
 class WatershedBinaryFunctionMaskless<T extends BooleanType<T>, B extends BooleanType<B>>
 		implements Functions.Arity5<RandomAccessibleInterval<T>, Boolean, Boolean, double[], ExecutorService, ImgLabeling<Integer, IntType>> {
 
@@ -202,6 +208,16 @@ class WatershedBinaryFunctionMaskless<T extends BooleanType<T>, B extends Boolea
 	private BiFunction<Dimensions, IntType, ImgLabeling<Integer, IntType>> labelingCreator;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param useEightConnectivity
+	 * @param drawWatersheds
+	 * @param sigma
+	 * @param executorService
+	 * @return the outputLabeling
+	 */
 	public ImgLabeling<Integer, IntType> apply(RandomAccessibleInterval<T> in, Boolean useEightConnectivity,
 			Boolean drawWatersheds, double[] sigma, ExecutorService es) {
 		ImgLabeling<Integer, IntType> outputLabeling = labelingCreator.apply(in, new IntType());
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java
index 2065efeab..d41a60baa 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java
@@ -84,13 +84,6 @@
  * @author Simon Schmid (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "image.watershed")
-@Parameter(key = "input")
-@Parameter(key = "useEightConnectivity")
-@Parameter(key = "drawWatersheds")
-@Parameter(key = "sigma")
-@Parameter(key = "mask")
-@Parameter(key = "executorService")
-@Parameter(key = "outputLabeling")
 public class WatershedBinarySingleSigma<T extends BooleanType<T>, B extends BooleanType<B>> implements
 		Computers.Arity6<RandomAccessibleInterval<T>, Boolean, Boolean, Double, RandomAccessibleInterval<B>, ExecutorService, ImgLabeling<Integer, IntType>> {
 
@@ -108,6 +101,17 @@ public class WatershedBinarySingleSigma<T extends BooleanType<T>, B extends Bool
 	private Computers.Arity4<RandomAccessibleInterval<FloatType>, Boolean, Boolean, RandomAccessibleInterval<B>, ImgLabeling<Integer, IntType>> watershedOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param useEightConnectivity
+	 * @param drawWatersheds
+	 * @param sigma
+	 * @param mask
+	 * @param executorService
+	 * @param outputLabeling
+	 */
 	public void compute(final RandomAccessibleInterval<T> in, final Boolean useEightConnectivity,
 			final Boolean drawWatersheds, final Double sigma, final RandomAccessibleInterval<B> mask,
 			final ExecutorService es, final ImgLabeling<Integer, IntType> out) {
@@ -136,12 +140,6 @@ public void compute(final RandomAccessibleInterval<T> in, final Boolean useEight
 }
 
 @Plugin(type = Op.class, name = "image.watershed")
-@Parameter(key = "input")
-@Parameter(key = "useEightConnectivity")
-@Parameter(key = "drawWatersheds")
-@Parameter(key = "sigma")
-@Parameter(key = "executorService")
-@Parameter(key = "outputLabeling")
 class WatershedBinarySingleSigmaMaskless<T extends RealType<T>, B extends BooleanType<B>> implements
 		Computers.Arity5<RandomAccessibleInterval<T>, Boolean, Boolean, Double, ExecutorService, ImgLabeling<Integer, IntType>> {
 
@@ -149,6 +147,16 @@ class WatershedBinarySingleSigmaMaskless<T extends RealType<T>, B extends Boolea
 	private Computers.Arity6<RandomAccessibleInterval<T>, Boolean, Boolean, Double, RandomAccessibleInterval<B>, ExecutorService, ImgLabeling<Integer, IntType>> watershedOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param useEightConnectivity
+	 * @param drawWatersheds
+	 * @param sigma
+	 * @param executorService
+	 * @param outputLabeling
+	 */
 	public void compute(RandomAccessibleInterval<T> in, Boolean useEightConnectivity, Boolean drawWatersheds,
 			Double sigma, ExecutorService es, ImgLabeling<Integer, IntType> outputLabeling) {
 		watershedOp.compute(in, useEightConnectivity, drawWatersheds, sigma, null, es, outputLabeling);
@@ -157,13 +165,6 @@ public void compute(RandomAccessibleInterval<T> in, Boolean useEightConnectivity
 }
 
 @Plugin(type = Op.class, name = "image.watershed")
-@Parameter(key = "input")
-@Parameter(key = "useEightConnectivity")
-@Parameter(key = "drawWatersheds")
-@Parameter(key = "sigma")
-@Parameter(key = "mask")
-@Parameter(key = "executorService")
-@Parameter(key = "outputLabeling")
 class WatershedBinarySingleSigmaFunction<T extends RealType<T>, B extends BooleanType<B>> implements
 		Functions.Arity6<RandomAccessibleInterval<T>, Boolean, Boolean, Double, RandomAccessibleInterval<B>, ExecutorService, ImgLabeling<Integer, IntType>> {
 
@@ -173,6 +174,17 @@ class WatershedBinarySingleSigmaFunction<T extends RealType<T>, B extends Boolea
 	private BiFunction<Dimensions, IntType, ImgLabeling<Integer, IntType>> labelingCreator;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param useEightConnectivity
+	 * @param drawWatersheds
+	 * @param sigma
+	 * @param mask
+	 * @param executorService
+	 * @return the outputLabeling
+	 */
 	public ImgLabeling<Integer, IntType> apply(RandomAccessibleInterval<T> in, Boolean useEightConnectivity, Boolean drawWatersheds,
 			Double sigma, RandomAccessibleInterval<B> mask, ExecutorService es) {
 		ImgLabeling<Integer, IntType> outputLabeling = labelingCreator.apply(in, new IntType());
@@ -182,12 +194,6 @@ public ImgLabeling<Integer, IntType> apply(RandomAccessibleInterval<T> in, Boole
 }
 
 @Plugin(type = Op.class, name = "image.watershed")
-@Parameter(key = "input")
-@Parameter(key = "useEightConnectivity")
-@Parameter(key = "drawWatersheds")
-@Parameter(key = "sigma")
-@Parameter(key = "executorService")
-@Parameter(key = "outputLabeling")
 class WatershedBinarySigngleSigmaFunctionMaskless<T extends RealType<T>, B extends BooleanType<B>> implements
 		Functions.Arity5<RandomAccessibleInterval<T>, Boolean, Boolean, Double, ExecutorService, ImgLabeling<Integer, IntType>> {
 
@@ -197,6 +203,16 @@ class WatershedBinarySigngleSigmaFunctionMaskless<T extends RealType<T>, B exten
 	private BiFunction<Dimensions, IntType, ImgLabeling<Integer, IntType>> labelingCreator;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param useEightConnectivity
+	 * @param drawWatersheds
+	 * @param sigma
+	 * @param executorService
+	 * @return the outputLabeling
+	 */
 	public ImgLabeling<Integer, IntType> apply(RandomAccessibleInterval<T> in, Boolean useEightConnectivity,
 			Boolean drawWatersheds, Double sigma, ExecutorService es) {
 		ImgLabeling<Integer, IntType> outputLabeling = labelingCreator.apply(in, new IntType());
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java
index fbf69a912..9b666aa18 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java
@@ -102,12 +102,6 @@
  * @author Simon Schmid (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "image.watershed")
-@Parameter(key = "input")
-@Parameter(key = "seeds")
-@Parameter(key = "useEightConnectivity")
-@Parameter(key = "drawWatersheds")
-@Parameter(key = "mask")
-@Parameter(key = "output")
 public class WatershedSeeded<T extends RealType<T>, B extends BooleanType<B>> implements
 		Computers.Arity5<RandomAccessibleInterval<T>, ImgLabeling<Integer, IntType>, Boolean, Boolean, RandomAccessibleInterval<B>, ImgLabeling<Integer, IntType>> {
 
@@ -134,6 +128,16 @@ public class WatershedSeeded<T extends RealType<T>, B extends BooleanType<B>> im
 
 	@SuppressWarnings("unchecked")
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param seeds
+	 * @param useEightConnectivity
+	 * @param drawWatersheds
+	 * @param mask
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<T> in, final ImgLabeling<Integer, IntType> seeds,
 			final Boolean useEightConnectivity, final Boolean drawWatersheds,
 			final RandomAccessibleInterval<B> maskInput, final ImgLabeling<Integer, IntType> out) {
@@ -389,11 +393,6 @@ public int compareTo(WatershedVoxel o) {
 // Convenience Ops
 
 @Plugin(type = Op.class, name = "image.watershed")
-@Parameter(key = "input")
-@Parameter(key = "seeds")
-@Parameter(key = "useEightConnectivity")
-@Parameter(key = "drawWatersheds")
-@Parameter(key = "outputLabeling")
 class WatershedSeededMaskless<T extends RealType<T>, B extends BooleanType<B>> implements
 		Computers.Arity4<RandomAccessibleInterval<T>, ImgLabeling<Integer, IntType>, Boolean, Boolean, ImgLabeling<Integer, IntType>> {
 
@@ -401,6 +400,15 @@ class WatershedSeededMaskless<T extends RealType<T>, B extends BooleanType<B>> i
 	private Computers.Arity5<RandomAccessibleInterval<T>, ImgLabeling<Integer, IntType>, Boolean, Boolean, RandomAccessibleInterval<B>, ImgLabeling<Integer, IntType>> watershedOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param seeds
+	 * @param useEightConnectivity
+	 * @param drawWatersheds
+	 * @param outputLabeling
+	 */
 	public void compute(RandomAccessibleInterval<T> in, ImgLabeling<Integer, IntType> seeds,
 			Boolean useEightConnectivity, Boolean drawWatersheds,
 			ImgLabeling<Integer, IntType> outputLabeling) {
@@ -410,11 +418,6 @@ public void compute(RandomAccessibleInterval<T> in, ImgLabeling<Integer, IntType
 }
 
 @Plugin(type = Op.class, name = "image.watershed")
-@Parameter(key = "input")
-@Parameter(key = "seeds")
-@Parameter(key = "useEightConnectivity")
-@Parameter(key = "drawWatersheds")
-@Parameter(key = "outputLabeling")
 class WatershedSeededMasklessFunction<T extends RealType<T>, B extends BooleanType<B>> implements
 		Functions.Arity4<RandomAccessibleInterval<T>, ImgLabeling<Integer, IntType>, Boolean, Boolean, ImgLabeling<Integer, IntType>> {
 
@@ -424,6 +427,15 @@ class WatershedSeededMasklessFunction<T extends RealType<T>, B extends BooleanTy
 	private BiFunction<Dimensions, IntType, ImgLabeling<Integer, IntType>> labelingCreator;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param seeds
+	 * @param useEightConnectivity
+	 * @param drawWatersheds
+	 * @return the outputLabeling
+	 */
 	public ImgLabeling<Integer, IntType> apply(RandomAccessibleInterval<T> in, ImgLabeling<Integer, IntType> seeds,
 			Boolean useEightConnectivity, Boolean drawWatersheds) {
 		ImgLabeling<Integer, IntType> outputLabeling = labelingCreator.apply(in, new IntType());
@@ -433,12 +445,6 @@ public ImgLabeling<Integer, IntType> apply(RandomAccessibleInterval<T> in, ImgLa
 }
 
 @Plugin(type = Op.class, name = "image.watershed")
-@Parameter(key = "input")
-@Parameter(key = "seeds")
-@Parameter(key = "useEightConnectivity")
-@Parameter(key = "drawWatersheds")
-@Parameter(key = "mask")
-@Parameter(key = "outputLabeling")
 class WatershedSeededFunction<T extends RealType<T>, B extends BooleanType<B>> implements
 		Functions.Arity5<RandomAccessibleInterval<T>, ImgLabeling<Integer, IntType>, Boolean, Boolean, RandomAccessibleInterval<B>, ImgLabeling<Integer, IntType>> {
 
@@ -448,6 +454,16 @@ class WatershedSeededFunction<T extends RealType<T>, B extends BooleanType<B>> i
 	private BiFunction<Dimensions, IntType, ImgLabeling<Integer, IntType>> labelingCreator;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param seeds
+	 * @param useEightConnectivity
+	 * @param drawWatersheds
+	 * @param mask
+	 * @return the outputLabeling
+	 */
 	public ImgLabeling<Integer, IntType> apply(RandomAccessibleInterval<T> in, ImgLabeling<Integer, IntType> seeds,
 			Boolean useEightConnectivity, Boolean drawWatersheds, RandomAccessibleInterval<B> mask) {
 		ImgLabeling<Integer, IntType> outputLabeling = labelingCreator.apply(in, new IntType());
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java
index 3d7fda12c..835841211 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java
@@ -49,8 +49,6 @@
  * @param <O> output type
  */
 @Plugin(type = Op.class, name = "imageMoments.centralMoment00", label = "Image Moment: CentralMoment00")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultCentralMoment00<I extends RealType<I>, O extends RealType<O>>
 	implements AbstractImageMomentOp<I, O> 
 {
@@ -59,6 +57,12 @@ public class DefaultCentralMoment00<I extends RealType<I>, O extends RealType<O>
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> moment00Cmp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void computeMoment(final RandomAccessibleInterval<I> input, final O output) {
 		moment00Cmp.compute(input, output);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment01.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment01.java
index 7ab6a8c17..72745689f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment01.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment01.java
@@ -49,8 +49,6 @@
  */
 @Plugin(type = Op.class, name = "imageMoments.centralMoment01", label = "Image Moment: CentralMoment01",
 	priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultCentralMoment01<I extends RealType<I>, O extends RealType<O>>
 	implements AbstractImageMomentOp<I, O> 
 {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java
index 7335878d0..07baa4782 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java
@@ -56,8 +56,6 @@
  *            output type
  */
 @Plugin(type = Op.class, name = "imageMoments.centralMoment02", label = "Image Moment: CentralMoment02")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultCentralMoment02<I extends RealType<I>, O extends RealType<O>>
 		implements AbstractImageMomentOp<I, O> {
 
@@ -70,6 +68,12 @@ public class DefaultCentralMoment02<I extends RealType<I>, O extends RealType<O>
 	private Computers.Arity2<O, Integer, O> powerOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void computeMoment(final RandomAccessibleInterval<I> input, final O output) {
 		final O moment00 = output.createVariable();
 		moment00Func.compute(input, moment00);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java
index f7ea540ad..ada529cc7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java
@@ -56,8 +56,6 @@
  *            output type
  */
 @Plugin(type = Op.class, name = "imageMoments.centralMoment03", label = "Image Moment: CentralMoment03")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultCentralMoment03<I extends RealType<I>, O extends RealType<O>>
 		implements AbstractImageMomentOp<I, O> {
 
@@ -69,6 +67,12 @@ public class DefaultCentralMoment03<I extends RealType<I>, O extends RealType<O>
 	private Computers.Arity2<O, Integer, O> powerOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void computeMoment(final RandomAccessibleInterval<I> input,
 		final O output)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment10.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment10.java
index d9e7af3bb..7de3106ee 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment10.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment10.java
@@ -49,8 +49,6 @@
  */
 @Plugin(type = Op.class, name = "imageMoments.centralMoment10", label = "Image Moment: CentralMoment10",
 	priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultCentralMoment10<I extends RealType<I>, O extends RealType<O>>
 	implements AbstractImageMomentOp<I, O> 
 {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java
index 71377692b..958df6fa6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java
@@ -52,8 +52,6 @@
  *            output type
  */
 @Plugin(type = Op.class, name = "imageMoments.centralMoment11", label = "Image Moment: CentralMoment11")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultCentralMoment11<I extends RealType<I>, O extends RealType<O>>
 		implements AbstractImageMomentOp<I, O> {
 
@@ -70,6 +68,12 @@ public class DefaultCentralMoment11<I extends RealType<I>, O extends RealType<O>
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> moment11Func;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void computeMoment(final RandomAccessibleInterval<I> input, final O output) {
 		final O moment00 = output.createVariable();
 		moment00Func.compute(input, moment00);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java
index 3f0975949..0157917a4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java
@@ -56,8 +56,6 @@
  *            output type
  */
 @Plugin(type = Op.class, name = "imageMoments.centralMoment12", label = "Image Moment: CentralMoment12")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultCentralMoment12<I extends RealType<I>, O extends RealType<O>>
 		implements AbstractImageMomentOp<I, O> {
 
@@ -71,6 +69,12 @@ public class DefaultCentralMoment12<I extends RealType<I>, O extends RealType<O>
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> moment10Func;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void computeMoment(final RandomAccessibleInterval<I> input,
 		final O output)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java
index 065f41696..1fafe4117 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java
@@ -55,8 +55,6 @@
  *            output type
  */
 @Plugin(type = Op.class, name = "imageMoments.centralMoment20", label = "Image Moment: CentralMoment20")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultCentralMoment20<I extends RealType<I>, O extends RealType<O>>
 		implements AbstractImageMomentOp<I, O> {
 
@@ -67,6 +65,12 @@ public class DefaultCentralMoment20<I extends RealType<I>, O extends RealType<O>
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> moment10Func;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void computeMoment(final RandomAccessibleInterval<I> input,
 		final O output)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java
index 05e0f6a8d..3fb4126b8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java
@@ -56,8 +56,6 @@
  *            output type
  */
 @Plugin(type = Op.class, name = "imageMoments.centralMoment21", label = "Image Moment: CentralMoment21")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultCentralMoment21<I extends RealType<I>, O extends RealType<O>>
 		implements AbstractImageMomentOp<I, O> {
 
@@ -71,6 +69,12 @@ public class DefaultCentralMoment21<I extends RealType<I>, O extends RealType<O>
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> moment10Func;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void computeMoment(final RandomAccessibleInterval<I> input, final O output) {
 		final O moment00 = output.createVariable();
 		moment00Func.compute(input, moment00);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java
index 0bc18ef3e..978f81216 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java
@@ -56,8 +56,6 @@
  *            output type
  */
 @Plugin(type = Op.class, name = "imageMoments.centralMoment30", label = "Image Moment: CentralMoment30")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultCentralMoment30<I extends RealType<I>, O extends RealType<O>>
 		implements AbstractImageMomentOp<I, O> {
 
@@ -71,6 +69,12 @@ public class DefaultCentralMoment30<I extends RealType<I>, O extends RealType<O>
 	private Computers.Arity2<O, Integer, O> powerOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void computeMoment(final RandomAccessibleInterval<I> input,
 		final O output)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java
index 129642c87..694f1cc4e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java
@@ -51,12 +51,16 @@
  *            output type
  */
 @Plugin(type = Op.class, name = "imageMoments.centralMoment00", label = "Image Moment: CentralMoment00", priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class IterableCentralMoment00<I extends RealType<I>, O extends RealType<O>>
 		implements Computers.Arity1<IterableInterval<I>, O> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void compute(final IterableInterval<I> input, final O output) {
 		if (input.numDimensions() != 2)
 			throw new IllegalArgumentException("Only two-dimensional inputs allowed!");
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java
index 5d885cd63..feee188b1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java
@@ -51,12 +51,16 @@
  *            output type
  */
 @Plugin(type = Op.class, name = "imageMoments.centralMoment11", label = "Image Moment: CentralMoment11", priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class IterableCentralMoment11<I extends RealType<I>, O extends RealType<O>>
 		implements Computers.Arity1<IterableInterval<I>, O> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void compute(final IterableInterval<I> input, final O output) {
 		if (input.numDimensions() != 2) throw new IllegalArgumentException(
 			"Only two-dimensional inputs allowed!");
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java
index 436c32d23..ed6c6d5b2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java
@@ -50,8 +50,6 @@
  * @see <a href="https://en.wikipedia.org/wiki/Image_moment#Rotation_invariants"> This page </a>
  */
 @Plugin(type = Op.class, name = "imageMoments.huMoment1", label = "Image Moment: HuMoment1")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultHuMoment1<I extends RealType<I>, O extends RealType<O>>
 	implements AbstractImageMomentOp<I, O> 
 {
@@ -63,6 +61,12 @@ public class DefaultHuMoment1<I extends RealType<I>, O extends RealType<O>>
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> normalizedCentralMoment02Func;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void computeMoment(final RandomAccessibleInterval<I> input, final O output) {
 		final O n20 = output.createVariable();
 		normalizedCentralMoment20Func.compute(input, n20);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java
index cf349a08b..2a4743cfc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java
@@ -53,8 +53,6 @@
  * @see <a href="https://en.wikipedia.org/wiki/Image_moment#Rotation_invariants"> This page </a>
  */
 @Plugin(type = Op.class, name = "imageMoments.huMoment2", label = "Image Moment: HuMoment2")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultHuMoment2<I extends RealType<I>, O extends RealType<O>> implements AbstractImageMomentOp<I, O> {
 
 	@OpDependency(name = "imageMoments.normalizedCentralMoment20")
@@ -67,6 +65,12 @@ public class DefaultHuMoment2<I extends RealType<I>, O extends RealType<O>> impl
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> normalizedCentralMoment11Func;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void computeMoment(final RandomAccessibleInterval<I> input, final O output) {
 
 		final O n11 = output.createVariable();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java
index e25064aaa..5350246c7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java
@@ -52,8 +52,6 @@
  * @see <a href="https://en.wikipedia.org/wiki/Image_moment#Rotation_invariants"> This page </a>
  */
 @Plugin(type = Op.class, name = "imageMoments.huMoment3", label = "Image Moment: HuMoment3")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultHuMoment3<I extends RealType<I>, O extends RealType<O>> implements AbstractImageMomentOp<I, O> {
 
 	@OpDependency(name = "imageMoments.normalizedCentralMoment30")
@@ -69,6 +67,12 @@ public class DefaultHuMoment3<I extends RealType<I>, O extends RealType<O>> impl
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> normalizedCentralMoment03Func;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void computeMoment(final RandomAccessibleInterval<I> input,
 		final O output)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java
index 9c31a73ee..90ed950fc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java
@@ -52,8 +52,6 @@
  * @see <a href="https://en.wikipedia.org/wiki/Image_moment#Rotation_invariants"> This page </a>
  */
 @Plugin(type = Op.class, name = "imageMoments.huMoment4", label = "Image Moment: HuMoment4")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultHuMoment4<I extends RealType<I>, O extends RealType<O>> implements AbstractImageMomentOp<I, O> {
 
 	@OpDependency(name = "imageMoments.normalizedCentralMoment30")
@@ -69,6 +67,12 @@ public class DefaultHuMoment4<I extends RealType<I>, O extends RealType<O>> impl
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> normalizedCentralMoment03Func;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void computeMoment(final RandomAccessibleInterval<I> input,
 		final O output)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java
index 20ed5efea..cc9bdf9b3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java
@@ -52,8 +52,6 @@
  * @see <a href="https://en.wikipedia.org/wiki/Image_moment#Rotation_invariants"> This page </a>
  */
 @Plugin(type = Op.class, name = "imageMoments.huMoment5", label = "Image Moment: HuMoment5")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultHuMoment5<I extends RealType<I>, O extends RealType<O>> implements AbstractImageMomentOp<I, O> {
 
 	@OpDependency(name = "imageMoments.normalizedCentralMoment30")
@@ -69,6 +67,12 @@ public class DefaultHuMoment5<I extends RealType<I>, O extends RealType<O>> impl
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> normalizedCentralMoment03Func;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void computeMoment(final RandomAccessibleInterval<I> input, final O output) {
 		final O n30 = output.createVariable();
 		normalizedCentralMoment30Func.compute(input, n30);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java
index b2ef4680e..77b1f1577 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java
@@ -52,8 +52,6 @@
  * @see <a href="https://en.wikipedia.org/wiki/Image_moment#Rotation_invariants"> This page </a>
  */
 @Plugin(type = Op.class, name = "imageMoments.huMoment6", label = "Image Moment: HuMoment6")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultHuMoment6<I extends RealType<I>, O extends RealType<O>> implements AbstractImageMomentOp<I, O> {
 
 	@OpDependency(name = "imageMoments.normalizedCentralMoment30")
@@ -78,6 +76,12 @@ public class DefaultHuMoment6<I extends RealType<I>, O extends RealType<O>> impl
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> normalizedCentralMoment20Func;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void computeMoment(final RandomAccessibleInterval<I> input, final O output) {
 		final O n02 = output.createVariable();
 		normalizedCentralMoment02Func.compute(input, n02);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java
index e1e1411cd..76b538e95 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java
@@ -52,8 +52,6 @@
  * @see <a href="https://en.wikipedia.org/wiki/Image_moment#Rotation_invariants"> This page </a>
  */
 @Plugin(type = Op.class, name = "imageMoments.huMoment7", label = "Image Moment: HuMoment7")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultHuMoment7<I extends RealType<I>, O extends RealType<O>> implements AbstractImageMomentOp<I, O> {
 
 	@OpDependency(name = "imageMoments.normalizedCentralMoment30")
@@ -69,6 +67,12 @@ public class DefaultHuMoment7<I extends RealType<I>, O extends RealType<O>> impl
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> normalizedCentralMoment03Func;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void computeMoment(final RandomAccessibleInterval<I> input, final O output) {
 		final O n03 = output.createVariable();
 		normalizedCentralMoment03Func.compute(input, n03);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment00.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment00.java
index 98341a776..5d0725c57 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment00.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment00.java
@@ -54,8 +54,6 @@
  */
 @Plugin(type = Op.class, name = "imageMoments.moment00", label = "Image Moment: Moment00",
 	priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultMoment00<I extends RealType<I>, O extends RealType<O>>
 	implements AbstractImageMomentOp<I, O>
 {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment01.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment01.java
index 4cc75ccce..2b800d4a0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment01.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment01.java
@@ -54,8 +54,6 @@
  */
 @Plugin(type = Op.class, name = "imageMoments.moment01", label = "Image Moment: Moment01",
 	priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultMoment01<I extends RealType<I>, O extends RealType<O>>
 	implements AbstractImageMomentOp<I, O> 
 {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment10.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment10.java
index bd1dcfd9b..e995a1e30 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment10.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment10.java
@@ -54,8 +54,6 @@
  */
 @Plugin(type = Op.class, name = "imageMoments.moment10", label = "Image Moment: Moment10",
 	priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultMoment10<I extends RealType<I>, O extends RealType<O>>
 	implements AbstractImageMomentOp<I, O> 
 {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment11.java
index d8970c4a3..f60179d4c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment11.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment11.java
@@ -54,8 +54,6 @@
  */
 @Plugin(type = Op.class, name = "imageMoments.moment11", label = "Image Moment: Moment11",
 	priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultMoment11<I extends RealType<I>, O extends RealType<O>>
 	implements AbstractImageMomentOp<I, O>
 {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java
index 966095e31..2956e4324 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java
@@ -50,8 +50,6 @@
  */
 @Plugin(type = Op.class, name = "imageMoments.normalizedCentralMoment02",
 	label = "Image Moment: NormalizedCentralMoment02")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultNormalizedCentralMoment02<I extends RealType<I>, O extends RealType<O>>
 	implements AbstractImageMomentOp<I, O> 
 {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java
index 30fa93fd2..4b870cc54 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java
@@ -50,8 +50,6 @@
  */
 @Plugin(type = Op.class, name = "imageMoments.normalizedCentralMoment03",
 	label = "Image Moment: NormalizedCentralMoment03")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultNormalizedCentralMoment03<I extends RealType<I>, O extends RealType<O>>
 	implements AbstractImageMomentOp<I, O> 
 {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java
index cd180dbe0..a28820c1c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java
@@ -50,8 +50,6 @@
  */
 @Plugin(type = Op.class, name = "imageMoments.normalizedCentralMoment11",
 	label = "Image Moment: NormalizedCentralMoment11")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultNormalizedCentralMoment11<I extends RealType<I>, O extends RealType<O>>
 	implements AbstractImageMomentOp<I, O> 
 {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java
index 4d80d1321..0bde71a7e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java
@@ -50,8 +50,6 @@
  */
 @Plugin(type = Op.class, name = "imageMoments.normalizedCentralMoment12",
 	label = "Image Moment: NormalizedCentralMoment12")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultNormalizedCentralMoment12<I extends RealType<I>, O extends RealType<O>>
 	implements AbstractImageMomentOp<I, O> 
 {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java
index d608f20a8..a6d375518 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java
@@ -50,8 +50,6 @@
  */
 @Plugin(type = Op.class, name = "imageMoments.normalizedCentralMoment20",
 	label = "Image Moment: NormalizedCentralMoment20")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultNormalizedCentralMoment20<I extends RealType<I>, O extends RealType<O>>
 	implements AbstractImageMomentOp<I, O> 
 {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java
index a16c4a1eb..8436930d6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java
@@ -50,8 +50,6 @@
  */
 @Plugin(type = Op.class, name = "imageMoments.normalizedCentralMoment21",
 	label = "Image Moment: NormalizedCentralMoment21")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultNormalizedCentralMoment21<I extends RealType<I>, O extends RealType<O>>
 	implements AbstractImageMomentOp<I, O> 
 {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java
index a6115c1da..85f7a0f0a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java
@@ -50,8 +50,6 @@
  */
 @Plugin(type = Op.class, name = "imageMoments.normalizedCentralMoment30",
 	label = "Image Moment: NormalizedCentralMoment30")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class DefaultNormalizedCentralMoment30<I extends RealType<I>, O extends RealType<O>>
 	implements AbstractImageMomentOp<I, O>
 {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java
index e3113c5b9..0314f7759 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java
@@ -60,10 +60,6 @@
  * @author Stefan Helfrich (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "labeling.merge")
-@Parameter(key = "labeling1")
-@Parameter(key = "labeling2")
-@Parameter(key = "mask")
-@Parameter(key = "combinedLabeling")
 public class MergeLabeling<L, I extends IntegerType<I>, B extends BooleanType<B>>
 		implements Functions.Arity3<ImgLabeling<L, I>, ImgLabeling<L, I>, RandomAccessibleInterval<B>, ImgLabeling<L, I>> {
 
@@ -75,6 +71,14 @@ public class MergeLabeling<L, I extends IntegerType<I>, B extends BooleanType<B>
 
 	@SuppressWarnings({ "unchecked", "rawtypes", "hiding" })
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param labeling1
+	 * @param labeling2
+	 * @param mask
+	 * @param combinedLabeling
+	 */
 	public ImgLabeling<L, I> apply(final ImgLabeling<L, I> input1, final ImgLabeling<L, I> input2,
 			final RandomAccessibleInterval<B> mask) {
 		final ImgLabeling<L, I> output = imgLabelingCreator.apply(input1,
@@ -112,9 +116,6 @@ public void compute(final LabelingType<L> input1, final LabelingType<L> input2,
 }
 
 @Plugin(type = Op.class, name = "labeling.merge")
-@Parameter(key = "labeling1")
-@Parameter(key = "labeling2")
-@Parameter(key = "combinedLabeling")
 class MergeLabelingMaskless<L, I extends IntegerType<I>, B extends BooleanType<B>>
 		implements BiFunction<ImgLabeling<L, I>, ImgLabeling<L, I>, ImgLabeling<L, I>> {
 
@@ -122,6 +123,13 @@ class MergeLabelingMaskless<L, I extends IntegerType<I>, B extends BooleanType<B
 	private Functions.Arity3<ImgLabeling<L, I>, ImgLabeling<L, I>, RandomAccessibleInterval<B>, ImgLabeling<L, I>> mergeOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param labeling1
+	 * @param labeling2
+	 * @param combinedLabeling
+	 */
 	public ImgLabeling<L, I> apply(ImgLabeling<L, I> t, ImgLabeling<L, I> u) {
 		return mergeOp.apply(t, u, null);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java
index b05826d14..a02776f72 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java
@@ -55,11 +55,6 @@
  * @author Christian Dietz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "labeling.cca", priority = 1.0)
-@Parameter(key = "input")
-@Parameter(key = "executorService")
-@Parameter(key = "structuringElement")
-@Parameter(key = "labelGenerator")
-@Parameter(key = "labeling")
 public class DefaultCCA<T extends IntegerType<T>, L, I extends IntegerType<I>> implements
 		Functions.Arity4<RandomAccessibleInterval<T>, ExecutorService, StructuringElement, Iterator<Integer>, ImgLabeling<Integer, IntType>> {
 
@@ -68,6 +63,15 @@ public class DefaultCCA<T extends IntegerType<T>, L, I extends IntegerType<I>> i
 
 	@SuppressWarnings("unchecked")
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param executorService
+	 * @param structuringElement
+	 * @param labelGenerator
+	 * @param labeling
+	 */
 	public ImgLabeling<Integer, IntType> apply(final RandomAccessibleInterval<T> input, ExecutorService es,
 			StructuringElement se, Iterator<Integer> labelGenerator) {
 		ImgLabeling<Integer, IntType> output = (ImgLabeling<Integer, IntType>) imgLabelingCreator.apply(input,
@@ -79,10 +83,6 @@ public ImgLabeling<Integer, IntType> apply(final RandomAccessibleInterval<T> inp
 }
 
 @Plugin(type = Op.class, name = "labeling.cca", priority = 1.0)
-@Parameter(key = "input")
-@Parameter(key = "executorService")
-@Parameter(key = "structuringElement")
-@Parameter(key = "labeling")
 class SimpleCCA<T extends IntegerType<T>, L, I extends IntegerType<I>> implements
 		Functions.Arity3<RandomAccessibleInterval<T>, ExecutorService, StructuringElement, ImgLabeling<Integer, IntType>> {
 	@OpDependency(name = "labeling.cca")
@@ -90,6 +90,14 @@ class SimpleCCA<T extends IntegerType<T>, L, I extends IntegerType<I>> implement
 
 	@SuppressWarnings("unchecked")
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param executorService
+	 * @param structuringElement
+	 * @param labeling
+	 */
 	public ImgLabeling<Integer, IntType> apply(RandomAccessibleInterval<T> input, ExecutorService es,
 			StructuringElement structuringElement) {
 		DefaultLabelIterator defaultLabelIterator = new DefaultLabelIterator();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java
index 8577f62b7..379c9c4f5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java
@@ -45,14 +45,18 @@
  * @author Leon Yang
  */
 @Plugin(type = Op.class, name = "logic.default")
-@Parameter(key = "input")
-@Parameter(key = "defaultValue")
-@Parameter(key = "output")
 public class Default<I extends BooleanType<I>, O extends Type<O>> implements
 	Computers.Arity2<I, O, O> 
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param defaultValue
+	 * @param output
+	 */
 	public void compute(final I input, final O defaultVal, final O output) {
 		if (!input.get()) output.set(defaultVal);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java
index bc8148f2e..48a66cc37 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java
@@ -46,15 +46,19 @@
  * @author Leon Yang
  */
 @Plugin(type = Op.class, name = "logic.match")
-@Parameter(key = "input")
-@Parameter(key = "ifTrueVal")
-@Parameter(key = "ifFalseVal")
-@Parameter(key = "output")
 public class Ternary<I extends BooleanType<I>, O extends Type<O>> implements Computers.Arity3<I, O, O, O>
 
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param ifTrueVal
+	 * @param ifFalseVal
+	 * @param output
+	 */
 	public void compute(final I input, final O ifTrueVal, final O ifFalseVal, final O output) {
 		output.set(input.get() ? ifTrueVal : ifFalseVal);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java
index 3912f24ad..c331dff76 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java
@@ -54,14 +54,18 @@
  * @param <O> output type
  */
 @Plugin(type = Op.class, name = "map.neighborhood")
-@Parameter(key = "input")
-@Parameter(key = "shape")
-@Parameter(key = "op")
-@Parameter(key = "output")
 public class DefaultMapNeighborhood<I, O> implements
 	Computers.Arity3<RandomAccessibleInterval<I>, Shape, Computers.Arity1<Iterable<I>, O>, IterableInterval<O>>
 {
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param shape
+	 * @param op
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<I> in1, final Shape in2,
 		final Computers.Arity1<Iterable<I>, O> computer, final IterableInterval<O> out)
 	{
@@ -91,15 +95,19 @@ public void compute(final RandomAccessibleInterval<I> in1, final Shape in2,
  * @author Gabriel Selzer
  */
 @Plugin(type = Op.class, name = "map.neighborhood", priority = Priority.HIGH)
-@Parameter(key = "input")
-@Parameter(key = "shape")
-@Parameter(key = "op")
-@Parameter(key = "output")
 class MapNeighborhoodAllRAI<I, O> implements
 	Computers.Arity3<RandomAccessibleInterval<I>, Shape, Computers.Arity1<Iterable<I>, O>, RandomAccessibleInterval<O>>
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param shape
+	 * @param op
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<I> in1, final Shape in2,
 		final Computers.Arity1<Iterable<I>, O> centerAwareOp,
 		final RandomAccessibleInterval<O> out)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java
index 0e69d4dd7..2d4d8f6db 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java
@@ -59,14 +59,18 @@
  * @see CenterAwareComputerOp
  */
 @Plugin(type = Op.class, name = "map.neighborhood")
-@Parameter(key = "input")
-@Parameter(key = "shape")
-@Parameter(key = "op")
-@Parameter(key = "output")
 public class MapNeighborhoodWithCenter<I, O> implements Computers.Arity3<RandomAccessibleInterval<I>, Shape, Computers.Arity2<Iterable<I>, I, O>, IterableInterval<O>>
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param shape
+	 * @param op
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<I> in1, final Shape in2,
 		final Computers.Arity2<Iterable<I>, I, O> centerAwareOp, final IterableInterval<O> out)
 	{
@@ -98,15 +102,19 @@ public void compute(final RandomAccessibleInterval<I> in1, final Shape in2,
  * @author Gabriel Selzer
  */
 @Plugin(type = Op.class, name = "map.neighborhood", priority = Priority.HIGH)
-@Parameter(key = "input")
-@Parameter(key = "shape")
-@Parameter(key = "op")
-@Parameter(key = "output")
 class MapNeighborhoodWithCenterAllRAI<I, O> implements
 	Computers.Arity3<RandomAccessibleInterval<I>, Shape, Computers.Arity2<Iterable<I>, I, O>, RandomAccessibleInterval<O>>
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param shape
+	 * @param op
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<I> in1, final Shape in2,
 		final Computers.Arity2<Iterable<I>, I, O> centerAwareOp,
 		final RandomAccessibleInterval<O> out)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java
index cbb9936a9..05b7563cf 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java
@@ -39,9 +39,6 @@
 import org.scijava.struct.ItemIO;
 
 @Plugin(type = Op.class, name = "math.complexConjugateMultiply", priority = Priority.LOW)
-@Parameter(key = "input1")
-@Parameter(key = "input2")
-@Parameter(key = "output")
 public class ComplexConjugateMultiplyOp<T extends ComplexType<T>> implements Computers.Arity2<T, T, T> {
 
 	// TODO: extend common abstract base class which implements Contingent
@@ -50,6 +47,13 @@ public class ComplexConjugateMultiplyOp<T extends ComplexType<T>> implements Com
 	// operators.
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input1
+	 * @param input2
+	 * @param output
+	 */
 	public void compute(final T input1, final T input2, final T output) {
 		T temp = input2.copy();
 		temp.complexConjugate();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java
index 1618d6b4e..11bad2af6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java
@@ -51,9 +51,6 @@
  * @author Daniel Seebacher (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "morphology.extractHoles")
-@Parameter(key = "input")
-@Parameter(key = "structElement")
-@Parameter(key = "output")
 public class ExtractHoles<T extends BooleanType<T>> implements
 	Computers.Arity2<RandomAccessibleInterval<T>, Shape, RandomAccessibleInterval<T>>
 {
@@ -64,6 +61,13 @@ public class ExtractHoles<T extends BooleanType<T>> implements
 	private Computers.Arity2<RandomAccessibleInterval<T>, Shape, RandomAccessibleInterval<T>> fillHolesComp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param structElement
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<T> input,
 		final Shape structElement, final RandomAccessibleInterval<T> output)
 	{
@@ -74,8 +78,6 @@ public void compute(final RandomAccessibleInterval<T> input,
 }
 
 @Plugin(type = Op.class, name = "morphology.extractHoles")
-@Parameter(key = "input")
-@Parameter(key = "output")
 class SimpleExtractHolesComputer<T extends BooleanType<T>> implements
 	Computers.Arity1<RandomAccessibleInterval<T>, RandomAccessibleInterval<T>>
 {
@@ -83,6 +85,12 @@ class SimpleExtractHolesComputer<T extends BooleanType<T>> implements
 	private Computers.Arity2<RandomAccessibleInterval<T>, Shape, RandomAccessibleInterval<T>> extractOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void compute(RandomAccessibleInterval<T> in1, RandomAccessibleInterval<T> out) {
 		Shape defaultStructElement = new RectangleShape(1, false);
 		extractOp.compute(in1, defaultStructElement, out);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java
index bd72a7f78..ff75e7e4e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java
@@ -51,20 +51,23 @@
  * @author Daniel Seebacher (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "morphology.fillHoles")
-@Parameter(key = "input")
-@Parameter(key = "structElement")
-@Parameter(key = "output")
 public class FillHoles<T extends BooleanType<T>> implements
 	Computers.Arity2<RandomAccessibleInterval<T>, Shape, RandomAccessibleInterval<T>>
 {
 
-//	@Parameter(required = false)
 //	private Shape structElement = new RectangleShape(1, false);
 
 	@OpDependency(name = "morphology.floodFill")
 	private Computers.Arity3<RandomAccessibleInterval<T>, Localizable, Shape, RandomAccessibleInterval<T>> floodFillComp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param structElement
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<T> op,
 		final Shape structElement, final RandomAccessibleInterval<T> r)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java
index 54fddb29d..b7fc7170e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java
@@ -57,9 +57,6 @@
  * @author Richard Domander (Royal Veterinary College, London)
  */
 @Plugin(type = Op.class, name = "morphology.outline")
-@Parameter(key = "input")
-@Parameter(key = "excludeEdges")
-@Parameter(key = "output")
 public class Outline<B extends BooleanType<B>>
 		implements Computers.Arity2<RandomAccessibleInterval<B>, Boolean, RandomAccessibleInterval<BitType>> {
 
@@ -83,6 +80,13 @@ public class Outline<B extends BooleanType<B>>
 	 *            outlines of the objects in interval
 	 */
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param excludeEdges
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<B> input, final Boolean excludeEdges,
 			final RandomAccessibleInterval<BitType> output) {
 		if (!Intervals.equalDimensions(input, output))
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java
index 3b169d920..3f5b8b6da 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java
@@ -44,11 +44,15 @@
  * @author Kyle Harrington, Beth Israel Deaconess Medical Center
  */
 @Plugin(type = Op.class, name = "morphology.thinGuoHall")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class ThinGuoHall extends AbstractThin {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<BitType> input, //
 			final RandomAccessibleInterval<BitType> output) {
 		m_strategy = new GuoHallThinningStrategy();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java
index 98d36406f..16a82b717 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java
@@ -44,11 +44,15 @@
  * @author Kyle Harrington, Beth Israel Deaconess Medical Center
  */
 @Plugin(type = Op.class, name = "morphology.thinHilditch")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class ThinHilditch extends AbstractThin {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<BitType> input, //
 			final RandomAccessibleInterval<BitType> output) {
 		m_strategy = new HilditchThinningStrategy();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java
index c8fd2ac52..b72cbde67 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java
@@ -44,11 +44,15 @@
  * @author Kyle Harrington, Beth Israel Deaconess Medical Center
  */
 @Plugin(type = Op.class, name = "morphology.thinMorphological")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class ThinMorphological extends AbstractThin {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<BitType> input, //
 			final RandomAccessibleInterval<BitType> output) {
 		m_strategy = new MorphologicalThinningStrategy();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java
index 264de4275..79f15a5a4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java
@@ -44,11 +44,15 @@
  * @author Kyle Harrington, Beth Israel Deaconess Medical Center
  */
 @Plugin(type = Op.class, name = "morphology.thinZhangSuen")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class ThinZhangSuen extends AbstractThin {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<BitType> input, //
 			final RandomAccessibleInterval<BitType> output) {
 		m_strategy = new ZhangSuenThinningStrategy();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java
index 812fa435d..35fc4a169 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java
@@ -45,14 +45,18 @@
 
 @Plugin(type = Op.class, name = "project",
 	priority = Priority.LOW + 1)
-@Parameter(key = "input")
-@Parameter(key = "op")
-@Parameter(key = "dim")
-@Parameter(key = "output")
 public class DefaultProjectParallel<T, V> implements
 	Computers.Arity3<RandomAccessibleInterval<T>, Computers.Arity1<Iterable<T>, V>, Integer, RandomAccessibleInterval<V>>
 {
 
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param op
+	 * @param dim
+	 * @param output
+	 */
 	@Override
 	public void compute(final RandomAccessibleInterval<T> input, Computers.Arity1<Iterable<T>, V> method, Integer dim,
 		final RandomAccessibleInterval<V> output)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java
index 28e1f73a0..541fd6461 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java
@@ -44,14 +44,18 @@
 import org.scijava.struct.ItemIO;
 
 @Plugin(type = Op.class, name = "project", priority = Priority.LOW)
-@Parameter(key = "input")
-@Parameter(key = "op")
-@Parameter(key = "dim")
-@Parameter(key = "output")
 public class ProjectRAIToIterableInterval<T, V>
 		implements Computers.Arity3<RandomAccessibleInterval<T>, Computers.Arity1<Iterable<T>, V>, Integer, IterableInterval<V>> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param op
+	 * @param dim
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<T> input, final Computers.Arity1<Iterable<T>, V> method,
 			final Integer dim, final IterableInterval<V> output) {
 		if (input.numDimensions() != output.numDimensions() + 1)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java
index fa41a486e..9e6aca40c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java
@@ -62,9 +62,6 @@
  * @author Gabe Selzer
  */
 @Plugin(type = Op.class, name = "segment.detectJunctions")
-@Parameter(key = "lines")
-@Parameter(key = "threshold", description = "Maximum distance between polylines to be considered a junction")
-@Parameter(key = "junctions")
 public class DefaultDetectJunctions implements BiFunction<List<? extends WritablePolyline>, Double, List<RealPoint>> {
 
 	// @Parameter(required = false)
@@ -101,6 +98,13 @@ private RealPoint makeRealPoint(RealLocalizableRealPositionable input) {
 	}
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param lines
+	 * @param threshold Maximum distance between polylines to be considered a junction
+	 * @param junctions
+	 */
 	public List<RealPoint> apply(final List<? extends WritablePolyline> input, final Double threshold) {
 
 		// check arguments for validity
@@ -317,14 +321,18 @@ private <L extends RealLocalizable & RealPositionable> void parallelRoutine(Real
 }
 
 @Plugin(type = Op.class, name = "segment.detectJunctions")
-@Parameter(key = "lines")
-@Parameter(key = "junctions")
 class SimpleDetectJunctions implements Function<List<? extends WritablePolyline>, List<RealPoint>> {
 
 	@OpDependency(name = "segment.detectJunctions")
 	private BiFunction<List<? extends WritablePolyline>, Double, List<RealPoint>> junctionDetector;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param lines
+	 * @param junctions
+	 */
 	public List<RealPoint> apply(List<? extends WritablePolyline> t) {
 		return junctionDetector.apply(t, null);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java
index 4ef34ee3b..536b6616f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java
@@ -60,12 +60,6 @@
  * @author Gabe Selzer
  */
 @Plugin(type = Op.class, name = "segment.detectRidges")
-@Parameter(key = "input")
-@Parameter(key = "width")
-@Parameter(key = "lowerThreshold")
-@Parameter(key = "higherThreshold")
-@Parameter(key = "ridgeLengthMin")
-@Parameter(key = "ridges")
 public class DefaultDetectRidges<T extends RealType<T>> implements
 		Functions.Arity5<RandomAccessibleInterval<T>, Double, Double, Double, Integer, List<DefaultWritablePolyline>> {
 
@@ -230,6 +224,16 @@ private void getNextPoint(RandomAccess<DoubleType> gradientRA, RandomAccess<Doub
 	}
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param width
+	 * @param lowerThreshold
+	 * @param higherThreshold
+	 * @param ridgeLengthMin
+	 * @param ridges
+	 */
 	public List<DefaultWritablePolyline> apply(final RandomAccessibleInterval<T> input, final Double width,
 			final Double lowerThreshold, final Double higherThreshold, final Integer ridgeLengthMin) {
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java
index 3fcd77477..72f819af9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java
@@ -52,15 +52,19 @@
  * @author Martin Horn (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "slice", priority = Priority.VERY_HIGH)
-@Parameter(key = "input")
-@Parameter(key = "Op")
-@Parameter(key = "axisIndices")
-@Parameter(key = "dropSingleDimensions")
-@Parameter(key = "output")
 public class SliceRAI2RAI<I, O> implements
 		Computers.Arity4<RandomAccessibleInterval<I>, Computers.Arity1<RandomAccessibleInterval<I>, RandomAccessibleInterval<O>>, int[], Boolean, RandomAccessibleInterval<O>> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param Op
+	 * @param axisIndices
+	 * @param dropSingleDimensions
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<I> input,
 			final Computers.Arity1<RandomAccessibleInterval<I>, RandomAccessibleInterval<O>> op, final int[] axisIndices,
 			final Boolean dropSingleDimensions, final RandomAccessibleInterval<O> output) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java
index 247543dd7..3b7679dca 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java
@@ -51,8 +51,6 @@
  *            output type
  */
 @Plugin(type = Op.class, name = "stats.geometricMean")
-@Parameter(key = "iterableInput")
-@Parameter(key = "geometricMean")
 public class DefaultGeometricMean<I extends RealType<I>, O extends RealType<O>> implements Computers.Arity1<RandomAccessibleInterval<I>, O> {
 
 	@OpDependency(name = "stats.size")
@@ -62,6 +60,12 @@ public class DefaultGeometricMean<I extends RealType<I>, O extends RealType<O>>
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> sumOfLogsComputer;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param geometricMean
+	 */
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 		final O size = output.createVariable();
 		sizeComputer.compute(input, size);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java
index f414d0db9..26c5fb89b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java
@@ -49,8 +49,6 @@
  * @param <O> output type
  */
 @Plugin(type = Op.class, name = "stats.harmonicMean")
-@Parameter(key = "iterableInput")
-@Parameter(key = "harmonicMean")
 public class DefaultHarmonicMean<I extends RealType<I>, O extends RealType<O>>
 	implements Computers.Arity1<RandomAccessibleInterval<I>, O>
 {
@@ -62,6 +60,12 @@ public class DefaultHarmonicMean<I extends RealType<I>, O extends RealType<O>>
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> sumOfInversesComputer;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param harmonicMean
+	 */
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 		final O area = output.createVariable();
 		sizeComputer.compute(input, area);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java
index 0fcbac050..336a59f26 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java
@@ -49,8 +49,6 @@
  * @param <O> output type
  */
 @Plugin(type = Op.class, name = "stats.kurtosis")
-@Parameter(key = "iterableInput")
-@Parameter(key = "kurtosis")
 public class DefaultKurtosis<I extends RealType<I>, O extends RealType<O>>
 	implements Computers.Arity1<RandomAccessibleInterval<I>, O>
 {
@@ -62,6 +60,12 @@ public class DefaultKurtosis<I extends RealType<I>, O extends RealType<O>>
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> moment4AboutMeanComputer;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param kurtosis
+	 */
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 		output.setReal(Double.NaN);
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java
index 6a56376ee..de4f4afcd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java
@@ -50,14 +50,18 @@
  * @param <T> input type
  */
 @Plugin(type = Op.class, name = "stats.max", priority = Priority.HIGH)
-@Parameter(key = "iterableInput")
-@Parameter(key = "max")
 public class DefaultMax<T extends RealType<T>> implements Computers.Arity1<RandomAccessibleInterval<T>, T> {
 	
 	@OpDependency(name = "stats.minMax")
 	private Function<RandomAccessibleInterval<T>, Pair<T, T>> minMaxOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param max
+	 */
 	public void compute(final RandomAccessibleInterval<T> input, final T output) {
 		output.set(minMaxOp.apply(input).getB());
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java
index 8cb5f76fd..2a3a46ba9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java
@@ -51,8 +51,6 @@
  */
 @Plugin(type = Op.class, name = "stats.mean",
 	priority = Priority.HIGH)
-@Parameter(key = "rai")
-@Parameter(key = "mean")
 public class DefaultMean<I extends RealType<I>, O extends RealType<O>> 
 	implements Computers.Arity1<RandomAccessibleInterval<I>, O>
 {
@@ -63,6 +61,12 @@ public class DefaultMean<I extends RealType<I>, O extends RealType<O>>
 	@OpDependency(name = "stats.size")
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> areaComputer;
 
+	/**
+	 * TODO
+	 *
+	 * @param rai
+	 * @param mean
+	 */
 	@Override
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java
index 67e9e36ca..2f44b4736 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java
@@ -53,8 +53,6 @@
  *            output type
  */
 @Plugin(type = Op.class, name = "stats.median")
-@Parameter(key = "iterableInput")
-@Parameter(key = "median")
 public class DefaultMedian<I extends RealType<I>, O extends RealType<O>> 
 		implements Computers.Arity1<Iterable<I>, O> {
 
@@ -62,6 +60,12 @@ public class DefaultMedian<I extends RealType<I>, O extends RealType<O>>
 	private Computers.Arity2<Iterable<I>, Double, O> quantileOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param median
+	 */
 	public void compute(final Iterable<I> input, final O output) {
 		final ArrayList<Double> statistics = new ArrayList<>();
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java
index d8d64270c..80a9ce093 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java
@@ -50,14 +50,18 @@
  * @param <T> input type
  */
 @Plugin(type = Op.class, name = "stats.min", priority = Priority.HIGH)
-@Parameter(key = "iterableInput")
-@Parameter(key = "max")
 public class DefaultMin<T extends RealType<T>> implements Computers.Arity1<RandomAccessibleInterval<T>, T> {
 	
 	@OpDependency(name = "stats.minMax")
 	private Function<RandomAccessibleInterval<T>, Pair<T, T>> minMaxOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param max
+	 */
 	public void compute(final RandomAccessibleInterval<T> input, final T output) {
 		output.set(minMaxOp.apply(input).getA());
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java
index 428a419ef..87e2f53c0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java
@@ -54,11 +54,15 @@
  *            input type
  */
 @Plugin(type = Op.class, name = "stats.minMax", priority = Priority.HIGH)
-@Parameter(key = "iterableInput")
-@Parameter(key = "minMax")
 public class DefaultMinMax<I extends RealType<I>> implements Function<RandomAccessibleInterval<I>, Pair<I, I>> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param minMax
+	 */
 	public Pair<I, I> apply(final RandomAccessibleInterval<I> input) {
 		// set minVal to the largest possible value and maxVal to the smallest possible.
 		final I minVal = Util.getTypeFromInterval(input).createVariable();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java
index 8240cefea..3d0e29b09 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java
@@ -53,12 +53,16 @@
  * @param <O> output type
  */
 @Plugin(type = Op.class, name = "stats.moment1AboutMean")
-@Parameter(key = "iterableInput")
-@Parameter(key = "moment1AboutMean")
 public class DefaultMoment1AboutMean<I extends RealType<I>, O extends RealType<O>>
 	implements Computers.Arity1<RandomAccessibleInterval<I>, O>
 {
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param moment1AboutMean
+	 */
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 		output.setZero();
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java
index bdedd4976..f93d97a99 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java
@@ -51,14 +51,18 @@
  *            output type
  */
 @Plugin(type = Op.class, name = "stats.moment2AboutMean", priority = Priority.HIGH)
-@Parameter(key = "iterableInput")
-@Parameter(key = "moment2AboutMean")
 public class DefaultMoment2AboutMean<I extends RealType<I>, O extends RealType<O>> implements Computers.Arity1<RandomAccessibleInterval<I>, O> {
 
 	@OpDependency(name = "stats.momentNAboutMean")
 	private Computers.Arity2<RandomAccessibleInterval<I>, Integer, O> momentComputer;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param moment2AboutMean
+	 */
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 		momentComputer.compute(input, 2, output);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java
index d3950410a..b14462b53 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java
@@ -51,14 +51,18 @@
  *            output type
  */
 @Plugin(type = Op.class, name = "stats.moment3AboutMean", priority = Priority.HIGH)
-@Parameter(key = "iterableInput")
-@Parameter(key = "moment3AboutMean")
 public class DefaultMoment3AboutMean<I extends RealType<I>, O extends RealType<O>> implements Computers.Arity1<RandomAccessibleInterval<I>, O> {
 
 	@OpDependency(name = "stats.momentNAboutMean")
 	private Computers.Arity2<RandomAccessibleInterval<I>, Integer, O> momentComputer;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param moment3AboutMean
+	 */
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 		momentComputer.compute(input, 3, output);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java
index 7d61e3d87..d4961fcb8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java
@@ -51,14 +51,18 @@
  *            output type
  */
 @Plugin(type = Op.class, name = "stats.moment4AboutMean", priority = Priority.HIGH)
-@Parameter(key = "iterableInput")
-@Parameter(key = "moment4AboutMean")
 public class DefaultMoment4AboutMean<I extends RealType<I>, O extends RealType<O>> implements Computers.Arity1<RandomAccessibleInterval<I>, O> {
 
 	@OpDependency(name = "stats.momentNAboutMean")
 	private Computers.Arity2<RandomAccessibleInterval<I>, Integer, O> momentComputer;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param moment4AboutMean
+	 */
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 		momentComputer.compute(input, 4, output);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java
index 823608b5d..b84674277 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java
@@ -55,8 +55,6 @@
  *            output type
  */
 @Plugin(type = Op.class, name = "stats.momentNAboutMean", priority = Priority.HIGH)
-@Parameter(key = "iterableInput")
-@Parameter(key = "moment3AboutMean")
 public class DefaultMomentNAboutMean<I extends RealType<I>, O extends RealType<O>> implements Computers.Arity2<RandomAccessibleInterval<I>, Integer, O> {
 
 	@OpDependency(name = "stats.mean")
@@ -67,6 +65,12 @@ public class DefaultMomentNAboutMean<I extends RealType<I>, O extends RealType<O
 	private Computers.Arity2<DoubleType, Integer, DoubleType> powOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param moment3AboutMean
+	 */
 	public void compute(final RandomAccessibleInterval<I> input, final Integer n, final O output) {
 		final DoubleType mean = new DoubleType();
 		meanComputer.compute(input, mean);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java
index 103200e75..089c38e65 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java
@@ -50,9 +50,6 @@
  *            output type
  */
 @Plugin(type = Op.class, name = "stats.percentile")
-@Parameter(key = "iterableInput")
-@Parameter(key = "percent", min="0", max="100")
-@Parameter(key = "percentile")
 public class DefaultPercentile<I extends RealType<I>, O extends RealType<O>>
 		implements Computers.Arity2<Iterable<I>, Double, O> {
 
@@ -60,6 +57,13 @@ public class DefaultPercentile<I extends RealType<I>, O extends RealType<O>>
 	private Computers.Arity2<Iterable<I>, Double, O> op;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param percent
+	 * @param percentile
+	 */
 	public void compute(final Iterable<I> input, final Double percent, final O output) {
 		op.compute(input, percent / 100, output);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java
index 629e8433f..1fa795a54 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java
@@ -56,14 +56,18 @@
  * @param <O> output type
  */
 @Plugin(type = Op.class, name = "stats.quantile")
-@Parameter(key = "iterableInput")
-@Parameter(key = "quantile", min = "0.0", max = "1.0")
-@Parameter(key = "output")
 public class DefaultQuantile<I extends RealType<I>, O extends RealType<O>>
 implements Computers.Arity2<Iterable<I>, Double, O>
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param quantile
+	 * @param output
+	 */
 	public void compute(final Iterable<I> input, final Double quantile,
 		final O output)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java
index a97289bcf..6b1bf3828 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java
@@ -46,12 +46,16 @@
  * @param <O> output type
  */
 @Plugin(type = Op.class, name = "stats.size")
-@Parameter(key = "interval")
-@Parameter(key = "size")
 public class DefaultSize<I extends RealType<I>, O extends RealType<O>> 
 	implements Computers.Arity1<Interval, O>
 {
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param interval
+	 * @param size
+	 */
 	public void compute(final Interval input, final O output) {
 		output.setOne();
 		for(int i = 0; i < input.numDimensions(); i++) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java
index e4302ed25..9a21db36e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java
@@ -51,8 +51,6 @@
  *            output type
  */
 @Plugin(type = Op.class, name = "stats.skewness")
-@Parameter(key = "iterableInput")
-@Parameter(key = "skewness")
 public class DefaultSkewness<I extends RealType<I>, O extends RealType<O>> implements Computers.Arity1<RandomAccessibleInterval<I>, O> {
 
 	@OpDependency(name = "stats.moment3AboutMean")
@@ -61,6 +59,12 @@ public class DefaultSkewness<I extends RealType<I>, O extends RealType<O>> imple
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> stdDevComputer;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param skewness
+	 */
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 		final O moment3 = output.createVariable();
 		moment3AboutMeanComputer.compute(input, moment3);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java
index 86738ca12..3f7518fe1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java
@@ -49,8 +49,6 @@
  * @param <O> output type
  */
 @Plugin(type = Op.class, name = "stats.stdDev", priority = Priority.HIGH)
-@Parameter(key = "raiInput")
-@Parameter(key = "stdDev")
 public class DefaultStandardDeviation<I extends RealType<I>, O extends RealType<O>>
 	implements Computers.Arity1<RandomAccessibleInterval<I>, O>
 {
@@ -62,6 +60,12 @@ public class DefaultStandardDeviation<I extends RealType<I>, O extends RealType<
 	private Computers.Arity1<O, O> sqrtComputer;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param raiInput
+	 * @param stdDev
+	 */
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 		O variance = output.createVariable();
 		varianceComputer.compute(input, variance);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java
index 0111a39ca..8921727c3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java
@@ -50,13 +50,17 @@
  * @param <O> output type
  */
 @Plugin(type = Op.class, name = "stats.sum", priority = Priority.HIGH)
-@Parameter(key = "raiInput")
-@Parameter(key = "sum")
 public class DefaultSum<I extends RealType<I>, O extends RealType<O>> implements
 	Computers.Arity1<RandomAccessibleInterval<I>, O>
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param raiInput
+	 * @param sum
+	 */
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 		output.setZero();
 		List<O> chunkSums = LoopBuilder.setImages(input).multiThreaded()
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java
index c1c164f3d..dacf302b2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java
@@ -54,8 +54,6 @@
  *            output type
  */
 @Plugin(type = Op.class, name = "stats.sumOfInverses", priority = Priority.HIGH)
-@Parameter(key = "raiInput")
-@Parameter(key = "sumOfInverses")
 public class DefaultSumOfInverses<I extends RealType<I>, O extends RealType<O>> implements Computers.Arity2<RandomAccessibleInterval<I>, O, O> {
 	
 	@OpDependency(name = "create.img")
@@ -69,6 +67,12 @@ public class DefaultSumOfInverses<I extends RealType<I>, O extends RealType<O>>
 	private Computers.Arity1<RandomAccessibleInterval<O>, O> sumOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param raiInput
+	 * @param sumOfInverses
+	 */
 	public void compute(final RandomAccessibleInterval<I> input, final O dbzValue, final O output) {
 		RandomAccessibleInterval<O> tmpImg = imgCreator.apply(input, output);
 		//TODO: Can we lift this? Would require making a RAI of Doubles.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java
index f4e18c037..6f36b32f4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java
@@ -55,8 +55,6 @@
  *            output type
  */
 @Plugin(type = Op.class, name = "stats.sumOfLogs", priority = Priority.HIGH)
-@Parameter(key = "raiInput")
-@Parameter(key = "sumOfLogs")
 public class DefaultSumOfLogs<I extends RealType<I>, O extends RealType<O>> implements Computers.Arity1<RandomAccessibleInterval<I>, O> {
 	
 	@OpDependency(name = "create.img")
@@ -69,6 +67,12 @@ public class DefaultSumOfLogs<I extends RealType<I>, O extends RealType<O>> impl
 	private Computers.Arity1<RandomAccessibleInterval<DoubleType>, O> sumOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param raiInput
+	 * @param sumOfLogs
+	 */
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 		RandomAccessibleInterval<DoubleType> logImg = imgCreator.apply(input, new DoubleType());
 		logOp.compute(input, logImg);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java
index 2b7a53cba..8f2ad7b55 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java
@@ -51,8 +51,6 @@
  * @param <O> output type
  */
 @Plugin(type = Op.class, name = "stats.sumOfSquares", priority = Priority.HIGH)
-@Parameter(key = "raiInput")
-@Parameter(key = "sumOfSquares")
 public class DefaultSumOfSquares<I extends RealType<I>, O extends RealType<O>>
 	implements Computers.Arity1<RandomAccessibleInterval<I>, O>
 {
@@ -67,6 +65,12 @@ public class DefaultSumOfSquares<I extends RealType<I>, O extends RealType<O>>
 	private Computers.Arity1<RandomAccessibleInterval<O>, O> sumOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param raiInput
+	 * @param sumOfSquares
+	 */
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 		RandomAccessibleInterval<O> tmpImg = imgCreator.apply(input, output);
 		sqrOp.compute(input, tmpImg);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java
index 158177876..f72eb13a6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java
@@ -61,8 +61,6 @@
  *      Wikipedia </a>
  */
 @Plugin(type = Op.class, name = "stats.variance", priority = Priority.HIGH)
-@Parameter(key = "raiInput")
-@Parameter(key = "variance")
 public class DefaultVariance<I extends RealType<I>, O extends RealType<O>> implements Computers.Arity1<RandomAccessibleInterval<I>, O> {
 
 	@OpDependency(name = "stats.mean")
@@ -72,6 +70,12 @@ public class DefaultVariance<I extends RealType<I>, O extends RealType<O>> imple
 	private Computers.Arity1<RandomAccessibleInterval<I>, LongType> sizeOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param raiInput
+	 * @param variance
+	 */
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 
 		final DoubleType mean = new DoubleType();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java
index d5f269572..6a305acc5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java
@@ -53,11 +53,15 @@
  * @author Stefan Helfrich (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "stats.integralMean")
-@Parameter(key = "iterableInput")
-@Parameter(key = "integralMean")
 public class IntegralMean<I extends RealType<I>> implements Computers.Arity1<RectangleNeighborhood<? extends Composite<I>>, DoubleType> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param integralMean
+	 */
 	public void compute(final RectangleNeighborhood<? extends Composite<I>> input, final DoubleType output) {
 		// computation according to
 		// https://en.wikipedia.org/wiki/Summed_area_table
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java
index bb932fba6..6de7aec38 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java
@@ -51,11 +51,15 @@
  * @author Stefan Helfrich (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "stats.integralSum")
-@Parameter(key = "iterableInput")
-@Parameter(key = "integralSum")
 public class IntegralSum<I extends RealType<I>> implements Computers.Arity1<RectangleNeighborhood<I>, DoubleType> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param integralSum
+	 */
 	public void compute(final RectangleNeighborhood<I> input, final DoubleType output) {
 		// computation according to
 		// https://en.wikipedia.org/wiki/Summed_area_table
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java
index 4959428ca..d0c856797 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java
@@ -53,12 +53,16 @@
  * @author Stefan Helfrich (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "stats.integralVariance")
-@Parameter(key = "iterableInput")
-@Parameter(key = "integralVariance")
 public class IntegralVariance<I extends RealType<I>>
 		implements Computers.Arity1<RectangleNeighborhood<? extends Composite<I>>, DoubleType> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param integralVariance
+	 */
 	public void compute(final RectangleNeighborhood<? extends Composite<I>> input, final DoubleType output) {
 		// computation according to
 		// https://en.wikipedia.org/wiki/Summed_area_table
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java
index 01934c284..a8f4e9901 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java
@@ -49,11 +49,15 @@
  *            output type
  */
 @Plugin(type = Op.class, name = "stats.geometricMean", priority = Priority.VERY_HIGH)
-@Parameter(key = "iterableInput")
-@Parameter(key = "geometricMean")
 public class IterableGeometricMean<I extends RealType<I>, O extends RealType<O>> implements Computers.Arity1<Iterable<I>, O> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param geometricMean
+	 */
 	public void compute(final Iterable<I> input, final O output) {
 		double size = 0;
 		double sumOfLogs = 0;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java
index d6afbe933..96e163461 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java
@@ -49,11 +49,15 @@
  *            output type
  */
 @Plugin(type = Op.class, name = "stats.harmonicMean", priority = Priority.VERY_HIGH)
-@Parameter(key = "iterableInput")
-@Parameter(key = "harmonicMean")
 public class IterableHarmonicMean<I extends RealType<I>, O extends RealType<O>> implements Computers.Arity1<Iterable<I>, O> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param harmonicMean
+	 */
 	public void compute(final Iterable<I> input, final O output) {
 		double size = 0;
 		double sumOfInverses = 0;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java
index 12b58d1dd..de1379c46 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java
@@ -48,11 +48,15 @@
  *            input type
  */
 @Plugin(type = Op.class, name = "stats.max")
-@Parameter(key = "iterableInput")
-@Parameter(key = "max")
 public class IterableMax<T extends RealType<T>> implements Computers.Arity1<Iterable<T>, T> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param max
+	 */
 	public void compute(final Iterable<T> input, final T output) {
 		// Re-use output to compare against
 		output.setReal(output.getMinValue());
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java
index 7a89f899f..5d6d77e59 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java
@@ -49,11 +49,15 @@
  *            output type
  */
 @Plugin(type = Op.class, name = "stats.mean", priority = Priority.VERY_HIGH)
-@Parameter(key = "iterableInput")
-@Parameter(key = "mean")
 public class IterableMean<I extends RealType<I>, O extends RealType<O>> implements Computers.Arity1<Iterable<I>, O> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param mean
+	 */
 	public void compute(final Iterable<I> input, final O output) {
 
 		double sum = 0;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java
index b14ced9ef..29be26044 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java
@@ -48,11 +48,15 @@
  *            input type
  */
 @Plugin(type = Op.class, name = "stats.min")
-@Parameter(key = "iterableInput")
-@Parameter(key = "min")
 public class IterableMin<T extends RealType<T>> implements Computers.Arity1<Iterable<T>, T> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param min
+	 */
 	public void compute(final Iterable<T> input, final T output) {
 		// Re-use output to compare against
 		output.setReal(output.getMaxValue());
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java
index 329464570..78bf40c83 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java
@@ -50,11 +50,15 @@
  *            input type
  */
 @Plugin(type = Op.class, name = "stats.minMax")
-@Parameter(key = "iterableInput")
-@Parameter(key = "minMax")
 public class IterableMinMax<I extends RealType<I>> implements Function<Iterable<I>, Pair<I, I>> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param minMax
+	 */
 	public Pair<I, I> apply(final Iterable<I> input) {
 
 		// set minVal to the largest possible value and maxVal to the smallest possible.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java
index 96a92fb90..8545b3631 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java
@@ -50,8 +50,6 @@
  *            output type
  */
 @Plugin(type = Op.class, name = "stats.moment3AboutMean")
-@Parameter(key = "iterableInput")
-@Parameter(key = "moment3AboutMean")
 public class IterableMoment3AboutMean<I extends RealType<I>, O extends RealType<O>> implements Computers.Arity1<Iterable<I>, O> {
 
 	@OpDependency(name = "stats.mean")
@@ -60,6 +58,12 @@ public class IterableMoment3AboutMean<I extends RealType<I>, O extends RealType<
 	private Computers.Arity1<Iterable<I>, O> sizeComputer;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param moment3AboutMean
+	 */
 	public void compute(final Iterable<I> input, final O output) {
 		final O mean = output.createVariable();
 		meanComputer.compute(input, mean);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java
index ec193935c..c2083237a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java
@@ -50,8 +50,6 @@
  *            output type
  */
 @Plugin(type = Op.class, name = "stats.moment4AboutMean")
-@Parameter(key = "iterableInput")
-@Parameter(key = "moment4AboutMean")
 public class IterableMoment4AboutMean<I extends RealType<I>, O extends RealType<O>> implements Computers.Arity1<Iterable<I>, O> {
 
 	@OpDependency(name = "stats.mean")
@@ -60,6 +58,12 @@ public class IterableMoment4AboutMean<I extends RealType<I>, O extends RealType<
 	private Computers.Arity1<Iterable<I>, O> sizeComputer;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param moment4AboutMean
+	 */
 	public void compute(final Iterable<I> input, final O output) {
 
 		final O mean = output.createVariable();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java
index 037125464..7f3be747f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java
@@ -47,13 +47,17 @@
  * @param <O> output type
  */
 @Plugin(type = Op.class, name = "stats.size", priority = Priority.LOW)
-@Parameter(key = "iterableInput")
-@Parameter(key = "size")
 public class IterableSize<I extends RealType<I>, O extends RealType<O>> 
 	implements Computers.Arity1<Iterable<I>, O>
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param size
+	 */
 	public void compute(final Iterable<I> input, final O output) {
 		double size = 0;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java
index 8aecdeb2f..4699cb045 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java
@@ -49,12 +49,16 @@
  *            output type
  */
 @Plugin(type = Op.class, name = "stats.stdDev")
-@Parameter(key = "iterableInput")
-@Parameter(key = "stdDev")
 public class IterableStandardDeviation<I extends RealType<I>, O extends RealType<O>>
 		implements Computers.Arity1<Iterable<I>, O> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param stdDev
+	 */
 	public void compute(final Iterable<I> input, final O output) {
 		double sum = 0;
 		double sumSqr = 0;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java
index 0cea35922..3f1fdd831 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java
@@ -46,13 +46,17 @@
  * @param <O> output type
  */
 @Plugin(type = Op.class, name = "stats.sum")
-@Parameter(key = "iterableInput")
-@Parameter(key = "sum")
 public class IterableSum<I extends RealType<I>, O extends RealType<O>>
 	implements Computers.Arity1<Iterable<I>, O>
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param sum
+	 */
 	public void compute(final Iterable<I> input, final O output) {
 		double sum = 0;
 		for (final I in : input) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java
index f591357fc..ee1d6d500 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java
@@ -49,11 +49,15 @@
  *            output type
  */
 @Plugin(type = Op.class, name = "stats.sumOfInverses")
-@Parameter(key = "iterableInput")
-@Parameter(key = "sumOfInverses")
 public class IterableSumOfInverses<I extends RealType<I>, O extends RealType<O>> implements Computers.Arity2<Iterable<I>, O, O> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param sumOfInverses
+	 */
 	public void compute(final Iterable<I> input, final O dbzValue,
 		final O output)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java
index 7c880dd57..56e93ce37 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java
@@ -48,11 +48,15 @@
  *            output type
  */
 @Plugin(type = Op.class, name = "stats.sumOfLogs")
-@Parameter(key = "iterableInput")
-@Parameter(key = "sumOfLogs")
 public class IterableSumOfLogs<I extends RealType<I>, O extends RealType<O>> implements Computers.Arity1<Iterable<I>, O> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param sumOfLogs
+	 */
 	public void compute(final Iterable<I> input, final O output) {
 		double res = 0.0;
 		for (final I in : input) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java
index 1d30def99..914b8411d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java
@@ -46,13 +46,17 @@
  * @param <O> output type
  */
 @Plugin(type = Op.class, name = "stats.sumOfSquares")
-@Parameter(key = "iterableInput")
-@Parameter(key = "sumOfSquares")
 public class IterableSumOfSquares<I extends RealType<I>, O extends RealType<O>>
 	implements Computers.Arity1<Iterable<I>, O>
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param sumOfSquares
+	 */
 	public void compute(final Iterable<I> input, final O output) {
 		double res = 0.0;
 		for (final I in : input) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java
index e12d7d3c0..9600bc202 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java
@@ -53,11 +53,15 @@
  *      Wikipedia</a>
  */
 @Plugin(type = Op.class, name = "stats.variance")
-@Parameter(key = "iterableInput")
-@Parameter(key = "variance")
 public class IterableVariance<I extends RealType<I>, O extends RealType<O>> implements Computers.Arity1<Iterable<I>, O> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param iterableInput
+	 * @param variance
+	 */
 	public void compute(final Iterable<I> input, final O output) {
 		int n = 0;
 		double mean = 0.0;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java
index 1d496fd03..5703562e6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java
@@ -59,8 +59,6 @@
  * @author Richard Domander (Royal Veterinary College, London)
  */
 @Plugin(type = Op.class, name = "stats.leastSquares")
-@Parameter(key = "vectorCollection")
-@Parameter(key = "outputMatrix")
 public class Quadric implements
 	Function<Collection<Vector3d>, Matrix4d> 
 {
@@ -72,6 +70,12 @@ public class Quadric implements
 	public static final int MIN_DATA = 9;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param vectorCollection
+	 * @return the outputMatrix
+	 */
 	public Matrix4d apply(final Collection<Vector3d> points) {
 		if (points.size() < MIN_DATA)
 			throw new IllegalArgumentException("Must pass more points in order to fit a quadric equation!");
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java
index a30889d0b..7c13bb2d1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java
@@ -49,14 +49,18 @@
  * @author Michael Zinsmaier (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "thread.chunker", priority = Priority.VERY_LOW)
-@Parameter(key = "chunk")
-@Parameter(key = "numberOfElements")
-@Parameter(key = "executorService")
 public class ChunkerInterleaved implements Inplaces.Arity3_1<Chunk, Long, ExecutorService>{
 
 	private String cancellationMsg;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param chunk
+	 * @param numberOfElements
+	 * @param executorService
+	 */
 	public void mutate(final Chunk chunk, final Long numberOfElements, final ExecutorService es) {
 
 		final int numThreads = Runtime.getRuntime().availableProcessors();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java
index e46bd7a5d..4ced8cb35 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java
@@ -49,14 +49,18 @@
  * @author Christian Dietz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "thread.chunker")
-@Parameter(key = "chunk")
-@Parameter(key = "numberOfElements")
-@Parameter(key = "executorService")
 public class DefaultChunker implements Inplaces.Arity3_1<Chunk, Long, ExecutorService> {
 
 	private final int STEP_SIZE = 1;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param chunk
+	 * @param numberOfElements
+	 * @param executorService
+	 */
 	public void mutate(final Chunk chunk, final Long numberOfElements, final ExecutorService es) {
 
 		// TODO: is there a better way to determine the optimal chunk size?
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/AbstractApplyThresholdIterable.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/AbstractApplyThresholdIterable.java
index 568c7e821..966b0aefa 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/AbstractApplyThresholdIterable.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/AbstractApplyThresholdIterable.java
@@ -40,8 +40,6 @@
  * @author Curtis Rueden
  * @author Christian Dietz (University of Konstanz)
  */
-@Parameter(key = "input")
-@Parameter(key = "output")
 public abstract class AbstractApplyThresholdIterable<T> implements
 	Computers.Arity1<Iterable<T>, Iterable<BitType>>
 {
@@ -49,6 +47,12 @@ public abstract class AbstractApplyThresholdIterable<T> implements
 	@OpDependency(name = "threshold.apply")
 	private Computers.Arity2<Iterable<T>, T, Iterable<BitType>> applyThresholdOp;
 
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
 	@Override
 	public void compute(final Iterable<T> input,
 		final Iterable<BitType> output)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java
index fed4ce24f..5f23b1c88 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java
@@ -311,10 +311,6 @@ protected Computers.Arity1<Histogram1d<T>, T> getComputeThresholdOp() {
 		}
 	}
 
-	@Parameter(key = "input")
-	@Parameter(key = "inputNeighborhoodShape")
-	@Parameter(key = "outOfBoundsFactory", required = false)
-	@Parameter(key = "output")
 	private abstract static class AbstractApplyLocalHistogramBasedThreshold<T extends RealType<T>>
 		implements
 		Computers.Arity3<RandomAccessibleInterval<T>, Shape, OutOfBoundsFactory<T, RandomAccessibleInterval<T>>, //
@@ -332,6 +328,14 @@ private abstract static class AbstractApplyLocalHistogramBasedThreshold<T extend
 
 		private Computers.Arity2<Iterable<T>, T, BitType> thresholdOp;
 
+		/**
+		 * TODO
+		 *
+		 * @param input
+		 * @param inputNeighborhoodShape
+		 * @param outOfBoundsFactory (required = false)
+		 * @param output
+		 */
 		@Override
 		public void compute(final RandomAccessibleInterval<T> input,
 			final Shape inputNeighborhoodShape,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java
index 095e24d6f..4c156e06c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java
@@ -51,10 +51,6 @@
  * @author Christian Dietz (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "threshold.apply")
-@Parameter(key = "input")
-@Parameter(key = "threshold")
-@Parameter(key = "comparator")
-@Parameter(key = "output")
 public class ApplyConstantThreshold<T extends RealType<T>>
 		implements Computers.Arity3<Iterable<T>, T, Comparator<T>, Iterable<BitType>> {
 
@@ -63,6 +59,14 @@ public class ApplyConstantThreshold<T extends RealType<T>>
 
 	// TODO can/should the Comparator be of <? super T> instead of just <T>?
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param threshold
+	 * @param comparator
+	 * @param output
+	 */
 	public void compute(final Iterable<T> input1, final T input2, final Comparator<T> comparator,
 			final Iterable<BitType> output) {
 		Computers.Arity1<T, BitType> thresholdComputer = Adapt.ComputerAdapt.asComputer(applyThreshold, input2, comparator);
@@ -78,9 +82,6 @@ public void compute(final Iterable<T> input1, final T input2, final Comparator<T
 // use this Op. The default comparator just returns true if the input is greater
 // than the threshold.
 @Plugin(type = Op.class, name = "threshold.apply")
-@Parameter(key = "input")
-@Parameter(key = "threshold")
-@Parameter(key = "output")
 class ApplyConstantThresholdSimple<T extends RealType<T>> implements Computers.Arity2<Iterable<T>, T, Iterable<BitType>> {
 
 	@OpDependency(name = "threshold.apply")
@@ -88,6 +89,13 @@ class ApplyConstantThresholdSimple<T extends RealType<T>> implements Computers.A
 
 	// TODO can/should the Comparator be of <? super T> instead of just <T>?
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param threshold
+	 * @param output
+	 */
 	public void compute(final Iterable<T> input1, final T input2, final Iterable<BitType> output) {
 
 		applyThreshold.compute(input1, input2, (in1, in2) -> in1.compareTo(in2), output);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java
index 77feacc64..f05ea2b67 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java
@@ -45,14 +45,18 @@
  * @author Martin Horn (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "threshold.apply")
-@Parameter(key = "input")
-@Parameter(key = "threshold")
-@Parameter(key = "output")
 public class ApplyThresholdComparable<T> implements
 	Computers.Arity2<Comparable<? super T>, T, BitType>
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param threshold
+	 * @param output
+	 */
 	public void compute(final Comparable<? super T> input, final T threshold,
 		final BitType output)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java
index 690fd1af5..08e800147 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java
@@ -47,14 +47,18 @@
  * @author Curtis Rueden
  */
 @Plugin(type = Op.class, name = "threshold.apply")
-@Parameter(key = "input")
-@Parameter(key = "threshold")
-@Parameter(key = "comparator")
-@Parameter(key = "output")
 public class ApplyThresholdComparator<T> implements Computers.Arity3<T, T, Comparator<? super T>, BitType>
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param threshold
+	 * @param comparator
+	 * @param output
+	 */
 	public void compute(T input1, T input2, Comparator<? super T> comparator, BitType out) {
 		out.set(comparator.compare(input1, input2) > 0);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java
index 688775164..76fa27cf2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java
@@ -48,13 +48,17 @@
  * @author Gabriel Landini
  */
 @Plugin(type = Op.class, name = "threshold.huang")
-@Parameter(key = "inputHistogram")
-@Parameter(key = "output")
 public class ComputeHuangThreshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param inputHistogram
+	 * @param output
+	 */
 	public long computeBin(final Histogram1d<T> hist) {
 		final long[] histogram = hist.toLongArray();
 		return computeBin(histogram);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java
index 80b79f04d..0ba6d0a8d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java
@@ -51,13 +51,17 @@
  * @author Gabriel Landini
  */
 @Plugin(type = Op.class, name = "threshold.ij1", priority = Priority.HIGH)
-@Parameter(key = "inputHistogram")
-@Parameter(key = "output")
 public class ComputeIJ1Threshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param inputHistogram
+	 * @param output
+	 */
 	public long computeBin(final Histogram1d<T> hist) {
 		final long[] histogram = hist.toLongArray();
 		return computeBin(histogram);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java
index 1a21a6f87..15ec4246c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java
@@ -52,8 +52,6 @@
  */
 @Plugin(type = Op.class, name = "threshold.intermodes",
 	priority = Priority.HIGH)
-@Parameter(key = "inputHistogram")
-@Parameter(key = "output")
 public class ComputeIntermodesThreshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java
index acf2c1da2..a73f2954b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java
@@ -51,13 +51,17 @@
  * @author Gabriel Landini
  */
 @Plugin(type = Op.class, name = "threshold.isoData", priority = Priority.HIGH)
-@Parameter(key = "inputHistogram")
-@Parameter(key = "output")
 public class ComputeIsoDataThreshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param inputHistogram
+	 * @param output
+	 */
 	public long computeBin(final Histogram1d<T> hist) {
 		final long[] histogram = hist.toLongArray();
 		return computeBin(histogram);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java
index 3e79eb09b..daeb4489a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java
@@ -50,13 +50,17 @@
  * @author Gabriel Landini
  */
 @Plugin(type = Op.class, name = "threshold.li", priority = Priority.HIGH)
-@Parameter(key = "inputHistogram")
-@Parameter(key = "output")
 public class ComputeLiThreshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param inputHistogram
+	 * @param output
+	 */
 	public long computeBin(final Histogram1d<T> hist) {
 		final long[] histogram = hist.toLongArray();
 		return computeBin(histogram);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java
index 375b010f9..d126dae60 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java
@@ -54,11 +54,6 @@
  * @param <T> input type
  */
 @Plugin(type = Op.class, name = "threshold.localBernsen")
-@Parameter(key = "inputNeighborhood")
-@Parameter(key = "inputCenterPixel")
-@Parameter(key = "contrastThreshold")
-@Parameter(key = "halfMaxValue")
-@Parameter(key = "output")
 public class ComputeLocalBernsenThreshold<T extends RealType<T>> implements
 	Computers.Arity4<Iterable<T>, T, Double, Double, BitType>
 {
@@ -67,6 +62,15 @@ public class ComputeLocalBernsenThreshold<T extends RealType<T>> implements
 	private Function<Iterable<T>, Pair<T, T>> minMaxOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param inputNeighborhood
+	 * @param inputCenterPixel
+	 * @param contrastThreshold
+	 * @param halfMaxValue
+	 * @param output
+	 */
 	public void compute(final Iterable<T> inputNeighborhood,
 		final T inputCenterPixel, final Double contrastThreshold,
 		final Double halfMaxValue, final BitType output)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java
index 89ecf5ee7..1522df172 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java
@@ -50,12 +50,6 @@
  * @param <T> input type
  */
 @Plugin(type = Op.class, name = "threshold.localBernsen")
-@Parameter(key = "input")
-@Parameter(key = "inputNeighborhoodShape")
-@Parameter(key = "contrastThreshold")
-@Parameter(key = "halfMaxValue")
-@Parameter(key = "outOfBoundsFactory", required = false)
-@Parameter(key = "output")
 public class LocalBernsenThreshold<T extends RealType<T>> implements
 	Computers.Arity5<RandomAccessibleInterval<T>, Shape, Double, Double, OutOfBoundsFactory<T, RandomAccessibleInterval<T>>, //
 			RandomAccessibleInterval<BitType>> {
@@ -64,6 +58,16 @@ public class LocalBernsenThreshold<T extends RealType<T>> implements
 	private Computers.Arity4<Iterable<T>, T, Double, Double, BitType> computeThresholdOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param inputNeighborhoodShape
+	 * @param contrastThreshold
+	 * @param halfMaxValue
+	 * @param outOfBoundsFactory
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<T> input,
 		final Shape inputNeighborhoodShape, final Double contrastThreshold,
 		final Double halfMaxValue,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java
index 344c2e499..5486eddf1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java
@@ -50,9 +50,6 @@
  * @author Stefan Helfrich (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "threshold.localContrast")
-@Parameter(key = "inputNeighborhood")
-@Parameter(key = "inputCenterPixel")
-@Parameter(key = "output")
 public class ComputeLocalContrastThreshold<T extends RealType<T>> implements
 	Computers.Arity2<Iterable<T>, T, BitType>
 {
@@ -61,6 +58,13 @@ public class ComputeLocalContrastThreshold<T extends RealType<T>> implements
 	private Function<Iterable<T>, Pair<T, T>> minMaxOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param inputNeighborhood
+	 * @param inputCenterPixel
+	 * @param output
+	 */
 	public void compute(final Iterable<T> inputNeighborhood,
 		final T inputCenterPixel, final BitType output)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java
index 11c1a6ff2..0ec2bf308 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java
@@ -49,10 +49,6 @@
  * @author Stefan Helfrich (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "threshold.localContrast")
-@Parameter(key = "input")
-@Parameter(key = "inputNeighborhoodShape")
-@Parameter(key = "outOfBoundsFactory", required = false)
-@Parameter(key = "output")
 public class LocalContrastThreshold<T extends RealType<T>> implements
 	Computers.Arity3<RandomAccessibleInterval<T>, Shape, OutOfBoundsFactory<T, RandomAccessibleInterval<T>>, //
 			RandomAccessibleInterval<BitType>> {
@@ -61,6 +57,14 @@ public class LocalContrastThreshold<T extends RealType<T>> implements
 	private Computers.Arity2<Iterable<T>, T, BitType> computeThresholdOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param inputNeighborhoodShape
+	 * @param outOfBoundsFactory
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<T> input,
 		final Shape inputNeighborhoodShape,
 		final OutOfBoundsFactory<T, RandomAccessibleInterval<T>> outOfBoundsFactory,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java
index d97668a12..4b3284851 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java
@@ -49,10 +49,6 @@
  * @author Stefan Helfrich (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "threshold.localMean", priority = Priority.LOW)
-@Parameter(key = "inputNeighborhood")
-@Parameter(key = "inputCenterPixel")
-@Parameter(key = "c")
-@Parameter(key = "output")
 public class ComputeLocalMeanThreshold<T extends RealType<T>> implements
 	Computers.Arity3<Iterable<T>, T, Double, BitType>
 {
@@ -61,6 +57,14 @@ public class ComputeLocalMeanThreshold<T extends RealType<T>> implements
 	private Computers.Arity1<Iterable<T>, DoubleType> meanOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param inputNeighborhood
+	 * @param inputCenterPixel
+	 * @param c
+	 * @param output
+	 */
 	public void compute(final Iterable<T> inputNeighborhood,
 		final T inputCenterPixel, final Double c, final BitType output)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java
index 686df74af..f208ab1d4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java
@@ -64,10 +64,6 @@
  */
 @Plugin(type = Op.class, name = "threshold.localMean", priority = Priority.LOW -
 	1)
-@Parameter(key = "inputNeighborhood")
-@Parameter(key = "inputCenterPixel")
-@Parameter(key = "c")
-@Parameter(key = "output")
 public class ComputeLocalMeanThresholdIntegral<T extends RealType<T>, U extends RealType<U>> implements
 	Computers.Arity3<RectangleNeighborhood<? extends Composite<U>>, T, Double, BitType>
 {
@@ -75,6 +71,14 @@ public class ComputeLocalMeanThresholdIntegral<T extends RealType<T>, U extends
 	@OpDependency(name = "stats.integralMean")
 	private Computers.Arity1<RectangleNeighborhood<? extends Composite<U>>, DoubleType> integralMeanOp;
 
+	/**
+	 * TODO
+	 *
+	 * @param inputNeighborhood
+	 * @param inputCenterPixel
+	 * @param c
+	 * @param output
+	 */
 	@Override
 	public void compute(
 		final RectangleNeighborhood<? extends Composite<U>> inputNeighborhood,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java
index 2e075699f..d19885658 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java
@@ -64,11 +64,6 @@
  * @author Stefan Helfrich (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "threshold.localMean", priority = Priority.LOW)
-@Parameter(key = "input")
-@Parameter(key = "inputNeighborhoodShape")
-@Parameter(key = "c")
-@Parameter(key = "outOfBoundsFactory", required = false)
-@Parameter(key = "output")
 public class LocalMeanThreshold<T extends RealType<T>> extends
 	ApplyLocalThresholdIntegral<T, DoubleType> implements
 	Computers.Arity4<RandomAccessibleInterval<T>, Shape, Double, OutOfBoundsFactory<T, RandomAccessibleInterval<T>>, //
@@ -83,6 +78,15 @@ public class LocalMeanThreshold<T extends RealType<T>> extends
 	private Computers.Arity3<RectangleNeighborhood<? extends Composite<DoubleType>>, T, Double, BitType> computeThresholdIntegralOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param inputNeighborhoodShape
+	 * @param c
+	 * @param outOfBoundsFactory
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<T> input,
 		final Shape inputNeighborhoodShape, final Double c,
 		final OutOfBoundsFactory<T, RandomAccessibleInterval<T>> outOfBoundsFactory,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java
index 0591e5ef7..6df8c4d00 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java
@@ -47,10 +47,6 @@
  * @author Stefan Helfrich (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "threshold.localMedian")
-@Parameter(key = "inputNeighborhood")
-@Parameter(key = "inputCenterPixel")
-@Parameter(key = "c")
-@Parameter(key = "output")
 public class ComputeLocalMedianThreshold<T extends RealType<T>> implements
 	Computers.Arity3<Iterable<T>, T, Double, BitType>
 {
@@ -59,6 +55,14 @@ public class ComputeLocalMedianThreshold<T extends RealType<T>> implements
 	private Computers.Arity1<Iterable<T>, DoubleType> medianOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param inputNeighborhood
+	 * @param inputCenterPixel
+	 * @param c
+	 * @param output
+	 */
 	public void compute(final Iterable<T> inputNeighborhood,
 		final T inputCenterPixel, final Double c, final BitType output)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java
index afc915340..3232c18a3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java
@@ -49,11 +49,6 @@
  * @author Stefan Helfrich (University of Konstanz)
  */
 @Plugin(type = Op.class, name = "threshold.localMedian")
-@Parameter(key = "input")
-@Parameter(key = "inputNeighborhoodShape")
-@Parameter(key = "c")
-@Parameter(key = "outOfBoundsFactory", required = false)
-@Parameter(key = "output")
 public class LocalMedianThreshold<T extends RealType<T>> implements
 	Computers.Arity4<RandomAccessibleInterval<T>, Shape, Double, OutOfBoundsFactory<T, RandomAccessibleInterval<T>>, //
 			RandomAccessibleInterval<BitType>> {
@@ -62,6 +57,15 @@ public class LocalMedianThreshold<T extends RealType<T>> implements
 	private Computers.Arity3<Iterable<T>, T, Double, BitType> computeThresholdOp;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param inputNeighborhoodShape
+	 * @param c
+	 * @param outOfBoundsFactory
+	 * @param output
+	 */
 	public void compute(final RandomAccessibleInterval<T> input,
 		final Shape inputNeighborhoodShape, final Double c,
 		final OutOfBoundsFactory<T, RandomAccessibleInterval<T>> outOfBoundsFactory,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java
index c901be476..ec1141a46 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java
@@ -52,10 +52,6 @@
  */
 @Plugin(type = Op.class, name = "threshold.localMidGrey",
 	priority = Priority.LOW)
-@Parameter(key = "inputNeighborhood")
-@Parameter(key = "inputCenterPixel")
-@Parameter(key = "c")
-@Parameter(key = "output")
 public class ComputeLocalMidGreyThreshold<T extends RealType<T>> implements
 	Computers.Arity3<Iterable<T>, T, Double, BitType>
 {
@@ -63,6 +59,14 @@ public class ComputeLocalMidGreyThreshold<T extends RealType<T>> implements
 	@OpDependency(name = "stats.minMax")
 	private Function<Iterable<T>, Pair<T, T>> minMaxOp;
 
+	/**
+	 * TODO
+	 *
+	 * @param inputNeighborhood
+	 * @param inputCenterPixel
+	 * @param c
+	 * @param output
+	 */
 	@Override
 	public void compute(final Iterable<T> inputNeighborhood,
 		final T inputCenterPixel, final Double c, final BitType output)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java
index 20526f750..73a464b24 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java
@@ -51,11 +51,6 @@
  */
 @Plugin(type = Op.class, name = "threshold.localMidGrey",
 	priority = Priority.LOW)
-@Parameter(key = "input")
-@Parameter(key = "inputNeighborhoodShape")
-@Parameter(key = "c")
-@Parameter(key = "outOfBoundsFactory", required = false)
-@Parameter(key = "output")
 public class LocalMidGreyThreshold<T extends RealType<T>> implements
 	Computers.Arity4<RandomAccessibleInterval<T>, Shape, Double, OutOfBoundsFactory<T, RandomAccessibleInterval<T>>, //
 			RandomAccessibleInterval<BitType>> {
@@ -63,6 +58,15 @@ public class LocalMidGreyThreshold<T extends RealType<T>> implements
 	@OpDependency(name = "threshold.localMidGrey")
 	private Computers.Arity3<Iterable<T>, T, Double, BitType> computeThresholdOp;
 
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param inputNeighborhoodShape
+	 * @param c
+	 * @param outOfBoundsFactory (required = false)
+	 * @param output
+	 */
 	@Override
 	public void compute(final RandomAccessibleInterval<T> input,
 		final Shape inputNeighborhoodShape, final Double c,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java
index 265242828..f04f06cd4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java
@@ -49,11 +49,6 @@
  */
 @Plugin(type = Op.class, name = "threshold.localNiblack",
 	priority = Priority.LOW)
-@Parameter(key = "inputNeighborhood")
-@Parameter(key = "inputCenterPixel")
-@Parameter(key = "c")
-@Parameter(key = "k")
-@Parameter(key = "output")
 public class ComputeLocalNiblackThreshold<T extends RealType<T>> implements
 	Computers.Arity4<Iterable<T>, T, Double, Double, BitType>
 {
@@ -64,6 +59,15 @@ public class ComputeLocalNiblackThreshold<T extends RealType<T>> implements
 	@OpDependency(name = "stats.stdDev")
 	private Computers.Arity1<Iterable<T>, DoubleType> stdDeviationOp;
 
+	/**
+	 * TODO
+	 *
+	 * @param inputNeighborhood
+	 * @param inputCenterPixel
+	 * @param c
+	 * @param k
+	 * @param output
+	 */
 	@Override
 	public void compute(final Iterable<T> inputNeighborhood,
 		final T inputCenterPixel, final Double c, final Double k,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java
index 7720b347a..c9f217398 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java
@@ -64,11 +64,6 @@
  */
 @Plugin(type = Op.class, name = "threshold.localNiblack",
 	priority = Priority.LOW - 1)
-@Parameter(key = "inputNeighborhood")
-@Parameter(key = "inputCenterPixel")
-@Parameter(key = "c")
-@Parameter(key = "k")
-@Parameter(key = "output")
 public class ComputeLocalNiblackThresholdIntegral<T extends RealType<T>, U extends RealType<U>>
 	implements
 	Computers.Arity4<RectangleNeighborhood<? extends Composite<U>>, T, Double, Double, BitType>
@@ -80,6 +75,15 @@ public class ComputeLocalNiblackThresholdIntegral<T extends RealType<T>, U exten
 	@OpDependency(name = "stats.integralVariance")
 	private Computers.Arity1<RectangleNeighborhood<? extends Composite<U>>, DoubleType> integralVarianceOp;
 
+	/**
+	 * TODO
+	 *
+	 * @param inputNeighborhood
+	 * @param inputCenterPixel
+	 * @param c
+	 * @param k
+	 * @param output
+	 */
 	@Override
 	public void compute(
 		final RectangleNeighborhood<? extends Composite<U>> inputNeighborhood,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java
index 699313436..0d8b9da90 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java
@@ -55,12 +55,6 @@
 
 @Plugin(type = Op.class, name = "threshold.localNiblack",
 	priority = Priority.LOW)
-@Parameter(key = "input")
-@Parameter(key = "inputNeighborhoodShape")
-@Parameter(key = "c")
-@Parameter(key = "k")
-@Parameter(key = "outOfBoundsFactory", required = false)
-@Parameter(key = "output")
 public class LocalNiblackThreshold<T extends RealType<T>> extends
 	ApplyLocalThresholdIntegral<T, DoubleType> implements
 	Computers.Arity5<RandomAccessibleInterval<T>, Shape, Double, Double, OutOfBoundsFactory<T, RandomAccessibleInterval<T>>, //
@@ -75,6 +69,16 @@ public class LocalNiblackThreshold<T extends RealType<T>> extends
 	@OpDependency(name = "threshold.localNiblack")
 	private Computers.Arity4<RectangleNeighborhood<? extends Composite<DoubleType>>, T, Double, Double, BitType> computeThresholdIntegralOp;
 
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param inputNeighborhoodShape
+	 * @param c
+	 * @param k
+	 * @param outOfBoundsFactory (required = false)
+	 * @param output
+	 */
 	@Override
 	public void compute(final RandomAccessibleInterval<T> input,
 		final Shape inputNeighborhoodShape, final Double c, final Double k,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java
index dc85b4da2..288f92aa2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java
@@ -69,11 +69,6 @@
  */
 @Plugin(type = Op.class, name = "threshold.localPhansalkar",
 	priority = Priority.LOW)
-@Parameter(key = "inputNeighborhood")
-@Parameter(key = "inputCenterPixel")
-@Parameter(key = "k", required = false)
-@Parameter(key = "r", required = false)
-@Parameter(key = "output")
 public class ComputeLocalPhansalkarThreshold<T extends RealType<T>> implements
 	Computers.Arity4<Iterable<T>, T, Double, Double, BitType>
 {
@@ -90,6 +85,15 @@ public class ComputeLocalPhansalkarThreshold<T extends RealType<T>> implements
 	@OpDependency(name = "stats.stdDev")
 	private Computers.Arity1<Iterable<T>, DoubleType> stdDeviationOp;
 
+	/**
+	 * TODO
+	 *
+	 * @param inputNeighborhood
+	 * @param inputCenterPixel
+	 * @param k (required = false)
+	 * @param r (required = false)
+	 * @param output
+	 */
 	@Override
 	public void compute(final Iterable<T> inputNeighborhood,
 		final T inputCenterPixel, final Double k, final Double r,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java
index 6ace4015c..53dc8dd11 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java
@@ -64,11 +64,6 @@
  */
 @Plugin(type = Op.class, name = "threshold.localPhansalkar",
 	priority = Priority.LOW - 1)
-@Parameter(key = "inputNeighborhood")
-@Parameter(key = "inputCenterPixel")
-@Parameter(key = "k", required = false)
-@Parameter(key = "r", required = false)
-@Parameter(key = "output")
 public class ComputeLocalPhansalkarThresholdIntegral<T extends RealType<T>>
 	implements
 	Computers.Arity4<RectangleNeighborhood<? extends Composite<DoubleType>>, T, Double, Double, BitType>
@@ -86,6 +81,15 @@ public class ComputeLocalPhansalkarThresholdIntegral<T extends RealType<T>>
 	@OpDependency(name = "stats.integralVariance")
 	private Computers.Arity1<RectangleNeighborhood<? extends Composite<DoubleType>>, DoubleType> integralVarianceOp;
 
+	/**
+	 * TODO
+	 *
+	 * @param inputNeighborhood
+	 * @param inputCenterPixel
+	 * @param k (required = false)
+	 * @param r (required = false)
+	 * @param output
+	 */
 	@Override
 	public void compute(
 		final RectangleNeighborhood<? extends Composite<DoubleType>> inputNeighborhood,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java
index ac53959f5..84156b3c3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java
@@ -55,12 +55,6 @@
 
 @Plugin(type = Op.class, name = "threshold.localPhansalkar",
 	priority = Priority.LOW)
-@Parameter(key = "input")
-@Parameter(key = "inputNeighborhoodShape")
-@Parameter(key = "k", required = false)
-@Parameter(key = "r", required = false)
-@Parameter(key = "outOfBoundsFactory", required = false)
-@Parameter(key = "output")
 public class LocalPhansalkarThreshold<T extends RealType<T>> extends
 	ApplyLocalThresholdIntegral<T, DoubleType> implements
 	Computers.Arity5<RandomAccessibleInterval<T>, Shape, Double, Double, OutOfBoundsFactory<T, RandomAccessibleInterval<T>>, //
@@ -75,6 +69,16 @@ public class LocalPhansalkarThreshold<T extends RealType<T>> extends
 	@OpDependency(name = "threshold.localPhansalkar")
 	private Computers.Arity4<RectangleNeighborhood<? extends Composite<DoubleType>>, T, Double, Double, BitType> computeThresholdIntegralOp;
 
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param inputneighborhoodshape
+	 * @param k (required = false)
+	 * @Param r (required = false)
+	 * @Param outOfBoundsFactory (required = false)
+	 * @param output
+	 */
 	@Override
 	public void compute(final RandomAccessibleInterval<T> input,
 		final Shape inputNeighborhoodShape, final Double k, final Double r,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java
index ed8a72e22..02d3c03cd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java
@@ -61,11 +61,6 @@
  */
 @Plugin(type = Op.class, name = "threshold.localSauvola",
 	priority = Priority.LOW)
-@Parameter(key = "inputNeighborhood")
-@Parameter(key = "inputCenterPixel")
-@Parameter(key = "k", required = false)
-@Parameter(key = "r", required = false)
-@Parameter(key = "output")
 public class ComputeLocalSauvolaThreshold<T extends RealType<T>> implements
 	Computers.Arity4<Iterable<T>, T, Double, Double, BitType>
 {
@@ -79,6 +74,15 @@ public class ComputeLocalSauvolaThreshold<T extends RealType<T>> implements
 	@OpDependency(name = "stats.stdDev")
 	private Computers.Arity1<Iterable<T>, DoubleType> stdDeviationOp;
 
+	/**
+	 * TODO
+	 *
+	 * @param inputNeighborhood
+	 * @param inputCenterPixel
+	 * @param k (required = false)
+	 * @param r (required = false)
+	 * @param output
+	 */
 	@Override
 	public void compute(final Iterable<T> inputNeighborhood,
 		final T inputCenterPixel, final Double k, final Double r,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java
index 1dd29f73e..720ee2bb3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java
@@ -64,11 +64,6 @@
  */
 @Plugin(type = Op.class, name = "threshold.localSauvola",
 	priority = Priority.LOW - 1)
-@Parameter(key = "inputNeighborhood")
-@Parameter(key = "inputCenterPixel")
-@Parameter(key = "k", required = false)
-@Parameter(key = "r", required = false)
-@Parameter(key = "output")
 public class ComputeLocalSauvolaThresholdIntegral<T extends RealType<T>>
 	implements
 	Computers.Arity4<RectangleNeighborhood<? extends Composite<DoubleType>>, T, Double, Double, BitType>
@@ -83,6 +78,15 @@ public class ComputeLocalSauvolaThresholdIntegral<T extends RealType<T>>
 	@OpDependency(name = "stats.integralVariance")
 	private Computers.Arity1<RectangleNeighborhood<? extends Composite<DoubleType>>, DoubleType> integralVarianceOp;
 
+	/**
+	 * TODO
+	 *
+	 * @param inputNeighborhood
+	 * @param inputCenterPixel
+	 * @param k (required = false)
+	 * @param r (required = false)
+	 * @param output
+	 */
 	@Override
 	public void compute(
 		final RectangleNeighborhood<? extends Composite<DoubleType>> inputNeighborhood,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java
index 02aad0235..268879ef0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java
@@ -55,12 +55,6 @@
 
 @Plugin(type = Op.class, name = "threshold.localSauvola",
 	priority = Priority.LOW)
-@Parameter(key = "input")
-@Parameter(key = "inputNeighborhoodShape")
-@Parameter(key = "k", required = false)
-@Parameter(key = "r", required = false)
-@Parameter(key = "outOfBoundsFactory", required = false)
-@Parameter(key = "output")
 public class LocalSauvolaThreshold<T extends RealType<T>> extends
 	ApplyLocalThresholdIntegral<T, DoubleType> implements
 	Computers.Arity5<RandomAccessibleInterval<T>, Shape, Double, Double, OutOfBoundsFactory<T, RandomAccessibleInterval<T>>, //
@@ -75,6 +69,16 @@ public class LocalSauvolaThreshold<T extends RealType<T>> extends
 	@OpDependency(name = "threshold.localSauvola")
 	private Computers.Arity4<RectangleNeighborhood<? extends Composite<DoubleType>>, T, Double, Double, BitType> computeThresholdIntegralOp;
 
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param inputNeighborhoodShape
+	 * @param k (required = false)
+	 * @param r (required = false)
+	 * @param outOfBoundsFactory (required = false)
+	 * @param output
+	 */
 	@Override
 	public void compute(final RandomAccessibleInterval<T> input,
 		final Shape inputNeighborhoodShape, final Double k, final Double r,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java
index 7c8740743..7c07f942f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java
@@ -50,8 +50,6 @@
  */
 @Plugin(type = Op.class, name = "threshold.maxEntropy",
 	priority = Priority.HIGH)
-@Parameter(key = "inputHistogram")
-@Parameter(key = "output")
 public class ComputeMaxEntropyThreshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java
index 1e5819f19..6c725ad00 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java
@@ -51,8 +51,6 @@
  * @author Barry DeZonia
  */
 @Plugin(type = Op.class, name = "threshold.maxLikelihood")
-@Parameter(key = "inputHistogram")
-@Parameter(key = "output")
 public class ComputeMaxLikelihoodThreshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
@@ -60,6 +58,12 @@ public class ComputeMaxLikelihoodThreshold<T extends RealType<T>> extends
 	private static final int MAX_ATTEMPTS = 10000;
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param inputHistogram
+	 * @param output
+	 */
 	public long computeBin(final Histogram1d<T> hist) {
 		final long[] histogram = hist.toLongArray();
 		return computeBin(histogram);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java
index 193ee47c1..3571d7d30 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java
@@ -48,13 +48,17 @@
  * @author Gabriel Landini
  */
 @Plugin(type = Op.class, name = "threshold.mean")
-@Parameter(key = "inputHistogram")
-@Parameter(key = "output")
 public class ComputeMeanThreshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param inputHistogram
+	 * @param output
+	 */
 	public long computeBin(final Histogram1d<T> hist) {
 		final long[] histogram = hist.toLongArray();
 		return computeBin(histogram);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java
index 50ac37bf7..0b9569b38 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java
@@ -53,13 +53,17 @@
  * @author Gabriel Landini
  */
 @Plugin(type = Op.class, name = "threshold.minError", priority = Priority.HIGH)
-@Parameter(key = "inputHistogram")
-@Parameter(key = "output")
 public class ComputeMinErrorThreshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param inputHistogram
+	 * @param output
+	 */
 	public long computeBin(final Histogram1d<T> hist) {
 		final long[] histogram = hist.toLongArray();
 		return computeBin(histogram);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java
index ec175a1ea..7d57a82d7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java
@@ -50,13 +50,17 @@
  * @author Gabriel Landini
  */
 @Plugin(type = Op.class, name = "threshold.minimum", priority = Priority.HIGH)
-@Parameter(key = "inputHistogram")
-@Parameter(key = "output")
 public class ComputeMinimumThreshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param inputHistogram
+	 * @param output
+	 */
 	public long computeBin(final Histogram1d<T> hist) {
 		final long[] histogram = hist.toLongArray();
 		return computeBin(histogram);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java
index 51bd3a7d9..48625a5e6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java
@@ -49,13 +49,17 @@
  * @author Gabriel Landini
  */
 @Plugin(type = Op.class, name = "threshold.moments", priority = Priority.HIGH)
-@Parameter(key = "inputHistogram")
-@Parameter(key = "output")
 public class ComputeMomentsThreshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param inputHistogram
+	 * @param output
+	 */
 	public long computeBin(final Histogram1d<T> hist) {
 		final long[] histogram = hist.toLongArray();
 		return computeBin(histogram);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java
index 6fe37680c..57c7ef02e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java
@@ -49,13 +49,17 @@
  * @author Gabriel Landini
  */
 @Plugin(type = Op.class, name = "threshold.otsu", priority = Priority.HIGH)
-@Parameter(key = "inputHistogram")
-@Parameter(key = "output")
 public class ComputeOtsuThreshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param inputHistogram
+	 * @param output
+	 */
 	public long computeBin(final Histogram1d<T> hist) {
 		final long[] histogram = hist.toLongArray();
 		return computeBin(histogram);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/percentile/ComputePercentileThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/percentile/ComputePercentileThreshold.java
index 68e5a1d70..d26d8467f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/percentile/ComputePercentileThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/percentile/ComputePercentileThreshold.java
@@ -50,8 +50,6 @@
  */
 @Plugin(type = Op.class, name = "threshold.percentile",
 	priority = Priority.HIGH)
-@Parameter(key = "inputHistogram")
-@Parameter(key = "output")
 public class ComputePercentileThreshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java
index d5918ab3d..f68823971 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java
@@ -52,8 +52,6 @@
 
 @Plugin(type = Op.class, name = "threshold.renyiEntropy",
 	priority = Priority.HIGH)
-@Parameter(key = "inputHistogram")
-@Parameter(key = "output")
 public class ComputeRenyiEntropyThreshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java
index c3e36f6f8..cedff5ce3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java
@@ -51,11 +51,15 @@
  * @author Hadrien Mary
  */
 @Plugin(type = Op.class, name = "threshold.rosin", priority = Priority.HIGH)
-@Parameter(key = "inputHistogram")
-@Parameter(key = "output")
 public class ComputeRosinThreshold<T extends RealType<T>> extends AbstractComputeThresholdHistogram<T> {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param inputHistogram
+	 * @param output
+	 */
 	public long computeBin(final Histogram1d<T> histo) {
 		final long[] hist = histo.toLongArray();
 		return computeBin(hist);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java
index 24ba10cf7..806ee4a9f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java
@@ -49,13 +49,17 @@
  * @author Gabriel Landini
  */
 @Plugin(type = Op.class, name = "threshold.shanbhag", priority = Priority.HIGH)
-@Parameter(key = "inputHistogram")
-@Parameter(key = "output")
 public class ComputeShanbhagThreshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param inputHistogram
+	 * @param output
+	 */
 	public long computeBin(final Histogram1d<T> hist) {
 		final long[] histogram = hist.toLongArray();
 		return computeBin(histogram);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java
index 3e2af7d1b..95acc5294 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java
@@ -50,13 +50,17 @@
  * @author Gabriel Landini
  */
 @Plugin(type = Op.class, name = "threshold.triangle", priority = Priority.HIGH)
-@Parameter(key = "inputHistogram")
-@Parameter(key = "output")
 public class ComputeTriangleThreshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param inputHistogram
+	 * @param output
+	 */
 	public long computeBin(final Histogram1d<T> hist) {
 		final long[] histogram = hist.toLongArray();
 		return computeBin(histogram);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java
index d66f93c0a..5dfb56973 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java
@@ -50,13 +50,17 @@
  * @author Gabriel Landini
  */
 @Plugin(type = Op.class, name = "threshold.yen", priority = Priority.HIGH)
-@Parameter(key = "inputHistogram")
-@Parameter(key = "output")
 public class ComputeYenThreshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param inputHistogram
+	 * @param output
+	 */
 	public long computeBin(final Histogram1d<T> hist) {
 		final long[] histogram = hist.toLongArray();
 		return computeBin(histogram);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java
index 96859b1fd..4c6ef5303 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java
@@ -327,17 +327,21 @@ private static void generateTranslations(final long numTranslations,
 }
 
 @Plugin(type = Op.class, name = "topology.boxCount")
-@Parameter(key = "input")
-@Parameter(key = "maxSize")
-@Parameter(key = "minSize")
-@Parameter(key = "scaling")
-@Parameter(key = "gridMoves")
-@Parameter(key = "output")
 class DefaultBoxCount<B extends BooleanType<B>> implements
 	Functions.Arity5<RandomAccessibleInterval<B>, Long, Long, Double, Long, List<ValuePair<DoubleType, DoubleType>>>
 {
 
 	@Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param maxSize
+	 * @param minSize
+	 * @param scaling
+	 * @param gridMoves
+	 * @return the output
+	 */
 	public List<ValuePair<DoubleType, DoubleType>> apply(
 		RandomAccessibleInterval<B> input, Long maxSize, Long minSize,
 		Double scaling, Long gridMoves)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java
index 6ccfd1205..3d3287d5c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java
@@ -69,8 +69,6 @@
  * @author David Legland  - original MatLab implementation
  */
 @Plugin(type = Op.class, name = "topology.eulerCharacteristic26N")
-@Parameter(key = "interval")
-@Parameter(key = "output")
 public class EulerCharacteristic26N<B extends BooleanType<B>>
         implements Computers.Arity1<RandomAccessibleInterval<B>, DoubleType> {
     /** Δχ(v) for all configurations of a 2x2x2 voxel neighborhood */
@@ -94,6 +92,12 @@ public class EulerCharacteristic26N<B extends BooleanType<B>>
     };
 
     @Override
+	/**
+	 * TODO
+	 *
+	 * @param interval
+	 * @param output
+	 */
     public void compute(RandomAccessibleInterval<B> interval, DoubleType output) {
     	if(interval.numDimensions() != 3) throw new IllegalArgumentException("Input must have 3 dimensions!");
         final RandomAccess<B> access = interval.randomAccess();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java
index 38ca1ac03..5402913c1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java
@@ -71,8 +71,6 @@
  * @author Michael Doube (Royal Veterinary College, London)
  */
 @Plugin(type = Op.class, name = "topology.eulerCharacteristic26NFloating")
-@Parameter(key = "interval")
-@Parameter(key = "output")
 public class EulerCharacteristic26NFloating
         <B extends BooleanType<B>> implements Computers.Arity1<RandomAccessibleInterval<B>, DoubleType> {
     /** Δχ(v) for all configurations of a 2x2x2 voxel neighborhood */
@@ -216,6 +214,12 @@ public class EulerCharacteristic26NFloating
     //endregion
 
     @Override
+	/**
+	 * TODO
+	 *
+	 * @param interval
+	 * @param output
+	 */
     public void compute(RandomAccessibleInterval<B> interval, DoubleType output) {
     	if(interval.numDimensions() != 3) throw new IllegalArgumentException("Input must have 3 dimensions!");
         final Octant<B> octant = new Octant<>(interval);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java
index efa1c9083..bd17dd978 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java
@@ -71,12 +71,16 @@
  * NB: Methods are public and static to help testing
  */
 @Plugin(type = Op.class, name = "topology.eulerCorrection")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class EulerCorrection<B extends BooleanType<B>>
         implements Computers.Arity1<RandomAccessibleInterval<B>, DoubleType> {
 
     @Override
+	/**
+	 * TODO
+	 *
+	 * @param input
+	 * @param output
+	 */
     public void compute(RandomAccessibleInterval<B> interval, DoubleType output) {
     	if(interval.numDimensions() != 3) throw new IllegalArgumentException("Input must have 3 dimensions!");
         final Traverser<B> traverser = new Traverser<>(interval);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java
index 906cd81de..2213c607e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java
@@ -30,8 +30,6 @@
 public class LiftComputersToRAI<I1, I2, I3, I4, I5, I6, O> {
 
 	@OpField(names = "adapt", priority = Priority.HIGH)
-	@Parameter(key = "from")
-	@Parameter(key = "to")
 	public final Function<Computers.Arity1<I1, O>, Computers.Arity1<RandomAccessibleInterval<I1>, RandomAccessibleInterval<O>>> lift1 =
 		(computer) -> {
 			return (raiInput, raiOutput) -> {
@@ -41,8 +39,6 @@ public class LiftComputersToRAI<I1, I2, I3, I4, I5, I6, O> {
 		};
 
 	@OpField(names = "adapt", priority = Priority.HIGH)
-	@Parameter(key = "from")
-	@Parameter(key = "to")
 	public final Function<Computers.Arity2<I1, I2, O>, Computers.Arity2<RandomAccessibleInterval<I1>, RandomAccessibleInterval<I2>, RandomAccessibleInterval<O>>> lift2 =
 		(computer) -> {
 			return (raiInput1, raiInput2, raiOutput) -> {
@@ -52,8 +48,6 @@ public class LiftComputersToRAI<I1, I2, I3, I4, I5, I6, O> {
 		};
 
 	@OpField(names = "adapt", priority = Priority.HIGH)
-	@Parameter(key = "from")
-	@Parameter(key = "to")
 	public final Function<Computers.Arity3<I1, I2, I3, O>, Computers.Arity3<RandomAccessibleInterval<I1>, RandomAccessibleInterval<I2>, RandomAccessibleInterval<I3>, RandomAccessibleInterval<O>>> lift3 =
 		(computer) -> {
 			return (raiInput1, raiInput2, raiInput3, raiOutput) -> {
@@ -64,8 +58,6 @@ public class LiftComputersToRAI<I1, I2, I3, I4, I5, I6, O> {
 		};
 
 	@OpField(names = "adapt", priority = Priority.HIGH)
-	@Parameter(key = "from")
-	@Parameter(key = "to")
 	public final Function<Computers.Arity4<I1, I2, I3, I4, O>, Computers.Arity4<RandomAccessibleInterval<I1>, RandomAccessibleInterval<I2>, RandomAccessibleInterval<I3>, RandomAccessibleInterval<I4>, RandomAccessibleInterval<O>>> lift4 =
 		(computer) -> {
 			return (raiInput1, raiInput2, raiInput3, raiInput4, raiOutput) -> {
@@ -76,8 +68,6 @@ public class LiftComputersToRAI<I1, I2, I3, I4, I5, I6, O> {
 		};
 
 	@OpField(names = "adapt", priority = Priority.HIGH)
-	@Parameter(key = "from")
-	@Parameter(key = "to")
 	public final Function<Computers.Arity5<I1, I2, I3, I4, I5, O>, Computers.Arity5<RandomAccessibleInterval<I1>, RandomAccessibleInterval<I2>, RandomAccessibleInterval<I3>, RandomAccessibleInterval<I4>, RandomAccessibleInterval<I5>, RandomAccessibleInterval<O>>> lift5 =
 		(computer) -> {
 			return (raiInput1, raiInput2, raiInput3, raiInput4, raiInput5,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java
index 34a8f0122..60177b1f7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java
@@ -42,8 +42,6 @@
 public class LiftFunctionsToRAI<I1, I2, I3, I4, I5, O extends Type<O>> {
 
 	@OpField(names = "adapt", priority = Priority.HIGH)
-	@Parameter(key = "from")
-	@Parameter(key = "to")
 	public final Function<Function<I1, O>, Function<RandomAccessibleInterval<I1>, RandomAccessibleInterval<O>>> lift1 =
 		(function) -> {
 			return (raiInput) -> {
@@ -57,8 +55,6 @@ public class LiftFunctionsToRAI<I1, I2, I3, I4, I5, O extends Type<O>> {
 		};
 
 	@OpField(names = "adapt")
-	@Parameter(key = "from")
-	@Parameter(key = "to")
 	public final Function<BiFunction<I1, I2, O>, BiFunction<RandomAccessibleInterval<I1>, RandomAccessibleInterval<I2>, RandomAccessibleInterval<O>>> lift2 =
 		(function) -> {
 			return (raiInput1, raiInput2) -> {
@@ -73,8 +69,6 @@ public class LiftFunctionsToRAI<I1, I2, I3, I4, I5, O extends Type<O>> {
 		};
 
 	@OpField(names = "adapt")
-	@Parameter(key = "from")
-	@Parameter(key = "to")
 	public final Function<Functions.Arity3<I1, I2, I3, O>, Functions.Arity3<RandomAccessibleInterval<I1>, RandomAccessibleInterval<I2>, RandomAccessibleInterval<I3>, RandomAccessibleInterval<O>>> lift3 =
 		(function) -> {
 			return (raiInput1, raiInput2, raiInput3) -> {
@@ -90,8 +84,6 @@ public class LiftFunctionsToRAI<I1, I2, I3, I4, I5, O extends Type<O>> {
 		};
 
 		@OpField(names = "adapt")
-		@Parameter(key = "from")
-		@Parameter(key = "to")
 		public final Function<Functions.Arity4<I1, I2, I3, I4, O>, Functions.Arity4<RandomAccessibleInterval<I1>, RandomAccessibleInterval<I2>, RandomAccessibleInterval<I3>, RandomAccessibleInterval<I4>, RandomAccessibleInterval<O>>> lift4 =
 			(function) -> {
 				return (raiInput1, raiInput2, raiInput3, raiInput4) -> {
@@ -108,9 +100,7 @@ public class LiftFunctionsToRAI<I1, I2, I3, I4, I5, O extends Type<O>> {
 			};
 
 		@OpField(names = "adapt")
-	@Parameter(key = "from")
-	@Parameter(key = "to")
-	public final Function<Functions.Arity5<I1, I2, I3, I4, I5, O>, Functions.Arity5<RandomAccessibleInterval<I1>, RandomAccessibleInterval<I2>, RandomAccessibleInterval<I3>, RandomAccessibleInterval<I4>, RandomAccessibleInterval<I5>, RandomAccessibleInterval<O>>> lift5 =
+		public final Function<Functions.Arity5<I1, I2, I3, I4, I5, O>, Functions.Arity5<RandomAccessibleInterval<I1>, RandomAccessibleInterval<I2>, RandomAccessibleInterval<I3>, RandomAccessibleInterval<I4>, RandomAccessibleInterval<I5>, RandomAccessibleInterval<O>>> lift5 =
 		(function) -> {
 			return (raiInput1, raiInput2, raiInput3, raiInput4, raiInput5) -> {
 				O outType = function.apply(Util.getTypeFromInterval(raiInput1), Util
diff --git a/remove-params.sh b/remove-params.sh
new file mode 100644
index 000000000..450fa2417
--- /dev/null
+++ b/remove-params.sh
@@ -0,0 +1,8 @@
+#perl -0777 -i -pe 's/(\@plugin[^\n]*\n)\@Parameter.key = "([^"]*)".\n/\1\/**\n * TODO\n *\n * \@param \2\n/igs' **/*.java
+#perl -0777 -i -pe 's/\@Parameter.key = "([^"]*)"[^\n]*.\n/ * \@param \1\n/igs' **/*.java
+#perl -0777 -i -pe 's/( \* \@param[^\n]*\n)([^ ])/\1 *\/\n\2/igs' **/*.java
+#perl -0777 -i -pe 's/ \*\/\n([\s]*[\*])/\1/igs' **/*.java
+#perl -0777 -i -pe 's/ \*\/\n([\s]*\@Parameter)/\1/igs' **/*.java
+#perl -0777 -i -pe 's/ \*\/\n([\s]*\/\/[\s]*\*)/\1/igs' **/*.java
+perl -0777 -i -pe 's/ \* \@param output([^\n]*\n[\s]*\*\/\n[\s]*public[^\(]*apply\()/ \* \@return the output\1/igs' **/*.java
+
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java
index 9a4bbae1c..665eadafc 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java
@@ -76,7 +76,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
@@ -88,8 +87,6 @@
 public class ComputersToFunctionsAndLift {
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer1ToFunction1AndLiftViaSource<I, O>
 			implements Function<Computers.Arity1<I, O>, Function<Iterable<I>, Iterable<O>>> {
 
@@ -98,6 +95,10 @@ public static class Computer1ToFunction1AndLiftViaSource<I, O>
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Function<I, O>, Function<Iterable<I>, Iterable<O>>> lifter;
 
+		/**
+		 * @param computer the Computer to convert
+		 * @return {@code computer} as a Function
+		 */
 		@Override
 		public Function<Iterable<I>, Iterable<O>> apply(Computers.Arity1<I, O> computer) {
 			return lifter.apply(adaptor.apply(computer));
@@ -106,8 +107,6 @@ public Function<Iterable<I>, Iterable<O>> apply(Computers.Arity1<I, O> computer)
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer2ToFunction2AndLiftViaSource<I1, I2, O>
 			implements Function<Computers.Arity2<I1, I2, O>, BiFunction<Iterable<I1>, Iterable<I2>, Iterable<O>>> {
 
@@ -116,6 +115,10 @@ public static class Computer2ToFunction2AndLiftViaSource<I1, I2, O>
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<BiFunction<I1, I2, O>, BiFunction<Iterable<I1>, Iterable<I2>, Iterable<O>>> lifter;
 
+		/**
+		 * @param computer the Computer to convert
+		 * @return {@code computer} as a Function
+		 */
 		@Override
 		public BiFunction<Iterable<I1>, Iterable<I2>, Iterable<O>> apply(Computers.Arity2<I1, I2, O> computer) {
 			return lifter.apply(adaptor.apply(computer));
@@ -124,8 +127,6 @@ public BiFunction<Iterable<I1>, Iterable<I2>, Iterable<O>> apply(Computers.Arity
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer3ToFunction3AndLiftViaSource<I1, I2, I3, O>
 			implements Function<Computers.Arity3<I1, I2, I3, O>, Functions.Arity3<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<O>>> {
 
@@ -134,6 +135,10 @@ public static class Computer3ToFunction3AndLiftViaSource<I1, I2, I3, O>
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Functions.Arity3<I1, I2, I3, O>, Functions.Arity3<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<O>>> lifter;
 
+		/**
+		 * @param computer the Computer to convert
+		 * @return {@code computer} as a Function
+		 */
 		@Override
 		public Functions.Arity3<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<O>> apply(Computers.Arity3<I1, I2, I3, O> computer) {
 			return lifter.apply(adaptor.apply(computer));
@@ -142,8 +147,6 @@ public Functions.Arity3<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<O>> a
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer4ToFunction4AndLiftViaSource<I1, I2, I3, I4, O>
 			implements Function<Computers.Arity4<I1, I2, I3, I4, O>, Functions.Arity4<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<O>>> {
 
@@ -152,6 +155,10 @@ public static class Computer4ToFunction4AndLiftViaSource<I1, I2, I3, I4, O>
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Functions.Arity4<I1, I2, I3, I4, O>, Functions.Arity4<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<O>>> lifter;
 
+		/**
+		 * @param computer the Computer to convert
+		 * @return {@code computer} as a Function
+		 */
 		@Override
 		public Functions.Arity4<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<O>> apply(Computers.Arity4<I1, I2, I3, I4, O> computer) {
 			return lifter.apply(adaptor.apply(computer));
@@ -160,8 +167,6 @@ public Functions.Arity4<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer5ToFunction5AndLiftViaSource<I1, I2, I3, I4, I5, O>
 			implements Function<Computers.Arity5<I1, I2, I3, I4, I5, O>, Functions.Arity5<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<O>>> {
 
@@ -170,6 +175,10 @@ public static class Computer5ToFunction5AndLiftViaSource<I1, I2, I3, I4, I5, O>
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Functions.Arity5<I1, I2, I3, I4, I5, O>, Functions.Arity5<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<O>>> lifter;
 
+		/**
+		 * @param computer the Computer to convert
+		 * @return {@code computer} as a Function
+		 */
 		@Override
 		public Functions.Arity5<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<O>> apply(Computers.Arity5<I1, I2, I3, I4, I5, O> computer) {
 			return lifter.apply(adaptor.apply(computer));
@@ -178,8 +187,6 @@ public Functions.Arity5<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer6ToFunction6AndLiftViaSource<I1, I2, I3, I4, I5, I6, O>
 			implements Function<Computers.Arity6<I1, I2, I3, I4, I5, I6, O>, Functions.Arity6<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<O>>> {
 
@@ -188,6 +195,10 @@ public static class Computer6ToFunction6AndLiftViaSource<I1, I2, I3, I4, I5, I6,
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Functions.Arity6<I1, I2, I3, I4, I5, I6, O>, Functions.Arity6<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<O>>> lifter;
 
+		/**
+		 * @param computer the Computer to convert
+		 * @return {@code computer} as a Function
+		 */
 		@Override
 		public Functions.Arity6<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<O>> apply(Computers.Arity6<I1, I2, I3, I4, I5, I6, O> computer) {
 			return lifter.apply(adaptor.apply(computer));
@@ -196,8 +207,6 @@ public Functions.Arity6<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer7ToFunction7AndLiftViaSource<I1, I2, I3, I4, I5, I6, I7, O>
 			implements Function<Computers.Arity7<I1, I2, I3, I4, I5, I6, I7, O>, Functions.Arity7<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<O>>> {
 
@@ -206,6 +215,10 @@ public static class Computer7ToFunction7AndLiftViaSource<I1, I2, I3, I4, I5, I6,
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Functions.Arity7<I1, I2, I3, I4, I5, I6, I7, O>, Functions.Arity7<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<O>>> lifter;
 
+		/**
+		 * @param computer the Computer to convert
+		 * @return {@code computer} as a Function
+		 */
 		@Override
 		public Functions.Arity7<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<O>> apply(Computers.Arity7<I1, I2, I3, I4, I5, I6, I7, O> computer) {
 			return lifter.apply(adaptor.apply(computer));
@@ -214,8 +227,6 @@ public Functions.Arity7<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer8ToFunction8AndLiftViaSource<I1, I2, I3, I4, I5, I6, I7, I8, O>
 			implements Function<Computers.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O>, Functions.Arity8<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<O>>> {
 
@@ -224,6 +235,10 @@ public static class Computer8ToFunction8AndLiftViaSource<I1, I2, I3, I4, I5, I6,
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O>, Functions.Arity8<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<O>>> lifter;
 
+		/**
+		 * @param computer the Computer to convert
+		 * @return {@code computer} as a Function
+		 */
 		@Override
 		public Functions.Arity8<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<O>> apply(Computers.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> computer) {
 			return lifter.apply(adaptor.apply(computer));
@@ -232,8 +247,6 @@ public Functions.Arity8<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer9ToFunction9AndLiftViaSource<I1, I2, I3, I4, I5, I6, I7, I8, I9, O>
 			implements Function<Computers.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O>, Functions.Arity9<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<O>>> {
 
@@ -242,6 +255,10 @@ public static class Computer9ToFunction9AndLiftViaSource<I1, I2, I3, I4, I5, I6,
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O>, Functions.Arity9<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<O>>> lifter;
 
+		/**
+		 * @param computer the Computer to convert
+		 * @return {@code computer} as a Function
+		 */
 		@Override
 		public Functions.Arity9<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<O>> apply(Computers.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> computer) {
 			return lifter.apply(adaptor.apply(computer));
@@ -250,8 +267,6 @@ public Functions.Arity9<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer10ToFunction10AndLiftViaSource<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O>
 			implements Function<Computers.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O>, Functions.Arity10<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<O>>> {
 
@@ -260,6 +275,10 @@ public static class Computer10ToFunction10AndLiftViaSource<I1, I2, I3, I4, I5, I
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O>, Functions.Arity10<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<O>>> lifter;
 
+		/**
+		 * @param computer the Computer to convert
+		 * @return {@code computer} as a Function
+		 */
 		@Override
 		public Functions.Arity10<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<O>> apply(Computers.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> computer) {
 			return lifter.apply(adaptor.apply(computer));
@@ -268,8 +287,6 @@ public Functions.Arity10<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer11ToFunction11AndLiftViaSource<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O>
 			implements Function<Computers.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O>, Functions.Arity11<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<O>>> {
 
@@ -278,6 +295,10 @@ public static class Computer11ToFunction11AndLiftViaSource<I1, I2, I3, I4, I5, I
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O>, Functions.Arity11<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<O>>> lifter;
 
+		/**
+		 * @param computer the Computer to convert
+		 * @return {@code computer} as a Function
+		 */
 		@Override
 		public Functions.Arity11<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<O>> apply(Computers.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> computer) {
 			return lifter.apply(adaptor.apply(computer));
@@ -286,8 +307,6 @@ public Functions.Arity11<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer12ToFunction12AndLiftViaSource<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O>
 			implements Function<Computers.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O>, Functions.Arity12<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<O>>> {
 
@@ -296,6 +315,10 @@ public static class Computer12ToFunction12AndLiftViaSource<I1, I2, I3, I4, I5, I
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O>, Functions.Arity12<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<O>>> lifter;
 
+		/**
+		 * @param computer the Computer to convert
+		 * @return {@code computer} as a Function
+		 */
 		@Override
 		public Functions.Arity12<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<O>> apply(Computers.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> computer) {
 			return lifter.apply(adaptor.apply(computer));
@@ -304,8 +327,6 @@ public Functions.Arity12<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer13ToFunction13AndLiftViaSource<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O>
 			implements Function<Computers.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O>, Functions.Arity13<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<O>>> {
 
@@ -314,6 +335,10 @@ public static class Computer13ToFunction13AndLiftViaSource<I1, I2, I3, I4, I5, I
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O>, Functions.Arity13<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<O>>> lifter;
 
+		/**
+		 * @param computer the Computer to convert
+		 * @return {@code computer} as a Function
+		 */
 		@Override
 		public Functions.Arity13<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<O>> apply(Computers.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> computer) {
 			return lifter.apply(adaptor.apply(computer));
@@ -322,8 +347,6 @@ public Functions.Arity13<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer14ToFunction14AndLiftViaSource<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O>
 			implements Function<Computers.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O>, Functions.Arity14<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<O>>> {
 
@@ -332,6 +355,10 @@ public static class Computer14ToFunction14AndLiftViaSource<I1, I2, I3, I4, I5, I
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O>, Functions.Arity14<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<O>>> lifter;
 
+		/**
+		 * @param computer the Computer to convert
+		 * @return {@code computer} as a Function
+		 */
 		@Override
 		public Functions.Arity14<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<O>> apply(Computers.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> computer) {
 			return lifter.apply(adaptor.apply(computer));
@@ -340,8 +367,6 @@ public Functions.Arity14<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer15ToFunction15AndLiftViaSource<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O>
 			implements Function<Computers.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O>, Functions.Arity15<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<I15>, Iterable<O>>> {
 
@@ -350,6 +375,10 @@ public static class Computer15ToFunction15AndLiftViaSource<I1, I2, I3, I4, I5, I
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O>, Functions.Arity15<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<I15>, Iterable<O>>> lifter;
 
+		/**
+		 * @param computer the Computer to convert
+		 * @return {@code computer} as a Function
+		 */
 		@Override
 		public Functions.Arity15<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<I15>, Iterable<O>> apply(Computers.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> computer) {
 			return lifter.apply(adaptor.apply(computer));
@@ -358,8 +387,6 @@ public Functions.Arity15<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer16ToFunction16AndLiftViaSource<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O>
 			implements Function<Computers.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O>, Functions.Arity16<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<I15>, Iterable<I16>, Iterable<O>>> {
 
@@ -368,6 +395,10 @@ public static class Computer16ToFunction16AndLiftViaSource<I1, I2, I3, I4, I5, I
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O>, Functions.Arity16<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<I15>, Iterable<I16>, Iterable<O>>> lifter;
 
+		/**
+		 * @param computer the Computer to convert
+		 * @return {@code computer} as a Function
+		 */
 		@Override
 		public Functions.Arity16<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<I15>, Iterable<I16>, Iterable<O>> apply(Computers.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> computer) {
 			return lifter.apply(adaptor.apply(computer));
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java
index 6dcf8b8b2..3ec18b5e8 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java
@@ -42,7 +42,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
@@ -55,8 +54,6 @@
 public class FunctionsToComputersAndLift {
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function1ToComputer1AndLiftAfter<I, O> implements
 		Function<Function<I, O>, Computers.Arity1<Iterable<I>, Iterable<O>>>
 	{
@@ -66,6 +63,10 @@ public static class Function1ToComputer1AndLiftAfter<I, O> implements
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Computers.Arity1<I, O>, Computers.Arity1<Iterable<I>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity1<Iterable<I>, Iterable<O>> apply(
 			Function<I, O> function)
@@ -76,8 +77,6 @@ public Computers.Arity1<Iterable<I>, Iterable<O>> apply(
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW + 1)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function1ToComputer1AndLiftBefore<I, O> implements
 		Function<Function<I, O>, Computers.Arity1<Iterable<I>, Iterable<O>>>
 	{
@@ -87,6 +86,10 @@ public static class Function1ToComputer1AndLiftBefore<I, O> implements
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Function<I, O>, Function<Iterable<I>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity1<Iterable<I>, Iterable<O>> apply(
 			Function<I, O> function)
@@ -97,8 +100,6 @@ public Computers.Arity1<Iterable<I>, Iterable<O>> apply(
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function2ToComputer2AndLiftAfter<I1, I2, O> implements
 		Function<BiFunction<I1, I2, O>, Computers.Arity2<Iterable<I1>, Iterable<I2>, Iterable<O>>>
 	{
@@ -108,6 +109,10 @@ public static class Function2ToComputer2AndLiftAfter<I1, I2, O> implements
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Computers.Arity2<I1, I2, O>, Computers.Arity2<Iterable<I1>, Iterable<I2>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity2<Iterable<I1>, Iterable<I2>, Iterable<O>> apply(
 			BiFunction<I1, I2, O> function)
@@ -118,8 +123,6 @@ public Computers.Arity2<Iterable<I1>, Iterable<I2>, Iterable<O>> apply(
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW + 1)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function2ToComputer2AndLiftBefore<I1, I2, O> implements
 		Function<BiFunction<I1, I2, O>, Computers.Arity2<Iterable<I1>, Iterable<I2>, Iterable<O>>>
 	{
@@ -129,6 +132,10 @@ public static class Function2ToComputer2AndLiftBefore<I1, I2, O> implements
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<BiFunction<I1, I2, O>, BiFunction<Iterable<I1>, Iterable<I2>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity2<Iterable<I1>, Iterable<I2>, Iterable<O>> apply(
 			BiFunction<I1, I2, O> function)
@@ -139,8 +146,6 @@ public Computers.Arity2<Iterable<I1>, Iterable<I2>, Iterable<O>> apply(
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function3ToComputer3AndLiftAfter<I1, I2, I3, O> implements
 		Function<Functions.Arity3<I1, I2, I3, O>, Computers.Arity3<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<O>>>
 	{
@@ -150,6 +155,10 @@ public static class Function3ToComputer3AndLiftAfter<I1, I2, I3, O> implements
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Computers.Arity3<I1, I2, I3, O>, Computers.Arity3<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity3<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<O>> apply(
 			Functions.Arity3<I1, I2, I3, O> function)
@@ -160,8 +169,6 @@ public Computers.Arity3<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<O>> a
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW + 1)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function3ToComputer3AndLiftBefore<I1, I2, I3, O> implements
 		Function<Functions.Arity3<I1, I2, I3, O>, Computers.Arity3<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<O>>>
 	{
@@ -171,6 +178,10 @@ public static class Function3ToComputer3AndLiftBefore<I1, I2, I3, O> implements
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Functions.Arity3<I1, I2, I3, O>, Functions.Arity3<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity3<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<O>> apply(
 			Functions.Arity3<I1, I2, I3, O> function)
@@ -181,8 +192,6 @@ public Computers.Arity3<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<O>> a
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function4ToComputer4AndLiftAfter<I1, I2, I3, I4, O> implements
 		Function<Functions.Arity4<I1, I2, I3, I4, O>, Computers.Arity4<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<O>>>
 	{
@@ -192,6 +201,10 @@ public static class Function4ToComputer4AndLiftAfter<I1, I2, I3, I4, O> implemen
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Computers.Arity4<I1, I2, I3, I4, O>, Computers.Arity4<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity4<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<O>> apply(
 			Functions.Arity4<I1, I2, I3, I4, O> function)
@@ -202,8 +215,6 @@ public Computers.Arity4<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW + 1)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function4ToComputer4AndLiftBefore<I1, I2, I3, I4, O> implements
 		Function<Functions.Arity4<I1, I2, I3, I4, O>, Computers.Arity4<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<O>>>
 	{
@@ -213,6 +224,10 @@ public static class Function4ToComputer4AndLiftBefore<I1, I2, I3, I4, O> impleme
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Functions.Arity4<I1, I2, I3, I4, O>, Functions.Arity4<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity4<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<O>> apply(
 			Functions.Arity4<I1, I2, I3, I4, O> function)
@@ -223,8 +238,6 @@ public Computers.Arity4<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function5ToComputer5AndLiftAfter<I1, I2, I3, I4, I5, O> implements
 		Function<Functions.Arity5<I1, I2, I3, I4, I5, O>, Computers.Arity5<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<O>>>
 	{
@@ -234,6 +247,10 @@ public static class Function5ToComputer5AndLiftAfter<I1, I2, I3, I4, I5, O> impl
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Computers.Arity5<I1, I2, I3, I4, I5, O>, Computers.Arity5<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity5<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<O>> apply(
 			Functions.Arity5<I1, I2, I3, I4, I5, O> function)
@@ -244,8 +261,6 @@ public Computers.Arity5<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW + 1)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function5ToComputer5AndLiftBefore<I1, I2, I3, I4, I5, O> implements
 		Function<Functions.Arity5<I1, I2, I3, I4, I5, O>, Computers.Arity5<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<O>>>
 	{
@@ -255,6 +270,10 @@ public static class Function5ToComputer5AndLiftBefore<I1, I2, I3, I4, I5, O> imp
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Functions.Arity5<I1, I2, I3, I4, I5, O>, Functions.Arity5<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity5<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<O>> apply(
 			Functions.Arity5<I1, I2, I3, I4, I5, O> function)
@@ -265,8 +284,6 @@ public Computers.Arity5<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function6ToComputer6AndLiftAfter<I1, I2, I3, I4, I5, I6, O> implements
 		Function<Functions.Arity6<I1, I2, I3, I4, I5, I6, O>, Computers.Arity6<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<O>>>
 	{
@@ -276,6 +293,10 @@ public static class Function6ToComputer6AndLiftAfter<I1, I2, I3, I4, I5, I6, O>
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Computers.Arity6<I1, I2, I3, I4, I5, I6, O>, Computers.Arity6<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity6<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<O>> apply(
 			Functions.Arity6<I1, I2, I3, I4, I5, I6, O> function)
@@ -286,8 +307,6 @@ public Computers.Arity6<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW + 1)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function6ToComputer6AndLiftBefore<I1, I2, I3, I4, I5, I6, O> implements
 		Function<Functions.Arity6<I1, I2, I3, I4, I5, I6, O>, Computers.Arity6<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<O>>>
 	{
@@ -297,6 +316,10 @@ public static class Function6ToComputer6AndLiftBefore<I1, I2, I3, I4, I5, I6, O>
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Functions.Arity6<I1, I2, I3, I4, I5, I6, O>, Functions.Arity6<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity6<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<O>> apply(
 			Functions.Arity6<I1, I2, I3, I4, I5, I6, O> function)
@@ -307,8 +330,6 @@ public Computers.Arity6<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function7ToComputer7AndLiftAfter<I1, I2, I3, I4, I5, I6, I7, O> implements
 		Function<Functions.Arity7<I1, I2, I3, I4, I5, I6, I7, O>, Computers.Arity7<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<O>>>
 	{
@@ -318,6 +339,10 @@ public static class Function7ToComputer7AndLiftAfter<I1, I2, I3, I4, I5, I6, I7,
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Computers.Arity7<I1, I2, I3, I4, I5, I6, I7, O>, Computers.Arity7<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity7<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<O>> apply(
 			Functions.Arity7<I1, I2, I3, I4, I5, I6, I7, O> function)
@@ -328,8 +353,6 @@ public Computers.Arity7<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW + 1)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function7ToComputer7AndLiftBefore<I1, I2, I3, I4, I5, I6, I7, O> implements
 		Function<Functions.Arity7<I1, I2, I3, I4, I5, I6, I7, O>, Computers.Arity7<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<O>>>
 	{
@@ -339,6 +362,10 @@ public static class Function7ToComputer7AndLiftBefore<I1, I2, I3, I4, I5, I6, I7
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Functions.Arity7<I1, I2, I3, I4, I5, I6, I7, O>, Functions.Arity7<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity7<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<O>> apply(
 			Functions.Arity7<I1, I2, I3, I4, I5, I6, I7, O> function)
@@ -349,8 +376,6 @@ public Computers.Arity7<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function8ToComputer8AndLiftAfter<I1, I2, I3, I4, I5, I6, I7, I8, O> implements
 		Function<Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O>, Computers.Arity8<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<O>>>
 	{
@@ -360,6 +385,10 @@ public static class Function8ToComputer8AndLiftAfter<I1, I2, I3, I4, I5, I6, I7,
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Computers.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O>, Computers.Arity8<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity8<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<O>> apply(
 			Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> function)
@@ -370,8 +399,6 @@ public Computers.Arity8<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW + 1)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function8ToComputer8AndLiftBefore<I1, I2, I3, I4, I5, I6, I7, I8, O> implements
 		Function<Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O>, Computers.Arity8<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<O>>>
 	{
@@ -381,6 +408,10 @@ public static class Function8ToComputer8AndLiftBefore<I1, I2, I3, I4, I5, I6, I7
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O>, Functions.Arity8<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity8<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<O>> apply(
 			Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> function)
@@ -391,8 +422,6 @@ public Computers.Arity8<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function9ToComputer9AndLiftAfter<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> implements
 		Function<Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O>, Computers.Arity9<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<O>>>
 	{
@@ -402,6 +431,10 @@ public static class Function9ToComputer9AndLiftAfter<I1, I2, I3, I4, I5, I6, I7,
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Computers.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O>, Computers.Arity9<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity9<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<O>> apply(
 			Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> function)
@@ -412,8 +445,6 @@ public Computers.Arity9<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW + 1)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function9ToComputer9AndLiftBefore<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> implements
 		Function<Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O>, Computers.Arity9<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<O>>>
 	{
@@ -423,6 +454,10 @@ public static class Function9ToComputer9AndLiftBefore<I1, I2, I3, I4, I5, I6, I7
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O>, Functions.Arity9<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity9<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<O>> apply(
 			Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> function)
@@ -433,8 +468,6 @@ public Computers.Arity9<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function10ToComputer10AndLiftAfter<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> implements
 		Function<Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O>, Computers.Arity10<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<O>>>
 	{
@@ -444,6 +477,10 @@ public static class Function10ToComputer10AndLiftAfter<I1, I2, I3, I4, I5, I6, I
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Computers.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O>, Computers.Arity10<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity10<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<O>> apply(
 			Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> function)
@@ -454,8 +491,6 @@ public Computers.Arity10<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW + 1)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function10ToComputer10AndLiftBefore<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> implements
 		Function<Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O>, Computers.Arity10<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<O>>>
 	{
@@ -465,6 +500,10 @@ public static class Function10ToComputer10AndLiftBefore<I1, I2, I3, I4, I5, I6,
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O>, Functions.Arity10<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity10<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<O>> apply(
 			Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> function)
@@ -475,8 +514,6 @@ public Computers.Arity10<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function11ToComputer11AndLiftAfter<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> implements
 		Function<Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O>, Computers.Arity11<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<O>>>
 	{
@@ -486,6 +523,10 @@ public static class Function11ToComputer11AndLiftAfter<I1, I2, I3, I4, I5, I6, I
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Computers.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O>, Computers.Arity11<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity11<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<O>> apply(
 			Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> function)
@@ -496,8 +537,6 @@ public Computers.Arity11<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW + 1)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function11ToComputer11AndLiftBefore<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> implements
 		Function<Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O>, Computers.Arity11<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<O>>>
 	{
@@ -507,6 +546,10 @@ public static class Function11ToComputer11AndLiftBefore<I1, I2, I3, I4, I5, I6,
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O>, Functions.Arity11<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity11<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<O>> apply(
 			Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> function)
@@ -517,8 +560,6 @@ public Computers.Arity11<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function12ToComputer12AndLiftAfter<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> implements
 		Function<Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O>, Computers.Arity12<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<O>>>
 	{
@@ -528,6 +569,10 @@ public static class Function12ToComputer12AndLiftAfter<I1, I2, I3, I4, I5, I6, I
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Computers.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O>, Computers.Arity12<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity12<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<O>> apply(
 			Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> function)
@@ -538,8 +583,6 @@ public Computers.Arity12<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW + 1)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function12ToComputer12AndLiftBefore<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> implements
 		Function<Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O>, Computers.Arity12<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<O>>>
 	{
@@ -549,6 +592,10 @@ public static class Function12ToComputer12AndLiftBefore<I1, I2, I3, I4, I5, I6,
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O>, Functions.Arity12<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity12<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<O>> apply(
 			Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> function)
@@ -559,8 +606,6 @@ public Computers.Arity12<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function13ToComputer13AndLiftAfter<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> implements
 		Function<Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O>, Computers.Arity13<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<O>>>
 	{
@@ -570,6 +615,10 @@ public static class Function13ToComputer13AndLiftAfter<I1, I2, I3, I4, I5, I6, I
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Computers.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O>, Computers.Arity13<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity13<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<O>> apply(
 			Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> function)
@@ -580,8 +629,6 @@ public Computers.Arity13<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW + 1)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function13ToComputer13AndLiftBefore<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> implements
 		Function<Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O>, Computers.Arity13<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<O>>>
 	{
@@ -591,6 +638,10 @@ public static class Function13ToComputer13AndLiftBefore<I1, I2, I3, I4, I5, I6,
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O>, Functions.Arity13<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity13<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<O>> apply(
 			Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> function)
@@ -601,8 +652,6 @@ public Computers.Arity13<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function14ToComputer14AndLiftAfter<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> implements
 		Function<Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O>, Computers.Arity14<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<O>>>
 	{
@@ -612,6 +661,10 @@ public static class Function14ToComputer14AndLiftAfter<I1, I2, I3, I4, I5, I6, I
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Computers.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O>, Computers.Arity14<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity14<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<O>> apply(
 			Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> function)
@@ -622,8 +675,6 @@ public Computers.Arity14<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW + 1)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function14ToComputer14AndLiftBefore<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> implements
 		Function<Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O>, Computers.Arity14<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<O>>>
 	{
@@ -633,6 +684,10 @@ public static class Function14ToComputer14AndLiftBefore<I1, I2, I3, I4, I5, I6,
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O>, Functions.Arity14<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity14<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<O>> apply(
 			Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> function)
@@ -643,8 +698,6 @@ public Computers.Arity14<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function15ToComputer15AndLiftAfter<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> implements
 		Function<Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O>, Computers.Arity15<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<I15>, Iterable<O>>>
 	{
@@ -654,6 +707,10 @@ public static class Function15ToComputer15AndLiftAfter<I1, I2, I3, I4, I5, I6, I
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Computers.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O>, Computers.Arity15<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<I15>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity15<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<I15>, Iterable<O>> apply(
 			Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> function)
@@ -664,8 +721,6 @@ public Computers.Arity15<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW + 1)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function15ToComputer15AndLiftBefore<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> implements
 		Function<Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O>, Computers.Arity15<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<I15>, Iterable<O>>>
 	{
@@ -675,6 +730,10 @@ public static class Function15ToComputer15AndLiftBefore<I1, I2, I3, I4, I5, I6,
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O>, Functions.Arity15<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<I15>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity15<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<I15>, Iterable<O>> apply(
 			Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> function)
@@ -685,8 +744,6 @@ public Computers.Arity15<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function16ToComputer16AndLiftAfter<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> implements
 		Function<Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O>, Computers.Arity16<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<I15>, Iterable<I16>, Iterable<O>>>
 	{
@@ -696,6 +753,10 @@ public static class Function16ToComputer16AndLiftAfter<I1, I2, I3, I4, I5, I6, I
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Computers.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O>, Computers.Arity16<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<I15>, Iterable<I16>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity16<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<I15>, Iterable<I16>, Iterable<O>> apply(
 			Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> function)
@@ -706,8 +767,6 @@ public Computers.Arity16<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW + 1)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function16ToComputer16AndLiftBefore<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> implements
 		Function<Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O>, Computers.Arity16<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<I15>, Iterable<I16>, Iterable<O>>>
 	{
@@ -717,6 +776,10 @@ public static class Function16ToComputer16AndLiftBefore<I1, I2, I3, I4, I5, I6,
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O>, Functions.Arity16<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<I15>, Iterable<I16>, Iterable<O>>> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public Computers.Arity16<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<I15>, Iterable<I16>, Iterable<O>> apply(
 			Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> function)
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java
index 917007c54..67e06bcb0 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java
@@ -41,7 +41,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
@@ -54,14 +53,16 @@
 public class ComputersToFunctionsViaFunction {
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer1ToFunction1ViaFunction<I, O>
 			implements Function<Computers.Arity1<I, O>, Function<I, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Function<I, O> creator;
 
+		/**
+		 * @param computer the Computer to adapt
+		 * @return computer, adapted into a Function
+		 */
 		@Override
 		public Function<I, O> apply(Computers.Arity1<I, O> computer) {
 			return (in) -> {
@@ -74,14 +75,16 @@ public Function<I, O> apply(Computers.Arity1<I, O> computer) {
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer2ToFunction2ViaFunction<I1, I2, O>
 			implements Function<Computers.Arity2<I1, I2, O>, BiFunction<I1, I2, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Function<I1, O> creator;
 
+		/**
+		 * @param computer the Computer to adapt
+		 * @return computer, adapted into a Function
+		 */
 		@Override
 		public BiFunction<I1, I2, O> apply(Computers.Arity2<I1, I2, O> computer) {
 			return (in1, in2) -> {
@@ -94,14 +97,16 @@ public BiFunction<I1, I2, O> apply(Computers.Arity2<I1, I2, O> computer) {
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer3ToFunction3ViaFunction<I1, I2, I3, O>
 			implements Function<Computers.Arity3<I1, I2, I3, O>, Functions.Arity3<I1, I2, I3, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Function<I1, O> creator;
 
+		/**
+		 * @param computer the Computer to adapt
+		 * @return computer, adapted into a Function
+		 */
 		@Override
 		public Functions.Arity3<I1, I2, I3, O> apply(Computers.Arity3<I1, I2, I3, O> computer) {
 			return (in1, in2, in3) -> {
@@ -114,14 +119,16 @@ public Functions.Arity3<I1, I2, I3, O> apply(Computers.Arity3<I1, I2, I3, O> com
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer4ToFunction4ViaFunction<I1, I2, I3, I4, O>
 			implements Function<Computers.Arity4<I1, I2, I3, I4, O>, Functions.Arity4<I1, I2, I3, I4, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Function<I1, O> creator;
 
+		/**
+		 * @param computer the Computer to adapt
+		 * @return computer, adapted into a Function
+		 */
 		@Override
 		public Functions.Arity4<I1, I2, I3, I4, O> apply(Computers.Arity4<I1, I2, I3, I4, O> computer) {
 			return (in1, in2, in3, in4) -> {
@@ -134,14 +141,16 @@ public Functions.Arity4<I1, I2, I3, I4, O> apply(Computers.Arity4<I1, I2, I3, I4
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer5ToFunction5ViaFunction<I1, I2, I3, I4, I5, O>
 			implements Function<Computers.Arity5<I1, I2, I3, I4, I5, O>, Functions.Arity5<I1, I2, I3, I4, I5, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Function<I1, O> creator;
 
+		/**
+		 * @param computer the Computer to adapt
+		 * @return computer, adapted into a Function
+		 */
 		@Override
 		public Functions.Arity5<I1, I2, I3, I4, I5, O> apply(Computers.Arity5<I1, I2, I3, I4, I5, O> computer) {
 			return (in1, in2, in3, in4, in5) -> {
@@ -154,14 +163,16 @@ public Functions.Arity5<I1, I2, I3, I4, I5, O> apply(Computers.Arity5<I1, I2, I3
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer6ToFunction6ViaFunction<I1, I2, I3, I4, I5, I6, O>
 			implements Function<Computers.Arity6<I1, I2, I3, I4, I5, I6, O>, Functions.Arity6<I1, I2, I3, I4, I5, I6, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Function<I1, O> creator;
 
+		/**
+		 * @param computer the Computer to adapt
+		 * @return computer, adapted into a Function
+		 */
 		@Override
 		public Functions.Arity6<I1, I2, I3, I4, I5, I6, O> apply(Computers.Arity6<I1, I2, I3, I4, I5, I6, O> computer) {
 			return (in1, in2, in3, in4, in5, in6) -> {
@@ -174,14 +185,16 @@ public Functions.Arity6<I1, I2, I3, I4, I5, I6, O> apply(Computers.Arity6<I1, I2
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer7ToFunction7ViaFunction<I1, I2, I3, I4, I5, I6, I7, O>
 			implements Function<Computers.Arity7<I1, I2, I3, I4, I5, I6, I7, O>, Functions.Arity7<I1, I2, I3, I4, I5, I6, I7, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Function<I1, O> creator;
 
+		/**
+		 * @param computer the Computer to adapt
+		 * @return computer, adapted into a Function
+		 */
 		@Override
 		public Functions.Arity7<I1, I2, I3, I4, I5, I6, I7, O> apply(Computers.Arity7<I1, I2, I3, I4, I5, I6, I7, O> computer) {
 			return (in1, in2, in3, in4, in5, in6, in7) -> {
@@ -194,14 +207,16 @@ public Functions.Arity7<I1, I2, I3, I4, I5, I6, I7, O> apply(Computers.Arity7<I1
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer8ToFunction8ViaFunction<I1, I2, I3, I4, I5, I6, I7, I8, O>
 			implements Function<Computers.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O>, Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Function<I1, O> creator;
 
+		/**
+		 * @param computer the Computer to adapt
+		 * @return computer, adapted into a Function
+		 */
 		@Override
 		public Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> apply(Computers.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> computer) {
 			return (in1, in2, in3, in4, in5, in6, in7, in8) -> {
@@ -214,14 +229,16 @@ public Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> apply(Computers.Arity
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer9ToFunction9ViaFunction<I1, I2, I3, I4, I5, I6, I7, I8, I9, O>
 			implements Function<Computers.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O>, Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Function<I1, O> creator;
 
+		/**
+		 * @param computer the Computer to adapt
+		 * @return computer, adapted into a Function
+		 */
 		@Override
 		public Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> apply(Computers.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> computer) {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9) -> {
@@ -234,14 +251,16 @@ public Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> apply(Computers.A
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer10ToFunction10ViaFunction<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O>
 			implements Function<Computers.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O>, Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Function<I1, O> creator;
 
+		/**
+		 * @param computer the Computer to adapt
+		 * @return computer, adapted into a Function
+		 */
 		@Override
 		public Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> apply(Computers.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> computer) {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10) -> {
@@ -254,14 +273,16 @@ public Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> apply(Compu
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer11ToFunction11ViaFunction<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O>
 			implements Function<Computers.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O>, Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Function<I1, O> creator;
 
+		/**
+		 * @param computer the Computer to adapt
+		 * @return computer, adapted into a Function
+		 */
 		@Override
 		public Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> apply(Computers.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> computer) {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11) -> {
@@ -274,14 +295,16 @@ public Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> apply(
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer12ToFunction12ViaFunction<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O>
 			implements Function<Computers.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O>, Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Function<I1, O> creator;
 
+		/**
+		 * @param computer the Computer to adapt
+		 * @return computer, adapted into a Function
+		 */
 		@Override
 		public Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> apply(Computers.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> computer) {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12) -> {
@@ -294,14 +317,16 @@ public Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> a
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer13ToFunction13ViaFunction<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O>
 			implements Function<Computers.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O>, Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Function<I1, O> creator;
 
+		/**
+		 * @param computer the Computer to adapt
+		 * @return computer, adapted into a Function
+		 */
 		@Override
 		public Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> apply(Computers.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> computer) {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13) -> {
@@ -314,14 +339,16 @@ public Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer14ToFunction14ViaFunction<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O>
 			implements Function<Computers.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O>, Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Function<I1, O> creator;
 
+		/**
+		 * @param computer the Computer to adapt
+		 * @return computer, adapted into a Function
+		 */
 		@Override
 		public Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> apply(Computers.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> computer) {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14) -> {
@@ -334,14 +361,16 @@ public Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer15ToFunction15ViaFunction<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O>
 			implements Function<Computers.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O>, Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Function<I1, O> creator;
 
+		/**
+		 * @param computer the Computer to adapt
+		 * @return computer, adapted into a Function
+		 */
 		@Override
 		public Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> apply(Computers.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> computer) {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15) -> {
@@ -354,14 +383,16 @@ public Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer16ToFunction16ViaFunction<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O>
 			implements Function<Computers.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O>, Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Function<I1, O> creator;
 
+		/**
+		 * @param computer the Computer to adapt
+		 * @return computer, adapted into a Function
+		 */
 		@Override
 		public Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> apply(Computers.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> computer) {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16) -> {
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java
index 25b0b9965..6ef32930c 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java
@@ -43,7 +43,6 @@
 import org.scijava.function.Producer;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
@@ -56,14 +55,16 @@
 public class ComputersToFunctionsViaSource {
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer0ToFunction0ViaSource<O>
 			implements Function<Computers.Arity0<O>, Producer<O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Producer<O> creator;
 
+		/**
+		 * @param computer the computer to adapt
+		 * @return a Function adaptation of computer
+		 */
 		@Override
 		public Producer<O> apply(Computers.Arity0<O> computer) {
 			return () -> {
@@ -76,14 +77,16 @@ public Producer<O> apply(Computers.Arity0<O> computer) {
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer1ToFunction1ViaSource<I, O>
 			implements Function<Computers.Arity1<I, O>, Function<I, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Producer<O> creator;
 
+		/**
+		 * @param computer the computer to adapt
+		 * @return a Function adaptation of computer
+		 */
 		@Override
 		public Function<I, O> apply(Computers.Arity1<I, O> computer) {
 			return (in) -> {
@@ -96,14 +99,16 @@ public Function<I, O> apply(Computers.Arity1<I, O> computer) {
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer2ToFunction2ViaSource<I1, I2, O>
 			implements Function<Computers.Arity2<I1, I2, O>, BiFunction<I1, I2, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Producer<O> creator;
 
+		/**
+		 * @param computer the computer to adapt
+		 * @return a Function adaptation of computer
+		 */
 		@Override
 		public BiFunction<I1, I2, O> apply(Computers.Arity2<I1, I2, O> computer) {
 			return (in1, in2) -> {
@@ -116,14 +121,16 @@ public BiFunction<I1, I2, O> apply(Computers.Arity2<I1, I2, O> computer) {
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer3ToFunction3ViaSource<I1, I2, I3, O>
 			implements Function<Computers.Arity3<I1, I2, I3, O>, Functions.Arity3<I1, I2, I3, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Producer<O> creator;
 
+		/**
+		 * @param computer the computer to adapt
+		 * @return a Function adaptation of computer
+		 */
 		@Override
 		public Functions.Arity3<I1, I2, I3, O> apply(Computers.Arity3<I1, I2, I3, O> computer) {
 			return (in1, in2, in3) -> {
@@ -136,14 +143,16 @@ public Functions.Arity3<I1, I2, I3, O> apply(Computers.Arity3<I1, I2, I3, O> com
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer4ToFunction4ViaSource<I1, I2, I3, I4, O>
 			implements Function<Computers.Arity4<I1, I2, I3, I4, O>, Functions.Arity4<I1, I2, I3, I4, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Producer<O> creator;
 
+		/**
+		 * @param computer the computer to adapt
+		 * @return a Function adaptation of computer
+		 */
 		@Override
 		public Functions.Arity4<I1, I2, I3, I4, O> apply(Computers.Arity4<I1, I2, I3, I4, O> computer) {
 			return (in1, in2, in3, in4) -> {
@@ -156,14 +165,16 @@ public Functions.Arity4<I1, I2, I3, I4, O> apply(Computers.Arity4<I1, I2, I3, I4
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer5ToFunction5ViaSource<I1, I2, I3, I4, I5, O>
 			implements Function<Computers.Arity5<I1, I2, I3, I4, I5, O>, Functions.Arity5<I1, I2, I3, I4, I5, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Producer<O> creator;
 
+		/**
+		 * @param computer the computer to adapt
+		 * @return a Function adaptation of computer
+		 */
 		@Override
 		public Functions.Arity5<I1, I2, I3, I4, I5, O> apply(Computers.Arity5<I1, I2, I3, I4, I5, O> computer) {
 			return (in1, in2, in3, in4, in5) -> {
@@ -176,14 +187,16 @@ public Functions.Arity5<I1, I2, I3, I4, I5, O> apply(Computers.Arity5<I1, I2, I3
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer6ToFunction6ViaSource<I1, I2, I3, I4, I5, I6, O>
 			implements Function<Computers.Arity6<I1, I2, I3, I4, I5, I6, O>, Functions.Arity6<I1, I2, I3, I4, I5, I6, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Producer<O> creator;
 
+		/**
+		 * @param computer the computer to adapt
+		 * @return a Function adaptation of computer
+		 */
 		@Override
 		public Functions.Arity6<I1, I2, I3, I4, I5, I6, O> apply(Computers.Arity6<I1, I2, I3, I4, I5, I6, O> computer) {
 			return (in1, in2, in3, in4, in5, in6) -> {
@@ -196,14 +209,16 @@ public Functions.Arity6<I1, I2, I3, I4, I5, I6, O> apply(Computers.Arity6<I1, I2
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer7ToFunction7ViaSource<I1, I2, I3, I4, I5, I6, I7, O>
 			implements Function<Computers.Arity7<I1, I2, I3, I4, I5, I6, I7, O>, Functions.Arity7<I1, I2, I3, I4, I5, I6, I7, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Producer<O> creator;
 
+		/**
+		 * @param computer the computer to adapt
+		 * @return a Function adaptation of computer
+		 */
 		@Override
 		public Functions.Arity7<I1, I2, I3, I4, I5, I6, I7, O> apply(Computers.Arity7<I1, I2, I3, I4, I5, I6, I7, O> computer) {
 			return (in1, in2, in3, in4, in5, in6, in7) -> {
@@ -216,14 +231,16 @@ public Functions.Arity7<I1, I2, I3, I4, I5, I6, I7, O> apply(Computers.Arity7<I1
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer8ToFunction8ViaSource<I1, I2, I3, I4, I5, I6, I7, I8, O>
 			implements Function<Computers.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O>, Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Producer<O> creator;
 
+		/**
+		 * @param computer the computer to adapt
+		 * @return a Function adaptation of computer
+		 */
 		@Override
 		public Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> apply(Computers.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> computer) {
 			return (in1, in2, in3, in4, in5, in6, in7, in8) -> {
@@ -236,14 +253,16 @@ public Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> apply(Computers.Arity
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer9ToFunction9ViaSource<I1, I2, I3, I4, I5, I6, I7, I8, I9, O>
 			implements Function<Computers.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O>, Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Producer<O> creator;
 
+		/**
+		 * @param computer the computer to adapt
+		 * @return a Function adaptation of computer
+		 */
 		@Override
 		public Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> apply(Computers.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> computer) {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9) -> {
@@ -256,14 +275,16 @@ public Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> apply(Computers.A
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer10ToFunction10ViaSource<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O>
 			implements Function<Computers.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O>, Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Producer<O> creator;
 
+		/**
+		 * @param computer the computer to adapt
+		 * @return a Function adaptation of computer
+		 */
 		@Override
 		public Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> apply(Computers.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> computer) {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10) -> {
@@ -276,14 +297,16 @@ public Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> apply(Compu
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer11ToFunction11ViaSource<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O>
 			implements Function<Computers.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O>, Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Producer<O> creator;
 
+		/**
+		 * @param computer the computer to adapt
+		 * @return a Function adaptation of computer
+		 */
 		@Override
 		public Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> apply(Computers.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> computer) {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11) -> {
@@ -296,14 +319,16 @@ public Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> apply(
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer12ToFunction12ViaSource<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O>
 			implements Function<Computers.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O>, Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Producer<O> creator;
 
+		/**
+		 * @param computer the computer to adapt
+		 * @return a Function adaptation of computer
+		 */
 		@Override
 		public Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> apply(Computers.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> computer) {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12) -> {
@@ -316,14 +341,16 @@ public Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> a
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer13ToFunction13ViaSource<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O>
 			implements Function<Computers.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O>, Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Producer<O> creator;
 
+		/**
+		 * @param computer the computer to adapt
+		 * @return a Function adaptation of computer
+		 */
 		@Override
 		public Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> apply(Computers.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> computer) {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13) -> {
@@ -336,14 +363,16 @@ public Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer14ToFunction14ViaSource<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O>
 			implements Function<Computers.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O>, Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Producer<O> creator;
 
+		/**
+		 * @param computer the computer to adapt
+		 * @return a Function adaptation of computer
+		 */
 		@Override
 		public Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> apply(Computers.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> computer) {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14) -> {
@@ -356,14 +385,16 @@ public Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer15ToFunction15ViaSource<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O>
 			implements Function<Computers.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O>, Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Producer<O> creator;
 
+		/**
+		 * @param computer the computer to adapt
+		 * @return a Function adaptation of computer
+		 */
 		@Override
 		public Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> apply(Computers.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> computer) {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15) -> {
@@ -376,14 +407,16 @@ public Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer16ToFunction16ViaSource<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O>
 			implements Function<Computers.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O>, Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O>> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Producer<O> creator;
 
+		/**
+		 * @param computer the computer to adapt
+		 * @return a Function adaptation of computer
+		 */
 		@Override
 		public Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> apply(Computers.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> computer) {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16) -> {
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java
index c4291efce..cf7816485 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java
@@ -42,7 +42,6 @@
 import org.scijava.function.Producer;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
@@ -55,13 +54,15 @@
 public class FunctionsToComputers {
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function0ToComputer0<O> implements Function<Producer<O>, Computers.Arity0<O>> {
 
 		@OpDependency(name = "copy", adaptable = false)
 		Computers.Arity1<O, O> copyOp;
 
+		/**
+		 * @param function the function to adapt
+		 * @return an adaptation of function
+		 */
 		@Override
 		public Computers.Arity0<O> apply(Producer<O> function) {
 			return (out) -> {
@@ -73,13 +74,15 @@ public Computers.Arity0<O> apply(Producer<O> function) {
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function1ToComputer1<I, O> implements Function<Function<I, O>, Computers.Arity1<I, O>> {
 
 		@OpDependency(name = "copy", adaptable = false)
 		Computers.Arity1<O, O> copyOp;
 
+		/**
+		 * @param function the function to adapt
+		 * @return an adaptation of function
+		 */
 		@Override
 		public Computers.Arity1<I, O> apply(Function<I, O> function) {
 			return (in, out) -> {
@@ -91,13 +94,15 @@ public Computers.Arity1<I, O> apply(Function<I, O> function) {
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function2ToComputer2<I1, I2, O> implements Function<BiFunction<I1, I2, O>, Computers.Arity2<I1, I2, O>> {
 
 		@OpDependency(name = "copy", adaptable = false)
 		Computers.Arity1<O, O> copyOp;
 
+		/**
+		 * @param function the function to adapt
+		 * @return an adaptation of function
+		 */
 		@Override
 		public Computers.Arity2<I1, I2, O> apply(BiFunction<I1, I2, O> function) {
 			return (in1, in2, out) -> {
@@ -109,13 +114,15 @@ public Computers.Arity2<I1, I2, O> apply(BiFunction<I1, I2, O> function) {
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function3ToComputer3<I1, I2, I3, O> implements Function<Functions.Arity3<I1, I2, I3, O>, Computers.Arity3<I1, I2, I3, O>> {
 
 		@OpDependency(name = "copy", adaptable = false)
 		Computers.Arity1<O, O> copyOp;
 
+		/**
+		 * @param function the function to adapt
+		 * @return an adaptation of function
+		 */
 		@Override
 		public Computers.Arity3<I1, I2, I3, O> apply(Functions.Arity3<I1, I2, I3, O> function) {
 			return (in1, in2, in3, out) -> {
@@ -127,13 +134,15 @@ public Computers.Arity3<I1, I2, I3, O> apply(Functions.Arity3<I1, I2, I3, O> fun
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function4ToComputer4<I1, I2, I3, I4, O> implements Function<Functions.Arity4<I1, I2, I3, I4, O>, Computers.Arity4<I1, I2, I3, I4, O>> {
 
 		@OpDependency(name = "copy", adaptable = false)
 		Computers.Arity1<O, O> copyOp;
 
+		/**
+		 * @param function the function to adapt
+		 * @return an adaptation of function
+		 */
 		@Override
 		public Computers.Arity4<I1, I2, I3, I4, O> apply(Functions.Arity4<I1, I2, I3, I4, O> function) {
 			return (in1, in2, in3, in4, out) -> {
@@ -145,13 +154,15 @@ public Computers.Arity4<I1, I2, I3, I4, O> apply(Functions.Arity4<I1, I2, I3, I4
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function5ToComputer5<I1, I2, I3, I4, I5, O> implements Function<Functions.Arity5<I1, I2, I3, I4, I5, O>, Computers.Arity5<I1, I2, I3, I4, I5, O>> {
 
 		@OpDependency(name = "copy", adaptable = false)
 		Computers.Arity1<O, O> copyOp;
 
+		/**
+		 * @param function the function to adapt
+		 * @return an adaptation of function
+		 */
 		@Override
 		public Computers.Arity5<I1, I2, I3, I4, I5, O> apply(Functions.Arity5<I1, I2, I3, I4, I5, O> function) {
 			return (in1, in2, in3, in4, in5, out) -> {
@@ -163,13 +174,15 @@ public Computers.Arity5<I1, I2, I3, I4, I5, O> apply(Functions.Arity5<I1, I2, I3
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function6ToComputer6<I1, I2, I3, I4, I5, I6, O> implements Function<Functions.Arity6<I1, I2, I3, I4, I5, I6, O>, Computers.Arity6<I1, I2, I3, I4, I5, I6, O>> {
 
 		@OpDependency(name = "copy", adaptable = false)
 		Computers.Arity1<O, O> copyOp;
 
+		/**
+		 * @param function the function to adapt
+		 * @return an adaptation of function
+		 */
 		@Override
 		public Computers.Arity6<I1, I2, I3, I4, I5, I6, O> apply(Functions.Arity6<I1, I2, I3, I4, I5, I6, O> function) {
 			return (in1, in2, in3, in4, in5, in6, out) -> {
@@ -181,13 +194,15 @@ public Computers.Arity6<I1, I2, I3, I4, I5, I6, O> apply(Functions.Arity6<I1, I2
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function7ToComputer7<I1, I2, I3, I4, I5, I6, I7, O> implements Function<Functions.Arity7<I1, I2, I3, I4, I5, I6, I7, O>, Computers.Arity7<I1, I2, I3, I4, I5, I6, I7, O>> {
 
 		@OpDependency(name = "copy", adaptable = false)
 		Computers.Arity1<O, O> copyOp;
 
+		/**
+		 * @param function the function to adapt
+		 * @return an adaptation of function
+		 */
 		@Override
 		public Computers.Arity7<I1, I2, I3, I4, I5, I6, I7, O> apply(Functions.Arity7<I1, I2, I3, I4, I5, I6, I7, O> function) {
 			return (in1, in2, in3, in4, in5, in6, in7, out) -> {
@@ -199,13 +214,15 @@ public Computers.Arity7<I1, I2, I3, I4, I5, I6, I7, O> apply(Functions.Arity7<I1
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function8ToComputer8<I1, I2, I3, I4, I5, I6, I7, I8, O> implements Function<Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O>, Computers.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O>> {
 
 		@OpDependency(name = "copy", adaptable = false)
 		Computers.Arity1<O, O> copyOp;
 
+		/**
+		 * @param function the function to adapt
+		 * @return an adaptation of function
+		 */
 		@Override
 		public Computers.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> apply(Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> function) {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, out) -> {
@@ -217,13 +234,15 @@ public Computers.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> apply(Functions.Arity
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function9ToComputer9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> implements Function<Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O>, Computers.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O>> {
 
 		@OpDependency(name = "copy", adaptable = false)
 		Computers.Arity1<O, O> copyOp;
 
+		/**
+		 * @param function the function to adapt
+		 * @return an adaptation of function
+		 */
 		@Override
 		public Computers.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> apply(Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> function) {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, out) -> {
@@ -235,13 +254,15 @@ public Computers.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> apply(Functions.A
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function10ToComputer10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> implements Function<Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O>, Computers.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O>> {
 
 		@OpDependency(name = "copy", adaptable = false)
 		Computers.Arity1<O, O> copyOp;
 
+		/**
+		 * @param function the function to adapt
+		 * @return an adaptation of function
+		 */
 		@Override
 		public Computers.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> apply(Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> function) {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, out) -> {
@@ -253,13 +274,15 @@ public Computers.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> apply(Funct
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function11ToComputer11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> implements Function<Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O>, Computers.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O>> {
 
 		@OpDependency(name = "copy", adaptable = false)
 		Computers.Arity1<O, O> copyOp;
 
+		/**
+		 * @param function the function to adapt
+		 * @return an adaptation of function
+		 */
 		@Override
 		public Computers.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> apply(Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> function) {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, out) -> {
@@ -271,13 +294,15 @@ public Computers.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> apply(
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function12ToComputer12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> implements Function<Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O>, Computers.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O>> {
 
 		@OpDependency(name = "copy", adaptable = false)
 		Computers.Arity1<O, O> copyOp;
 
+		/**
+		 * @param function the function to adapt
+		 * @return an adaptation of function
+		 */
 		@Override
 		public Computers.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> apply(Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> function) {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, out) -> {
@@ -289,13 +314,15 @@ public Computers.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> a
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function13ToComputer13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> implements Function<Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O>, Computers.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O>> {
 
 		@OpDependency(name = "copy", adaptable = false)
 		Computers.Arity1<O, O> copyOp;
 
+		/**
+		 * @param function the function to adapt
+		 * @return an adaptation of function
+		 */
 		@Override
 		public Computers.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> apply(Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> function) {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, out) -> {
@@ -307,13 +334,15 @@ public Computers.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function14ToComputer14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> implements Function<Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O>, Computers.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O>> {
 
 		@OpDependency(name = "copy", adaptable = false)
 		Computers.Arity1<O, O> copyOp;
 
+		/**
+		 * @param function the function to adapt
+		 * @return an adaptation of function
+		 */
 		@Override
 		public Computers.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> apply(Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> function) {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, out) -> {
@@ -325,13 +354,15 @@ public Computers.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function15ToComputer15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> implements Function<Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O>, Computers.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O>> {
 
 		@OpDependency(name = "copy", adaptable = false)
 		Computers.Arity1<O, O> copyOp;
 
+		/**
+		 * @param function the function to adapt
+		 * @return an adaptation of function
+		 */
 		@Override
 		public Computers.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> apply(Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> function) {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, out) -> {
@@ -343,13 +374,15 @@ public Computers.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function16ToComputer16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> implements Function<Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O>, Computers.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O>> {
 
 		@OpDependency(name = "copy", adaptable = false)
 		Computers.Arity1<O, O> copyOp;
 
+		/**
+		 * @param function the function to adapt
+		 * @return an adaptation of function
+		 */
 		@Override
 		public Computers.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> apply(Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> function) {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16, out) -> {
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java
index 8422cabc9..7a7d0dc65 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java
@@ -41,10 +41,8 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.OpField;
 import org.scijava.ops.core.Op;
 import org.scijava.ops.core.OpCollection;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
@@ -57,8 +55,6 @@
 public class InplacesToFunctions<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, IO> {
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace1ToFunction1<IO> implements Function<Inplaces.Arity1<IO>, Function<IO, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -66,6 +62,10 @@ static class Inplace1ToFunction1<IO> implements Function<Inplaces.Arity1<IO>, Fu
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Function<IO, IO> apply(Inplaces.Arity1<IO> t) {
 			return (IO io) -> {
@@ -78,8 +78,6 @@ public Function<IO, IO> apply(Inplaces.Arity1<IO> t) {
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace2_1ToFunction2<IO, I2> implements Function<Inplaces.Arity2_1<IO, I2>, BiFunction<IO, I2, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -87,6 +85,10 @@ static class Inplace2_1ToFunction2<IO, I2> implements Function<Inplaces.Arity2_1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public BiFunction<IO, I2, IO> apply(Inplaces.Arity2_1<IO, I2> t) {
 			return (IO io, I2 in2) -> {
@@ -99,8 +101,6 @@ public BiFunction<IO, I2, IO> apply(Inplaces.Arity2_1<IO, I2> t) {
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace2_2ToFunction2<I1, IO> implements Function<Inplaces.Arity2_2<I1, IO>, BiFunction<I1, IO, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -108,6 +108,10 @@ static class Inplace2_2ToFunction2<I1, IO> implements Function<Inplaces.Arity2_2
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public BiFunction<I1, IO, IO> apply(Inplaces.Arity2_2<I1, IO> t) {
 			return (I1 in1, IO io) -> {
@@ -120,8 +124,6 @@ public BiFunction<I1, IO, IO> apply(Inplaces.Arity2_2<I1, IO> t) {
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace3_1ToFunction3<IO, I2, I3> implements Function<Inplaces.Arity3_1<IO, I2, I3>, Functions.Arity3<IO, I2, I3, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -129,6 +131,10 @@ static class Inplace3_1ToFunction3<IO, I2, I3> implements Function<Inplaces.Arit
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity3<IO, I2, I3, IO> apply(Inplaces.Arity3_1<IO, I2, I3> t) {
 			return (IO io, I2 in2, I3 in3) -> {
@@ -141,8 +147,6 @@ public Functions.Arity3<IO, I2, I3, IO> apply(Inplaces.Arity3_1<IO, I2, I3> t) {
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace3_2ToFunction3<I1, IO, I3> implements Function<Inplaces.Arity3_2<I1, IO, I3>, Functions.Arity3<I1, IO, I3, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -150,6 +154,10 @@ static class Inplace3_2ToFunction3<I1, IO, I3> implements Function<Inplaces.Arit
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity3<I1, IO, I3, IO> apply(Inplaces.Arity3_2<I1, IO, I3> t) {
 			return (I1 in1, IO io, I3 in3) -> {
@@ -162,8 +170,6 @@ public Functions.Arity3<I1, IO, I3, IO> apply(Inplaces.Arity3_2<I1, IO, I3> t) {
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace3_3ToFunction3<I1, I2, IO> implements Function<Inplaces.Arity3_3<I1, I2, IO>, Functions.Arity3<I1, I2, IO, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -171,6 +177,10 @@ static class Inplace3_3ToFunction3<I1, I2, IO> implements Function<Inplaces.Arit
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity3<I1, I2, IO, IO> apply(Inplaces.Arity3_3<I1, I2, IO> t) {
 			return (I1 in1, I2 in2, IO io) -> {
@@ -183,8 +193,6 @@ public Functions.Arity3<I1, I2, IO, IO> apply(Inplaces.Arity3_3<I1, I2, IO> t) {
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace4_1ToFunction4<IO, I2, I3, I4> implements Function<Inplaces.Arity4_1<IO, I2, I3, I4>, Functions.Arity4<IO, I2, I3, I4, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -192,6 +200,10 @@ static class Inplace4_1ToFunction4<IO, I2, I3, I4> implements Function<Inplaces.
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity4<IO, I2, I3, I4, IO> apply(Inplaces.Arity4_1<IO, I2, I3, I4> t) {
 			return (IO io, I2 in2, I3 in3, I4 in4) -> {
@@ -204,8 +216,6 @@ public Functions.Arity4<IO, I2, I3, I4, IO> apply(Inplaces.Arity4_1<IO, I2, I3,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace4_2ToFunction4<I1, IO, I3, I4> implements Function<Inplaces.Arity4_2<I1, IO, I3, I4>, Functions.Arity4<I1, IO, I3, I4, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -213,6 +223,10 @@ static class Inplace4_2ToFunction4<I1, IO, I3, I4> implements Function<Inplaces.
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity4<I1, IO, I3, I4, IO> apply(Inplaces.Arity4_2<I1, IO, I3, I4> t) {
 			return (I1 in1, IO io, I3 in3, I4 in4) -> {
@@ -225,8 +239,6 @@ public Functions.Arity4<I1, IO, I3, I4, IO> apply(Inplaces.Arity4_2<I1, IO, I3,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace4_3ToFunction4<I1, I2, IO, I4> implements Function<Inplaces.Arity4_3<I1, I2, IO, I4>, Functions.Arity4<I1, I2, IO, I4, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -234,6 +246,10 @@ static class Inplace4_3ToFunction4<I1, I2, IO, I4> implements Function<Inplaces.
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity4<I1, I2, IO, I4, IO> apply(Inplaces.Arity4_3<I1, I2, IO, I4> t) {
 			return (I1 in1, I2 in2, IO io, I4 in4) -> {
@@ -246,8 +262,6 @@ public Functions.Arity4<I1, I2, IO, I4, IO> apply(Inplaces.Arity4_3<I1, I2, IO,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace4_4ToFunction4<I1, I2, I3, IO> implements Function<Inplaces.Arity4_4<I1, I2, I3, IO>, Functions.Arity4<I1, I2, I3, IO, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -255,6 +269,10 @@ static class Inplace4_4ToFunction4<I1, I2, I3, IO> implements Function<Inplaces.
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity4<I1, I2, I3, IO, IO> apply(Inplaces.Arity4_4<I1, I2, I3, IO> t) {
 			return (I1 in1, I2 in2, I3 in3, IO io) -> {
@@ -267,8 +285,6 @@ public Functions.Arity4<I1, I2, I3, IO, IO> apply(Inplaces.Arity4_4<I1, I2, I3,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace5_1ToFunction5<IO, I2, I3, I4, I5> implements Function<Inplaces.Arity5_1<IO, I2, I3, I4, I5>, Functions.Arity5<IO, I2, I3, I4, I5, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -276,6 +292,10 @@ static class Inplace5_1ToFunction5<IO, I2, I3, I4, I5> implements Function<Inpla
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity5<IO, I2, I3, I4, I5, IO> apply(Inplaces.Arity5_1<IO, I2, I3, I4, I5> t) {
 			return (IO io, I2 in2, I3 in3, I4 in4, I5 in5) -> {
@@ -288,8 +308,6 @@ public Functions.Arity5<IO, I2, I3, I4, I5, IO> apply(Inplaces.Arity5_1<IO, I2,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace5_2ToFunction5<I1, IO, I3, I4, I5> implements Function<Inplaces.Arity5_2<I1, IO, I3, I4, I5>, Functions.Arity5<I1, IO, I3, I4, I5, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -297,6 +315,10 @@ static class Inplace5_2ToFunction5<I1, IO, I3, I4, I5> implements Function<Inpla
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity5<I1, IO, I3, I4, I5, IO> apply(Inplaces.Arity5_2<I1, IO, I3, I4, I5> t) {
 			return (I1 in1, IO io, I3 in3, I4 in4, I5 in5) -> {
@@ -309,8 +331,6 @@ public Functions.Arity5<I1, IO, I3, I4, I5, IO> apply(Inplaces.Arity5_2<I1, IO,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace5_3ToFunction5<I1, I2, IO, I4, I5> implements Function<Inplaces.Arity5_3<I1, I2, IO, I4, I5>, Functions.Arity5<I1, I2, IO, I4, I5, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -318,6 +338,10 @@ static class Inplace5_3ToFunction5<I1, I2, IO, I4, I5> implements Function<Inpla
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity5<I1, I2, IO, I4, I5, IO> apply(Inplaces.Arity5_3<I1, I2, IO, I4, I5> t) {
 			return (I1 in1, I2 in2, IO io, I4 in4, I5 in5) -> {
@@ -330,8 +354,6 @@ public Functions.Arity5<I1, I2, IO, I4, I5, IO> apply(Inplaces.Arity5_3<I1, I2,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace5_4ToFunction5<I1, I2, I3, IO, I5> implements Function<Inplaces.Arity5_4<I1, I2, I3, IO, I5>, Functions.Arity5<I1, I2, I3, IO, I5, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -339,6 +361,10 @@ static class Inplace5_4ToFunction5<I1, I2, I3, IO, I5> implements Function<Inpla
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity5<I1, I2, I3, IO, I5, IO> apply(Inplaces.Arity5_4<I1, I2, I3, IO, I5> t) {
 			return (I1 in1, I2 in2, I3 in3, IO io, I5 in5) -> {
@@ -351,8 +377,6 @@ public Functions.Arity5<I1, I2, I3, IO, I5, IO> apply(Inplaces.Arity5_4<I1, I2,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace5_5ToFunction5<I1, I2, I3, I4, IO> implements Function<Inplaces.Arity5_5<I1, I2, I3, I4, IO>, Functions.Arity5<I1, I2, I3, I4, IO, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -360,6 +384,10 @@ static class Inplace5_5ToFunction5<I1, I2, I3, I4, IO> implements Function<Inpla
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity5<I1, I2, I3, I4, IO, IO> apply(Inplaces.Arity5_5<I1, I2, I3, I4, IO> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, IO io) -> {
@@ -372,8 +400,6 @@ public Functions.Arity5<I1, I2, I3, I4, IO, IO> apply(Inplaces.Arity5_5<I1, I2,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace6_1ToFunction6<IO, I2, I3, I4, I5, I6> implements Function<Inplaces.Arity6_1<IO, I2, I3, I4, I5, I6>, Functions.Arity6<IO, I2, I3, I4, I5, I6, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -381,6 +407,10 @@ static class Inplace6_1ToFunction6<IO, I2, I3, I4, I5, I6> implements Function<I
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity6<IO, I2, I3, I4, I5, I6, IO> apply(Inplaces.Arity6_1<IO, I2, I3, I4, I5, I6> t) {
 			return (IO io, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6) -> {
@@ -393,8 +423,6 @@ public Functions.Arity6<IO, I2, I3, I4, I5, I6, IO> apply(Inplaces.Arity6_1<IO,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace6_2ToFunction6<I1, IO, I3, I4, I5, I6> implements Function<Inplaces.Arity6_2<I1, IO, I3, I4, I5, I6>, Functions.Arity6<I1, IO, I3, I4, I5, I6, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -402,6 +430,10 @@ static class Inplace6_2ToFunction6<I1, IO, I3, I4, I5, I6> implements Function<I
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity6<I1, IO, I3, I4, I5, I6, IO> apply(Inplaces.Arity6_2<I1, IO, I3, I4, I5, I6> t) {
 			return (I1 in1, IO io, I3 in3, I4 in4, I5 in5, I6 in6) -> {
@@ -414,8 +446,6 @@ public Functions.Arity6<I1, IO, I3, I4, I5, I6, IO> apply(Inplaces.Arity6_2<I1,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace6_3ToFunction6<I1, I2, IO, I4, I5, I6> implements Function<Inplaces.Arity6_3<I1, I2, IO, I4, I5, I6>, Functions.Arity6<I1, I2, IO, I4, I5, I6, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -423,6 +453,10 @@ static class Inplace6_3ToFunction6<I1, I2, IO, I4, I5, I6> implements Function<I
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity6<I1, I2, IO, I4, I5, I6, IO> apply(Inplaces.Arity6_3<I1, I2, IO, I4, I5, I6> t) {
 			return (I1 in1, I2 in2, IO io, I4 in4, I5 in5, I6 in6) -> {
@@ -435,8 +469,6 @@ public Functions.Arity6<I1, I2, IO, I4, I5, I6, IO> apply(Inplaces.Arity6_3<I1,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace6_4ToFunction6<I1, I2, I3, IO, I5, I6> implements Function<Inplaces.Arity6_4<I1, I2, I3, IO, I5, I6>, Functions.Arity6<I1, I2, I3, IO, I5, I6, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -444,6 +476,10 @@ static class Inplace6_4ToFunction6<I1, I2, I3, IO, I5, I6> implements Function<I
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity6<I1, I2, I3, IO, I5, I6, IO> apply(Inplaces.Arity6_4<I1, I2, I3, IO, I5, I6> t) {
 			return (I1 in1, I2 in2, I3 in3, IO io, I5 in5, I6 in6) -> {
@@ -456,8 +492,6 @@ public Functions.Arity6<I1, I2, I3, IO, I5, I6, IO> apply(Inplaces.Arity6_4<I1,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace6_5ToFunction6<I1, I2, I3, I4, IO, I6> implements Function<Inplaces.Arity6_5<I1, I2, I3, I4, IO, I6>, Functions.Arity6<I1, I2, I3, I4, IO, I6, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -465,6 +499,10 @@ static class Inplace6_5ToFunction6<I1, I2, I3, I4, IO, I6> implements Function<I
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity6<I1, I2, I3, I4, IO, I6, IO> apply(Inplaces.Arity6_5<I1, I2, I3, I4, IO, I6> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, IO io, I6 in6) -> {
@@ -477,8 +515,6 @@ public Functions.Arity6<I1, I2, I3, I4, IO, I6, IO> apply(Inplaces.Arity6_5<I1,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace6_6ToFunction6<I1, I2, I3, I4, I5, IO> implements Function<Inplaces.Arity6_6<I1, I2, I3, I4, I5, IO>, Functions.Arity6<I1, I2, I3, I4, I5, IO, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -486,6 +522,10 @@ static class Inplace6_6ToFunction6<I1, I2, I3, I4, I5, IO> implements Function<I
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity6<I1, I2, I3, I4, I5, IO, IO> apply(Inplaces.Arity6_6<I1, I2, I3, I4, I5, IO> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, IO io) -> {
@@ -498,8 +538,6 @@ public Functions.Arity6<I1, I2, I3, I4, I5, IO, IO> apply(Inplaces.Arity6_6<I1,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace7_1ToFunction7<IO, I2, I3, I4, I5, I6, I7> implements Function<Inplaces.Arity7_1<IO, I2, I3, I4, I5, I6, I7>, Functions.Arity7<IO, I2, I3, I4, I5, I6, I7, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -507,6 +545,10 @@ static class Inplace7_1ToFunction7<IO, I2, I3, I4, I5, I6, I7> implements Functi
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity7<IO, I2, I3, I4, I5, I6, I7, IO> apply(Inplaces.Arity7_1<IO, I2, I3, I4, I5, I6, I7> t) {
 			return (IO io, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7) -> {
@@ -519,8 +561,6 @@ public Functions.Arity7<IO, I2, I3, I4, I5, I6, I7, IO> apply(Inplaces.Arity7_1<
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace7_2ToFunction7<I1, IO, I3, I4, I5, I6, I7> implements Function<Inplaces.Arity7_2<I1, IO, I3, I4, I5, I6, I7>, Functions.Arity7<I1, IO, I3, I4, I5, I6, I7, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -528,6 +568,10 @@ static class Inplace7_2ToFunction7<I1, IO, I3, I4, I5, I6, I7> implements Functi
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity7<I1, IO, I3, I4, I5, I6, I7, IO> apply(Inplaces.Arity7_2<I1, IO, I3, I4, I5, I6, I7> t) {
 			return (I1 in1, IO io, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7) -> {
@@ -540,8 +584,6 @@ public Functions.Arity7<I1, IO, I3, I4, I5, I6, I7, IO> apply(Inplaces.Arity7_2<
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace7_3ToFunction7<I1, I2, IO, I4, I5, I6, I7> implements Function<Inplaces.Arity7_3<I1, I2, IO, I4, I5, I6, I7>, Functions.Arity7<I1, I2, IO, I4, I5, I6, I7, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -549,6 +591,10 @@ static class Inplace7_3ToFunction7<I1, I2, IO, I4, I5, I6, I7> implements Functi
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity7<I1, I2, IO, I4, I5, I6, I7, IO> apply(Inplaces.Arity7_3<I1, I2, IO, I4, I5, I6, I7> t) {
 			return (I1 in1, I2 in2, IO io, I4 in4, I5 in5, I6 in6, I7 in7) -> {
@@ -561,8 +607,6 @@ public Functions.Arity7<I1, I2, IO, I4, I5, I6, I7, IO> apply(Inplaces.Arity7_3<
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace7_4ToFunction7<I1, I2, I3, IO, I5, I6, I7> implements Function<Inplaces.Arity7_4<I1, I2, I3, IO, I5, I6, I7>, Functions.Arity7<I1, I2, I3, IO, I5, I6, I7, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -570,6 +614,10 @@ static class Inplace7_4ToFunction7<I1, I2, I3, IO, I5, I6, I7> implements Functi
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity7<I1, I2, I3, IO, I5, I6, I7, IO> apply(Inplaces.Arity7_4<I1, I2, I3, IO, I5, I6, I7> t) {
 			return (I1 in1, I2 in2, I3 in3, IO io, I5 in5, I6 in6, I7 in7) -> {
@@ -582,8 +630,6 @@ public Functions.Arity7<I1, I2, I3, IO, I5, I6, I7, IO> apply(Inplaces.Arity7_4<
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace7_5ToFunction7<I1, I2, I3, I4, IO, I6, I7> implements Function<Inplaces.Arity7_5<I1, I2, I3, I4, IO, I6, I7>, Functions.Arity7<I1, I2, I3, I4, IO, I6, I7, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -591,6 +637,10 @@ static class Inplace7_5ToFunction7<I1, I2, I3, I4, IO, I6, I7> implements Functi
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity7<I1, I2, I3, I4, IO, I6, I7, IO> apply(Inplaces.Arity7_5<I1, I2, I3, I4, IO, I6, I7> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, IO io, I6 in6, I7 in7) -> {
@@ -603,8 +653,6 @@ public Functions.Arity7<I1, I2, I3, I4, IO, I6, I7, IO> apply(Inplaces.Arity7_5<
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace7_6ToFunction7<I1, I2, I3, I4, I5, IO, I7> implements Function<Inplaces.Arity7_6<I1, I2, I3, I4, I5, IO, I7>, Functions.Arity7<I1, I2, I3, I4, I5, IO, I7, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -612,6 +660,10 @@ static class Inplace7_6ToFunction7<I1, I2, I3, I4, I5, IO, I7> implements Functi
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity7<I1, I2, I3, I4, I5, IO, I7, IO> apply(Inplaces.Arity7_6<I1, I2, I3, I4, I5, IO, I7> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, IO io, I7 in7) -> {
@@ -624,8 +676,6 @@ public Functions.Arity7<I1, I2, I3, I4, I5, IO, I7, IO> apply(Inplaces.Arity7_6<
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace7_7ToFunction7<I1, I2, I3, I4, I5, I6, IO> implements Function<Inplaces.Arity7_7<I1, I2, I3, I4, I5, I6, IO>, Functions.Arity7<I1, I2, I3, I4, I5, I6, IO, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -633,6 +683,10 @@ static class Inplace7_7ToFunction7<I1, I2, I3, I4, I5, I6, IO> implements Functi
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity7<I1, I2, I3, I4, I5, I6, IO, IO> apply(Inplaces.Arity7_7<I1, I2, I3, I4, I5, I6, IO> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, IO io) -> {
@@ -645,8 +699,6 @@ public Functions.Arity7<I1, I2, I3, I4, I5, I6, IO, IO> apply(Inplaces.Arity7_7<
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace8_1ToFunction8<IO, I2, I3, I4, I5, I6, I7, I8> implements Function<Inplaces.Arity8_1<IO, I2, I3, I4, I5, I6, I7, I8>, Functions.Arity8<IO, I2, I3, I4, I5, I6, I7, I8, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -654,6 +706,10 @@ static class Inplace8_1ToFunction8<IO, I2, I3, I4, I5, I6, I7, I8> implements Fu
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity8<IO, I2, I3, I4, I5, I6, I7, I8, IO> apply(Inplaces.Arity8_1<IO, I2, I3, I4, I5, I6, I7, I8> t) {
 			return (IO io, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8) -> {
@@ -666,8 +722,6 @@ public Functions.Arity8<IO, I2, I3, I4, I5, I6, I7, I8, IO> apply(Inplaces.Arity
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace8_2ToFunction8<I1, IO, I3, I4, I5, I6, I7, I8> implements Function<Inplaces.Arity8_2<I1, IO, I3, I4, I5, I6, I7, I8>, Functions.Arity8<I1, IO, I3, I4, I5, I6, I7, I8, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -675,6 +729,10 @@ static class Inplace8_2ToFunction8<I1, IO, I3, I4, I5, I6, I7, I8> implements Fu
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity8<I1, IO, I3, I4, I5, I6, I7, I8, IO> apply(Inplaces.Arity8_2<I1, IO, I3, I4, I5, I6, I7, I8> t) {
 			return (I1 in1, IO io, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8) -> {
@@ -687,8 +745,6 @@ public Functions.Arity8<I1, IO, I3, I4, I5, I6, I7, I8, IO> apply(Inplaces.Arity
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace8_3ToFunction8<I1, I2, IO, I4, I5, I6, I7, I8> implements Function<Inplaces.Arity8_3<I1, I2, IO, I4, I5, I6, I7, I8>, Functions.Arity8<I1, I2, IO, I4, I5, I6, I7, I8, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -696,6 +752,10 @@ static class Inplace8_3ToFunction8<I1, I2, IO, I4, I5, I6, I7, I8> implements Fu
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity8<I1, I2, IO, I4, I5, I6, I7, I8, IO> apply(Inplaces.Arity8_3<I1, I2, IO, I4, I5, I6, I7, I8> t) {
 			return (I1 in1, I2 in2, IO io, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8) -> {
@@ -708,8 +768,6 @@ public Functions.Arity8<I1, I2, IO, I4, I5, I6, I7, I8, IO> apply(Inplaces.Arity
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace8_4ToFunction8<I1, I2, I3, IO, I5, I6, I7, I8> implements Function<Inplaces.Arity8_4<I1, I2, I3, IO, I5, I6, I7, I8>, Functions.Arity8<I1, I2, I3, IO, I5, I6, I7, I8, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -717,6 +775,10 @@ static class Inplace8_4ToFunction8<I1, I2, I3, IO, I5, I6, I7, I8> implements Fu
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity8<I1, I2, I3, IO, I5, I6, I7, I8, IO> apply(Inplaces.Arity8_4<I1, I2, I3, IO, I5, I6, I7, I8> t) {
 			return (I1 in1, I2 in2, I3 in3, IO io, I5 in5, I6 in6, I7 in7, I8 in8) -> {
@@ -729,8 +791,6 @@ public Functions.Arity8<I1, I2, I3, IO, I5, I6, I7, I8, IO> apply(Inplaces.Arity
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace8_5ToFunction8<I1, I2, I3, I4, IO, I6, I7, I8> implements Function<Inplaces.Arity8_5<I1, I2, I3, I4, IO, I6, I7, I8>, Functions.Arity8<I1, I2, I3, I4, IO, I6, I7, I8, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -738,6 +798,10 @@ static class Inplace8_5ToFunction8<I1, I2, I3, I4, IO, I6, I7, I8> implements Fu
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity8<I1, I2, I3, I4, IO, I6, I7, I8, IO> apply(Inplaces.Arity8_5<I1, I2, I3, I4, IO, I6, I7, I8> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, IO io, I6 in6, I7 in7, I8 in8) -> {
@@ -750,8 +814,6 @@ public Functions.Arity8<I1, I2, I3, I4, IO, I6, I7, I8, IO> apply(Inplaces.Arity
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace8_6ToFunction8<I1, I2, I3, I4, I5, IO, I7, I8> implements Function<Inplaces.Arity8_6<I1, I2, I3, I4, I5, IO, I7, I8>, Functions.Arity8<I1, I2, I3, I4, I5, IO, I7, I8, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -759,6 +821,10 @@ static class Inplace8_6ToFunction8<I1, I2, I3, I4, I5, IO, I7, I8> implements Fu
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity8<I1, I2, I3, I4, I5, IO, I7, I8, IO> apply(Inplaces.Arity8_6<I1, I2, I3, I4, I5, IO, I7, I8> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, IO io, I7 in7, I8 in8) -> {
@@ -771,8 +837,6 @@ public Functions.Arity8<I1, I2, I3, I4, I5, IO, I7, I8, IO> apply(Inplaces.Arity
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace8_7ToFunction8<I1, I2, I3, I4, I5, I6, IO, I8> implements Function<Inplaces.Arity8_7<I1, I2, I3, I4, I5, I6, IO, I8>, Functions.Arity8<I1, I2, I3, I4, I5, I6, IO, I8, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -780,6 +844,10 @@ static class Inplace8_7ToFunction8<I1, I2, I3, I4, I5, I6, IO, I8> implements Fu
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity8<I1, I2, I3, I4, I5, I6, IO, I8, IO> apply(Inplaces.Arity8_7<I1, I2, I3, I4, I5, I6, IO, I8> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, IO io, I8 in8) -> {
@@ -792,8 +860,6 @@ public Functions.Arity8<I1, I2, I3, I4, I5, I6, IO, I8, IO> apply(Inplaces.Arity
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace8_8ToFunction8<I1, I2, I3, I4, I5, I6, I7, IO> implements Function<Inplaces.Arity8_8<I1, I2, I3, I4, I5, I6, I7, IO>, Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, IO, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -801,6 +867,10 @@ static class Inplace8_8ToFunction8<I1, I2, I3, I4, I5, I6, I7, IO> implements Fu
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, IO, IO> apply(Inplaces.Arity8_8<I1, I2, I3, I4, I5, I6, I7, IO> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, IO io) -> {
@@ -813,8 +883,6 @@ public Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, IO, IO> apply(Inplaces.Arity
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace9_1ToFunction9<IO, I2, I3, I4, I5, I6, I7, I8, I9> implements Function<Inplaces.Arity9_1<IO, I2, I3, I4, I5, I6, I7, I8, I9>, Functions.Arity9<IO, I2, I3, I4, I5, I6, I7, I8, I9, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -822,6 +890,10 @@ static class Inplace9_1ToFunction9<IO, I2, I3, I4, I5, I6, I7, I8, I9> implement
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity9<IO, I2, I3, I4, I5, I6, I7, I8, I9, IO> apply(Inplaces.Arity9_1<IO, I2, I3, I4, I5, I6, I7, I8, I9> t) {
 			return (IO io, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9) -> {
@@ -834,8 +906,6 @@ public Functions.Arity9<IO, I2, I3, I4, I5, I6, I7, I8, I9, IO> apply(Inplaces.A
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace9_2ToFunction9<I1, IO, I3, I4, I5, I6, I7, I8, I9> implements Function<Inplaces.Arity9_2<I1, IO, I3, I4, I5, I6, I7, I8, I9>, Functions.Arity9<I1, IO, I3, I4, I5, I6, I7, I8, I9, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -843,6 +913,10 @@ static class Inplace9_2ToFunction9<I1, IO, I3, I4, I5, I6, I7, I8, I9> implement
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity9<I1, IO, I3, I4, I5, I6, I7, I8, I9, IO> apply(Inplaces.Arity9_2<I1, IO, I3, I4, I5, I6, I7, I8, I9> t) {
 			return (I1 in1, IO io, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9) -> {
@@ -855,8 +929,6 @@ public Functions.Arity9<I1, IO, I3, I4, I5, I6, I7, I8, I9, IO> apply(Inplaces.A
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace9_3ToFunction9<I1, I2, IO, I4, I5, I6, I7, I8, I9> implements Function<Inplaces.Arity9_3<I1, I2, IO, I4, I5, I6, I7, I8, I9>, Functions.Arity9<I1, I2, IO, I4, I5, I6, I7, I8, I9, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -864,6 +936,10 @@ static class Inplace9_3ToFunction9<I1, I2, IO, I4, I5, I6, I7, I8, I9> implement
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity9<I1, I2, IO, I4, I5, I6, I7, I8, I9, IO> apply(Inplaces.Arity9_3<I1, I2, IO, I4, I5, I6, I7, I8, I9> t) {
 			return (I1 in1, I2 in2, IO io, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9) -> {
@@ -876,8 +952,6 @@ public Functions.Arity9<I1, I2, IO, I4, I5, I6, I7, I8, I9, IO> apply(Inplaces.A
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace9_4ToFunction9<I1, I2, I3, IO, I5, I6, I7, I8, I9> implements Function<Inplaces.Arity9_4<I1, I2, I3, IO, I5, I6, I7, I8, I9>, Functions.Arity9<I1, I2, I3, IO, I5, I6, I7, I8, I9, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -885,6 +959,10 @@ static class Inplace9_4ToFunction9<I1, I2, I3, IO, I5, I6, I7, I8, I9> implement
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity9<I1, I2, I3, IO, I5, I6, I7, I8, I9, IO> apply(Inplaces.Arity9_4<I1, I2, I3, IO, I5, I6, I7, I8, I9> t) {
 			return (I1 in1, I2 in2, I3 in3, IO io, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9) -> {
@@ -897,8 +975,6 @@ public Functions.Arity9<I1, I2, I3, IO, I5, I6, I7, I8, I9, IO> apply(Inplaces.A
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace9_5ToFunction9<I1, I2, I3, I4, IO, I6, I7, I8, I9> implements Function<Inplaces.Arity9_5<I1, I2, I3, I4, IO, I6, I7, I8, I9>, Functions.Arity9<I1, I2, I3, I4, IO, I6, I7, I8, I9, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -906,6 +982,10 @@ static class Inplace9_5ToFunction9<I1, I2, I3, I4, IO, I6, I7, I8, I9> implement
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity9<I1, I2, I3, I4, IO, I6, I7, I8, I9, IO> apply(Inplaces.Arity9_5<I1, I2, I3, I4, IO, I6, I7, I8, I9> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, IO io, I6 in6, I7 in7, I8 in8, I9 in9) -> {
@@ -918,8 +998,6 @@ public Functions.Arity9<I1, I2, I3, I4, IO, I6, I7, I8, I9, IO> apply(Inplaces.A
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace9_6ToFunction9<I1, I2, I3, I4, I5, IO, I7, I8, I9> implements Function<Inplaces.Arity9_6<I1, I2, I3, I4, I5, IO, I7, I8, I9>, Functions.Arity9<I1, I2, I3, I4, I5, IO, I7, I8, I9, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -927,6 +1005,10 @@ static class Inplace9_6ToFunction9<I1, I2, I3, I4, I5, IO, I7, I8, I9> implement
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity9<I1, I2, I3, I4, I5, IO, I7, I8, I9, IO> apply(Inplaces.Arity9_6<I1, I2, I3, I4, I5, IO, I7, I8, I9> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, IO io, I7 in7, I8 in8, I9 in9) -> {
@@ -939,8 +1021,6 @@ public Functions.Arity9<I1, I2, I3, I4, I5, IO, I7, I8, I9, IO> apply(Inplaces.A
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace9_7ToFunction9<I1, I2, I3, I4, I5, I6, IO, I8, I9> implements Function<Inplaces.Arity9_7<I1, I2, I3, I4, I5, I6, IO, I8, I9>, Functions.Arity9<I1, I2, I3, I4, I5, I6, IO, I8, I9, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -948,6 +1028,10 @@ static class Inplace9_7ToFunction9<I1, I2, I3, I4, I5, I6, IO, I8, I9> implement
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity9<I1, I2, I3, I4, I5, I6, IO, I8, I9, IO> apply(Inplaces.Arity9_7<I1, I2, I3, I4, I5, I6, IO, I8, I9> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, IO io, I8 in8, I9 in9) -> {
@@ -960,8 +1044,6 @@ public Functions.Arity9<I1, I2, I3, I4, I5, I6, IO, I8, I9, IO> apply(Inplaces.A
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace9_8ToFunction9<I1, I2, I3, I4, I5, I6, I7, IO, I9> implements Function<Inplaces.Arity9_8<I1, I2, I3, I4, I5, I6, I7, IO, I9>, Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, IO, I9, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -969,6 +1051,10 @@ static class Inplace9_8ToFunction9<I1, I2, I3, I4, I5, I6, I7, IO, I9> implement
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, IO, I9, IO> apply(Inplaces.Arity9_8<I1, I2, I3, I4, I5, I6, I7, IO, I9> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, IO io, I9 in9) -> {
@@ -981,8 +1067,6 @@ public Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, IO, I9, IO> apply(Inplaces.A
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace9_9ToFunction9<I1, I2, I3, I4, I5, I6, I7, I8, IO> implements Function<Inplaces.Arity9_9<I1, I2, I3, I4, I5, I6, I7, I8, IO>, Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, IO, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -990,6 +1074,10 @@ static class Inplace9_9ToFunction9<I1, I2, I3, I4, I5, I6, I7, I8, IO> implement
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, IO, IO> apply(Inplaces.Arity9_9<I1, I2, I3, I4, I5, I6, I7, I8, IO> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, IO io) -> {
@@ -1002,8 +1090,6 @@ public Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, IO, IO> apply(Inplaces.A
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace10_1ToFunction10<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10> implements Function<Inplaces.Arity10_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10>, Functions.Arity10<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1011,6 +1097,10 @@ static class Inplace10_1ToFunction10<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10> im
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity10<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO> apply(Inplaces.Arity10_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10> t) {
 			return (IO io, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10) -> {
@@ -1023,8 +1113,6 @@ public Functions.Arity10<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO> apply(Inpl
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace10_2ToFunction10<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10> implements Function<Inplaces.Arity10_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10>, Functions.Arity10<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1032,6 +1120,10 @@ static class Inplace10_2ToFunction10<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10> im
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity10<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, IO> apply(Inplaces.Arity10_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10> t) {
 			return (I1 in1, IO io, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10) -> {
@@ -1044,8 +1136,6 @@ public Functions.Arity10<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, IO> apply(Inpl
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace10_3ToFunction10<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10> implements Function<Inplaces.Arity10_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10>, Functions.Arity10<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1053,6 +1143,10 @@ static class Inplace10_3ToFunction10<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10> im
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity10<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, IO> apply(Inplaces.Arity10_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10> t) {
 			return (I1 in1, I2 in2, IO io, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10) -> {
@@ -1065,8 +1159,6 @@ public Functions.Arity10<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, IO> apply(Inpl
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace10_4ToFunction10<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10> implements Function<Inplaces.Arity10_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10>, Functions.Arity10<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1074,6 +1166,10 @@ static class Inplace10_4ToFunction10<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10> im
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity10<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, IO> apply(Inplaces.Arity10_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10> t) {
 			return (I1 in1, I2 in2, I3 in3, IO io, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10) -> {
@@ -1086,8 +1182,6 @@ public Functions.Arity10<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, IO> apply(Inpl
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace10_5ToFunction10<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10> implements Function<Inplaces.Arity10_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10>, Functions.Arity10<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1095,6 +1189,10 @@ static class Inplace10_5ToFunction10<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10> im
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity10<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, IO> apply(Inplaces.Arity10_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, IO io, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10) -> {
@@ -1107,8 +1205,6 @@ public Functions.Arity10<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, IO> apply(Inpl
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace10_6ToFunction10<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10> implements Function<Inplaces.Arity10_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10>, Functions.Arity10<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1116,6 +1212,10 @@ static class Inplace10_6ToFunction10<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10> im
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity10<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, IO> apply(Inplaces.Arity10_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, IO io, I7 in7, I8 in8, I9 in9, I10 in10) -> {
@@ -1128,8 +1228,6 @@ public Functions.Arity10<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, IO> apply(Inpl
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace10_7ToFunction10<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10> implements Function<Inplaces.Arity10_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10>, Functions.Arity10<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1137,6 +1235,10 @@ static class Inplace10_7ToFunction10<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10> im
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity10<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, IO> apply(Inplaces.Arity10_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, IO io, I8 in8, I9 in9, I10 in10) -> {
@@ -1149,8 +1251,6 @@ public Functions.Arity10<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, IO> apply(Inpl
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace10_8ToFunction10<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10> implements Function<Inplaces.Arity10_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10>, Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1158,6 +1258,10 @@ static class Inplace10_8ToFunction10<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10> im
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, IO> apply(Inplaces.Arity10_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, IO io, I9 in9, I10 in10) -> {
@@ -1170,8 +1274,6 @@ public Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, IO> apply(Inpl
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace10_9ToFunction10<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10> implements Function<Inplaces.Arity10_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10>, Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1179,6 +1281,10 @@ static class Inplace10_9ToFunction10<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10> im
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, IO> apply(Inplaces.Arity10_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, IO io, I10 in10) -> {
@@ -1191,8 +1297,6 @@ public Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, IO> apply(Inpl
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace10_10ToFunction10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO> implements Function<Inplaces.Arity10_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO>, Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1200,6 +1304,10 @@ static class Inplace10_10ToFunction10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO> im
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, IO> apply(Inplaces.Arity10_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, IO io) -> {
@@ -1212,8 +1320,6 @@ public Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, IO> apply(Inpla
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace11_1ToFunction11<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> implements Function<Inplaces.Arity11_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11>, Functions.Arity11<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1221,6 +1327,10 @@ static class Inplace11_1ToFunction11<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity11<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO> apply(Inplaces.Arity11_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> t) {
 			return (IO io, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11) -> {
@@ -1233,8 +1343,6 @@ public Functions.Arity11<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO> apply
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace11_2ToFunction11<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11> implements Function<Inplaces.Arity11_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11>, Functions.Arity11<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1242,6 +1350,10 @@ static class Inplace11_2ToFunction11<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity11<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO> apply(Inplaces.Arity11_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11> t) {
 			return (I1 in1, IO io, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11) -> {
@@ -1254,8 +1366,6 @@ public Functions.Arity11<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO> apply
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace11_3ToFunction11<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11> implements Function<Inplaces.Arity11_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11>, Functions.Arity11<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1263,6 +1373,10 @@ static class Inplace11_3ToFunction11<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity11<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, IO> apply(Inplaces.Arity11_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11> t) {
 			return (I1 in1, I2 in2, IO io, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11) -> {
@@ -1275,8 +1389,6 @@ public Functions.Arity11<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, IO> apply
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace11_4ToFunction11<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11> implements Function<Inplaces.Arity11_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11>, Functions.Arity11<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1284,6 +1396,10 @@ static class Inplace11_4ToFunction11<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity11<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, IO> apply(Inplaces.Arity11_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11> t) {
 			return (I1 in1, I2 in2, I3 in3, IO io, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11) -> {
@@ -1296,8 +1412,6 @@ public Functions.Arity11<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, IO> apply
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace11_5ToFunction11<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11> implements Function<Inplaces.Arity11_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11>, Functions.Arity11<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1305,6 +1419,10 @@ static class Inplace11_5ToFunction11<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity11<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, IO> apply(Inplaces.Arity11_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, IO io, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11) -> {
@@ -1317,8 +1435,6 @@ public Functions.Arity11<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, IO> apply
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace11_6ToFunction11<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11> implements Function<Inplaces.Arity11_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11>, Functions.Arity11<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1326,6 +1442,10 @@ static class Inplace11_6ToFunction11<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity11<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, IO> apply(Inplaces.Arity11_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, IO io, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11) -> {
@@ -1338,8 +1458,6 @@ public Functions.Arity11<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, IO> apply
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace11_7ToFunction11<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11> implements Function<Inplaces.Arity11_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11>, Functions.Arity11<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1347,6 +1465,10 @@ static class Inplace11_7ToFunction11<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity11<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, IO> apply(Inplaces.Arity11_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, IO io, I8 in8, I9 in9, I10 in10, I11 in11) -> {
@@ -1359,8 +1481,6 @@ public Functions.Arity11<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, IO> apply
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace11_8ToFunction11<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11> implements Function<Inplaces.Arity11_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11>, Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1368,6 +1488,10 @@ static class Inplace11_8ToFunction11<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, IO> apply(Inplaces.Arity11_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, IO io, I9 in9, I10 in10, I11 in11) -> {
@@ -1380,8 +1504,6 @@ public Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, IO> apply
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace11_9ToFunction11<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11> implements Function<Inplaces.Arity11_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11>, Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1389,6 +1511,10 @@ static class Inplace11_9ToFunction11<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, IO> apply(Inplaces.Arity11_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, IO io, I10 in10, I11 in11) -> {
@@ -1401,8 +1527,6 @@ public Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, IO> apply
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace11_10ToFunction11<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11> implements Function<Inplaces.Arity11_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11>, Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1410,6 +1534,10 @@ static class Inplace11_10ToFunction11<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, IO> apply(Inplaces.Arity11_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, IO io, I11 in11) -> {
@@ -1422,8 +1550,6 @@ public Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, IO> apply(
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace11_11ToFunction11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO> implements Function<Inplaces.Arity11_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO>, Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1431,6 +1557,10 @@ static class Inplace11_11ToFunction11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, IO> apply(Inplaces.Arity11_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, IO io) -> {
@@ -1443,8 +1573,6 @@ public Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, IO> apply(
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace12_1ToFunction12<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> implements Function<Inplaces.Arity12_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12>, Functions.Arity12<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1452,6 +1580,10 @@ static class Inplace12_1ToFunction12<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity12<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO> apply(Inplaces.Arity12_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> t) {
 			return (IO io, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12) -> {
@@ -1464,8 +1596,6 @@ public Functions.Arity12<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO>
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace12_2ToFunction12<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> implements Function<Inplaces.Arity12_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12>, Functions.Arity12<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1473,6 +1603,10 @@ static class Inplace12_2ToFunction12<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity12<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO> apply(Inplaces.Arity12_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> t) {
 			return (I1 in1, IO io, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12) -> {
@@ -1485,8 +1619,6 @@ public Functions.Arity12<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO>
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace12_3ToFunction12<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12> implements Function<Inplaces.Arity12_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12>, Functions.Arity12<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1494,6 +1626,10 @@ static class Inplace12_3ToFunction12<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity12<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO> apply(Inplaces.Arity12_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12> t) {
 			return (I1 in1, I2 in2, IO io, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12) -> {
@@ -1506,8 +1642,6 @@ public Functions.Arity12<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO>
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace12_4ToFunction12<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12> implements Function<Inplaces.Arity12_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12>, Functions.Arity12<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1515,6 +1649,10 @@ static class Inplace12_4ToFunction12<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity12<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, IO> apply(Inplaces.Arity12_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12> t) {
 			return (I1 in1, I2 in2, I3 in3, IO io, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12) -> {
@@ -1527,8 +1665,6 @@ public Functions.Arity12<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, IO>
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace12_5ToFunction12<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12> implements Function<Inplaces.Arity12_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12>, Functions.Arity12<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1536,6 +1672,10 @@ static class Inplace12_5ToFunction12<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity12<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, IO> apply(Inplaces.Arity12_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, IO io, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12) -> {
@@ -1548,8 +1688,6 @@ public Functions.Arity12<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, IO>
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace12_6ToFunction12<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12> implements Function<Inplaces.Arity12_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12>, Functions.Arity12<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1557,6 +1695,10 @@ static class Inplace12_6ToFunction12<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity12<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, IO> apply(Inplaces.Arity12_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, IO io, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12) -> {
@@ -1569,8 +1711,6 @@ public Functions.Arity12<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, IO>
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace12_7ToFunction12<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12> implements Function<Inplaces.Arity12_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12>, Functions.Arity12<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1578,6 +1718,10 @@ static class Inplace12_7ToFunction12<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity12<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, IO> apply(Inplaces.Arity12_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, IO io, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12) -> {
@@ -1590,8 +1734,6 @@ public Functions.Arity12<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, IO>
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace12_8ToFunction12<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12> implements Function<Inplaces.Arity12_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12>, Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1599,6 +1741,10 @@ static class Inplace12_8ToFunction12<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, IO> apply(Inplaces.Arity12_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, IO io, I9 in9, I10 in10, I11 in11, I12 in12) -> {
@@ -1611,8 +1757,6 @@ public Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, IO>
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace12_9ToFunction12<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12> implements Function<Inplaces.Arity12_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12>, Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1620,6 +1764,10 @@ static class Inplace12_9ToFunction12<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, IO> apply(Inplaces.Arity12_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, IO io, I10 in10, I11 in11, I12 in12) -> {
@@ -1632,8 +1780,6 @@ public Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, IO>
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace12_10ToFunction12<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12> implements Function<Inplaces.Arity12_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12>, Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1641,6 +1787,10 @@ static class Inplace12_10ToFunction12<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, IO> apply(Inplaces.Arity12_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, IO io, I11 in11, I12 in12) -> {
@@ -1653,8 +1803,6 @@ public Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, IO> a
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace12_11ToFunction12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12> implements Function<Inplaces.Arity12_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12>, Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1662,6 +1810,10 @@ static class Inplace12_11ToFunction12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, IO> apply(Inplaces.Arity12_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, IO io, I12 in12) -> {
@@ -1674,8 +1826,6 @@ public Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, IO> a
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace12_12ToFunction12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO> implements Function<Inplaces.Arity12_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO>, Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1683,6 +1833,10 @@ static class Inplace12_12ToFunction12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, IO> apply(Inplaces.Arity12_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, IO io) -> {
@@ -1695,8 +1849,6 @@ public Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, IO> a
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace13_1ToFunction13<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> implements Function<Inplaces.Arity13_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13>, Functions.Arity13<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1704,6 +1856,10 @@ static class Inplace13_1ToFunction13<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity13<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO> apply(Inplaces.Arity13_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> t) {
 			return (IO io, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13) -> {
@@ -1716,8 +1872,6 @@ public Functions.Arity13<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace13_2ToFunction13<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> implements Function<Inplaces.Arity13_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13>, Functions.Arity13<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1725,6 +1879,10 @@ static class Inplace13_2ToFunction13<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity13<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO> apply(Inplaces.Arity13_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> t) {
 			return (I1 in1, IO io, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13) -> {
@@ -1737,8 +1895,6 @@ public Functions.Arity13<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace13_3ToFunction13<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> implements Function<Inplaces.Arity13_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13>, Functions.Arity13<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1746,6 +1902,10 @@ static class Inplace13_3ToFunction13<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity13<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO> apply(Inplaces.Arity13_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> t) {
 			return (I1 in1, I2 in2, IO io, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13) -> {
@@ -1758,8 +1918,6 @@ public Functions.Arity13<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace13_4ToFunction13<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13> implements Function<Inplaces.Arity13_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13>, Functions.Arity13<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1767,6 +1925,10 @@ static class Inplace13_4ToFunction13<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity13<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO> apply(Inplaces.Arity13_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13> t) {
 			return (I1 in1, I2 in2, I3 in3, IO io, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13) -> {
@@ -1779,8 +1941,6 @@ public Functions.Arity13<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace13_5ToFunction13<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13> implements Function<Inplaces.Arity13_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13>, Functions.Arity13<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1788,6 +1948,10 @@ static class Inplace13_5ToFunction13<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity13<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, IO> apply(Inplaces.Arity13_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, IO io, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13) -> {
@@ -1800,8 +1964,6 @@ public Functions.Arity13<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace13_6ToFunction13<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13> implements Function<Inplaces.Arity13_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13>, Functions.Arity13<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1809,6 +1971,10 @@ static class Inplace13_6ToFunction13<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity13<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, IO> apply(Inplaces.Arity13_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, IO io, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13) -> {
@@ -1821,8 +1987,6 @@ public Functions.Arity13<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace13_7ToFunction13<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13> implements Function<Inplaces.Arity13_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13>, Functions.Arity13<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1830,6 +1994,10 @@ static class Inplace13_7ToFunction13<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity13<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, IO> apply(Inplaces.Arity13_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, IO io, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13) -> {
@@ -1842,8 +2010,6 @@ public Functions.Arity13<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace13_8ToFunction13<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13> implements Function<Inplaces.Arity13_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13>, Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1851,6 +2017,10 @@ static class Inplace13_8ToFunction13<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, IO> apply(Inplaces.Arity13_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, IO io, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13) -> {
@@ -1863,8 +2033,6 @@ public Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace13_9ToFunction13<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13> implements Function<Inplaces.Arity13_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13>, Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1872,6 +2040,10 @@ static class Inplace13_9ToFunction13<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, IO> apply(Inplaces.Arity13_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, IO io, I10 in10, I11 in11, I12 in12, I13 in13) -> {
@@ -1884,8 +2056,6 @@ public Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace13_10ToFunction13<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13> implements Function<Inplaces.Arity13_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13>, Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1893,6 +2063,10 @@ static class Inplace13_10ToFunction13<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, IO> apply(Inplaces.Arity13_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, IO io, I11 in11, I12 in12, I13 in13) -> {
@@ -1905,8 +2079,6 @@ public Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace13_11ToFunction13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13> implements Function<Inplaces.Arity13_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13>, Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1914,6 +2086,10 @@ static class Inplace13_11ToFunction13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, IO> apply(Inplaces.Arity13_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, IO io, I12 in12, I13 in13) -> {
@@ -1926,8 +2102,6 @@ public Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace13_12ToFunction13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13> implements Function<Inplaces.Arity13_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13>, Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1935,6 +2109,10 @@ static class Inplace13_12ToFunction13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, IO> apply(Inplaces.Arity13_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, IO io, I13 in13) -> {
@@ -1947,8 +2125,6 @@ public Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace13_13ToFunction13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO> implements Function<Inplaces.Arity13_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO>, Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1956,6 +2132,10 @@ static class Inplace13_13ToFunction13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, IO> apply(Inplaces.Arity13_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, IO io) -> {
@@ -1968,8 +2148,6 @@ public Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace14_1ToFunction14<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> implements Function<Inplaces.Arity14_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14>, Functions.Arity14<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1977,6 +2155,10 @@ static class Inplace14_1ToFunction14<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity14<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO> apply(Inplaces.Arity14_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> t) {
 			return (IO io, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14) -> {
@@ -1989,8 +2171,6 @@ public Functions.Arity14<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace14_2ToFunction14<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> implements Function<Inplaces.Arity14_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14>, Functions.Arity14<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -1998,6 +2178,10 @@ static class Inplace14_2ToFunction14<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity14<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO> apply(Inplaces.Arity14_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> t) {
 			return (I1 in1, IO io, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14) -> {
@@ -2010,8 +2194,6 @@ public Functions.Arity14<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace14_3ToFunction14<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> implements Function<Inplaces.Arity14_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14>, Functions.Arity14<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2019,6 +2201,10 @@ static class Inplace14_3ToFunction14<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity14<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO> apply(Inplaces.Arity14_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> t) {
 			return (I1 in1, I2 in2, IO io, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14) -> {
@@ -2031,8 +2217,6 @@ public Functions.Arity14<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace14_4ToFunction14<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> implements Function<Inplaces.Arity14_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14>, Functions.Arity14<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2040,6 +2224,10 @@ static class Inplace14_4ToFunction14<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity14<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO> apply(Inplaces.Arity14_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> t) {
 			return (I1 in1, I2 in2, I3 in3, IO io, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14) -> {
@@ -2052,8 +2240,6 @@ public Functions.Arity14<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace14_5ToFunction14<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14> implements Function<Inplaces.Arity14_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14>, Functions.Arity14<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2061,6 +2247,10 @@ static class Inplace14_5ToFunction14<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity14<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO> apply(Inplaces.Arity14_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, IO io, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14) -> {
@@ -2073,8 +2263,6 @@ public Functions.Arity14<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace14_6ToFunction14<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14> implements Function<Inplaces.Arity14_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14>, Functions.Arity14<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2082,6 +2270,10 @@ static class Inplace14_6ToFunction14<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity14<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, IO> apply(Inplaces.Arity14_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, IO io, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14) -> {
@@ -2094,8 +2286,6 @@ public Functions.Arity14<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace14_7ToFunction14<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14> implements Function<Inplaces.Arity14_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14>, Functions.Arity14<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2103,6 +2293,10 @@ static class Inplace14_7ToFunction14<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity14<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, IO> apply(Inplaces.Arity14_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, IO io, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14) -> {
@@ -2115,8 +2309,6 @@ public Functions.Arity14<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace14_8ToFunction14<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14> implements Function<Inplaces.Arity14_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14>, Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2124,6 +2316,10 @@ static class Inplace14_8ToFunction14<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, IO> apply(Inplaces.Arity14_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, IO io, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14) -> {
@@ -2136,8 +2332,6 @@ public Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace14_9ToFunction14<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14> implements Function<Inplaces.Arity14_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14>, Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2145,6 +2339,10 @@ static class Inplace14_9ToFunction14<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, IO> apply(Inplaces.Arity14_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, IO io, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14) -> {
@@ -2157,8 +2355,6 @@ public Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace14_10ToFunction14<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14> implements Function<Inplaces.Arity14_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14>, Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2166,6 +2362,10 @@ static class Inplace14_10ToFunction14<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, IO> apply(Inplaces.Arity14_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, IO io, I11 in11, I12 in12, I13 in13, I14 in14) -> {
@@ -2178,8 +2378,6 @@ public Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace14_11ToFunction14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14> implements Function<Inplaces.Arity14_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14>, Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2187,6 +2385,10 @@ static class Inplace14_11ToFunction14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, IO> apply(Inplaces.Arity14_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, IO io, I12 in12, I13 in13, I14 in14) -> {
@@ -2199,8 +2401,6 @@ public Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace14_12ToFunction14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14> implements Function<Inplaces.Arity14_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14>, Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2208,6 +2408,10 @@ static class Inplace14_12ToFunction14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, IO> apply(Inplaces.Arity14_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, IO io, I13 in13, I14 in14) -> {
@@ -2220,8 +2424,6 @@ public Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace14_13ToFunction14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14> implements Function<Inplaces.Arity14_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14>, Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2229,6 +2431,10 @@ static class Inplace14_13ToFunction14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, IO> apply(Inplaces.Arity14_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, IO io, I14 in14) -> {
@@ -2241,8 +2447,6 @@ public Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace14_14ToFunction14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO> implements Function<Inplaces.Arity14_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO>, Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2250,6 +2454,10 @@ static class Inplace14_14ToFunction14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, IO> apply(Inplaces.Arity14_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, IO io) -> {
@@ -2262,8 +2470,6 @@ public Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace15_1ToFunction15<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> implements Function<Inplaces.Arity15_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15>, Functions.Arity15<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2271,6 +2477,10 @@ static class Inplace15_1ToFunction15<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity15<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO> apply(Inplaces.Arity15_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> t) {
 			return (IO io, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14, I15 in15) -> {
@@ -2283,8 +2493,6 @@ public Functions.Arity15<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace15_2ToFunction15<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> implements Function<Inplaces.Arity15_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15>, Functions.Arity15<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2292,6 +2500,10 @@ static class Inplace15_2ToFunction15<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity15<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO> apply(Inplaces.Arity15_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> t) {
 			return (I1 in1, IO io, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14, I15 in15) -> {
@@ -2304,8 +2516,6 @@ public Functions.Arity15<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace15_3ToFunction15<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> implements Function<Inplaces.Arity15_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15>, Functions.Arity15<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2313,6 +2523,10 @@ static class Inplace15_3ToFunction15<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity15<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO> apply(Inplaces.Arity15_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> t) {
 			return (I1 in1, I2 in2, IO io, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14, I15 in15) -> {
@@ -2325,8 +2539,6 @@ public Functions.Arity15<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace15_4ToFunction15<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> implements Function<Inplaces.Arity15_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15>, Functions.Arity15<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2334,6 +2546,10 @@ static class Inplace15_4ToFunction15<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity15<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO> apply(Inplaces.Arity15_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> t) {
 			return (I1 in1, I2 in2, I3 in3, IO io, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14, I15 in15) -> {
@@ -2346,8 +2562,6 @@ public Functions.Arity15<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace15_5ToFunction15<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> implements Function<Inplaces.Arity15_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15>, Functions.Arity15<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2355,6 +2569,10 @@ static class Inplace15_5ToFunction15<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity15<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO> apply(Inplaces.Arity15_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, IO io, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14, I15 in15) -> {
@@ -2367,8 +2585,6 @@ public Functions.Arity15<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace15_6ToFunction15<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15> implements Function<Inplaces.Arity15_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15>, Functions.Arity15<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2376,6 +2592,10 @@ static class Inplace15_6ToFunction15<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity15<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO> apply(Inplaces.Arity15_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, IO io, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14, I15 in15) -> {
@@ -2388,8 +2608,6 @@ public Functions.Arity15<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace15_7ToFunction15<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15> implements Function<Inplaces.Arity15_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15>, Functions.Arity15<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2397,6 +2615,10 @@ static class Inplace15_7ToFunction15<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity15<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15, IO> apply(Inplaces.Arity15_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, IO io, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14, I15 in15) -> {
@@ -2409,8 +2631,6 @@ public Functions.Arity15<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace15_8ToFunction15<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15> implements Function<Inplaces.Arity15_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15>, Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2418,6 +2638,10 @@ static class Inplace15_8ToFunction15<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15, IO> apply(Inplaces.Arity15_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, IO io, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14, I15 in15) -> {
@@ -2430,8 +2654,6 @@ public Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace15_9ToFunction15<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15> implements Function<Inplaces.Arity15_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15>, Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2439,6 +2661,10 @@ static class Inplace15_9ToFunction15<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15, IO> apply(Inplaces.Arity15_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, IO io, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14, I15 in15) -> {
@@ -2451,8 +2677,6 @@ public Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace15_10ToFunction15<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15> implements Function<Inplaces.Arity15_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15>, Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2460,6 +2684,10 @@ static class Inplace15_10ToFunction15<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15, IO> apply(Inplaces.Arity15_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, IO io, I11 in11, I12 in12, I13 in13, I14 in14, I15 in15) -> {
@@ -2472,8 +2700,6 @@ public Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace15_11ToFunction15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15> implements Function<Inplaces.Arity15_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15>, Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2481,6 +2707,10 @@ static class Inplace15_11ToFunction15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15, IO> apply(Inplaces.Arity15_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, IO io, I12 in12, I13 in13, I14 in14, I15 in15) -> {
@@ -2493,8 +2723,6 @@ public Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace15_12ToFunction15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15> implements Function<Inplaces.Arity15_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15>, Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2502,6 +2730,10 @@ static class Inplace15_12ToFunction15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15, IO> apply(Inplaces.Arity15_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, IO io, I13 in13, I14 in14, I15 in15) -> {
@@ -2514,8 +2746,6 @@ public Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace15_13ToFunction15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15> implements Function<Inplaces.Arity15_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15>, Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2523,6 +2753,10 @@ static class Inplace15_13ToFunction15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15, IO> apply(Inplaces.Arity15_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, IO io, I14 in14, I15 in15) -> {
@@ -2535,8 +2769,6 @@ public Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace15_14ToFunction15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15> implements Function<Inplaces.Arity15_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15>, Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2544,6 +2776,10 @@ static class Inplace15_14ToFunction15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15, IO> apply(Inplaces.Arity15_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, IO io, I15 in15) -> {
@@ -2556,8 +2792,6 @@ public Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace15_15ToFunction15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO> implements Function<Inplaces.Arity15_15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO>, Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2565,6 +2799,10 @@ static class Inplace15_15ToFunction15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO, IO> apply(Inplaces.Arity15_15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14, IO io) -> {
@@ -2577,8 +2815,6 @@ public Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace16_1ToFunction16<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> implements Function<Inplaces.Arity16_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16>, Functions.Arity16<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2586,6 +2822,10 @@ static class Inplace16_1ToFunction16<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity16<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, IO> apply(Inplaces.Arity16_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> t) {
 			return (IO io, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14, I15 in15, I16 in16) -> {
@@ -2598,8 +2838,6 @@ public Functions.Arity16<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace16_2ToFunction16<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> implements Function<Inplaces.Arity16_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16>, Functions.Arity16<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2607,6 +2845,10 @@ static class Inplace16_2ToFunction16<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity16<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, IO> apply(Inplaces.Arity16_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> t) {
 			return (I1 in1, IO io, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14, I15 in15, I16 in16) -> {
@@ -2619,8 +2861,6 @@ public Functions.Arity16<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace16_3ToFunction16<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> implements Function<Inplaces.Arity16_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16>, Functions.Arity16<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2628,6 +2868,10 @@ static class Inplace16_3ToFunction16<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity16<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, IO> apply(Inplaces.Arity16_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> t) {
 			return (I1 in1, I2 in2, IO io, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14, I15 in15, I16 in16) -> {
@@ -2640,8 +2884,6 @@ public Functions.Arity16<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace16_4ToFunction16<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> implements Function<Inplaces.Arity16_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16>, Functions.Arity16<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2649,6 +2891,10 @@ static class Inplace16_4ToFunction16<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity16<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, IO> apply(Inplaces.Arity16_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> t) {
 			return (I1 in1, I2 in2, I3 in3, IO io, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14, I15 in15, I16 in16) -> {
@@ -2661,8 +2907,6 @@ public Functions.Arity16<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace16_5ToFunction16<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> implements Function<Inplaces.Arity16_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16>, Functions.Arity16<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2670,6 +2914,10 @@ static class Inplace16_5ToFunction16<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity16<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, IO> apply(Inplaces.Arity16_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, IO io, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14, I15 in15, I16 in16) -> {
@@ -2682,8 +2930,6 @@ public Functions.Arity16<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace16_6ToFunction16<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> implements Function<Inplaces.Arity16_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16>, Functions.Arity16<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2691,6 +2937,10 @@ static class Inplace16_6ToFunction16<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity16<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, IO> apply(Inplaces.Arity16_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, IO io, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14, I15 in15, I16 in16) -> {
@@ -2703,8 +2953,6 @@ public Functions.Arity16<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace16_7ToFunction16<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15, I16> implements Function<Inplaces.Arity16_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15, I16>, Functions.Arity16<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15, I16, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2712,6 +2960,10 @@ static class Inplace16_7ToFunction16<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity16<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15, I16, IO> apply(Inplaces.Arity16_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15, I16> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, IO io, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14, I15 in15, I16 in16) -> {
@@ -2724,8 +2976,6 @@ public Functions.Arity16<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace16_8ToFunction16<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15, I16> implements Function<Inplaces.Arity16_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15, I16>, Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15, I16, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2733,6 +2983,10 @@ static class Inplace16_8ToFunction16<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15, I16, IO> apply(Inplaces.Arity16_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15, I16> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, IO io, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14, I15 in15, I16 in16) -> {
@@ -2745,8 +2999,6 @@ public Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace16_9ToFunction16<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15, I16> implements Function<Inplaces.Arity16_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15, I16>, Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15, I16, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2754,6 +3006,10 @@ static class Inplace16_9ToFunction16<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15, I16, IO> apply(Inplaces.Arity16_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15, I16> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, IO io, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14, I15 in15, I16 in16) -> {
@@ -2766,8 +3022,6 @@ public Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace16_10ToFunction16<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15, I16> implements Function<Inplaces.Arity16_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15, I16>, Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15, I16, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2775,6 +3029,10 @@ static class Inplace16_10ToFunction16<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I1
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15, I16, IO> apply(Inplaces.Arity16_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15, I16> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, IO io, I11 in11, I12 in12, I13 in13, I14 in14, I15 in15, I16 in16) -> {
@@ -2787,8 +3045,6 @@ public Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace16_11ToFunction16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15, I16> implements Function<Inplaces.Arity16_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15, I16>, Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15, I16, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2796,6 +3052,10 @@ static class Inplace16_11ToFunction16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15, I16, IO> apply(Inplaces.Arity16_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15, I16> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, IO io, I12 in12, I13 in13, I14 in14, I15 in15, I16 in16) -> {
@@ -2808,8 +3068,6 @@ public Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace16_12ToFunction16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15, I16> implements Function<Inplaces.Arity16_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15, I16>, Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15, I16, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2817,6 +3075,10 @@ static class Inplace16_12ToFunction16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15, I16, IO> apply(Inplaces.Arity16_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15, I16> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, IO io, I13 in13, I14 in14, I15 in15, I16 in16) -> {
@@ -2829,8 +3091,6 @@ public Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace16_13ToFunction16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15, I16> implements Function<Inplaces.Arity16_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15, I16>, Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15, I16, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2838,6 +3098,10 @@ static class Inplace16_13ToFunction16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15, I16, IO> apply(Inplaces.Arity16_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15, I16> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, IO io, I14 in14, I15 in15, I16 in16) -> {
@@ -2850,8 +3114,6 @@ public Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace16_14ToFunction16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15, I16> implements Function<Inplaces.Arity16_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15, I16>, Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15, I16, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2859,6 +3121,10 @@ static class Inplace16_14ToFunction16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15, I16, IO> apply(Inplaces.Arity16_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15, I16> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, IO io, I15 in15, I16 in16) -> {
@@ -2871,8 +3137,6 @@ public Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace16_15ToFunction16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO, I16> implements Function<Inplaces.Arity16_15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO, I16>, Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO, I16, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2880,6 +3144,10 @@ static class Inplace16_15ToFunction16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO, I16, IO> apply(Inplaces.Arity16_15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO, I16> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14, IO io, I16 in16) -> {
@@ -2892,8 +3160,6 @@ public Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 	}
 
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace16_16ToFunction16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO> implements Function<Inplaces.Arity16_16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO>, Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO, IO>> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -2901,6 +3167,10 @@ static class Inplace16_16ToFunction16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO, IO> apply(Inplaces.Arity16_16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO> t) {
 			return (I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14, I15 in15, IO io) -> {
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java
index 4a8d46954..a96ccaf0f 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java
@@ -55,8 +55,6 @@
 public class ComputerToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> {
 
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Computers.Arity0<O>, Computers.Arity0<Iterable<O>>> liftComputer0 = 
 		(computer) -> {
 			return (out) -> {
@@ -68,8 +66,6 @@ public class ComputerToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 		};
 
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Computers.Arity1<I, O>, Computers.Arity1<Iterable<I>, Iterable<O>>> liftComputer1 = 
 		(computer) -> {
 			return (in, out) -> {
@@ -82,8 +78,6 @@ public class ComputerToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 		};
 
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Computers.Arity2<I1, I2, O>, Computers.Arity2<Iterable<I1>, Iterable<I2>, Iterable<O>>> liftComputer2 = 
 		(computer) -> {
 			return (in1, in2, out) -> {
@@ -97,8 +91,6 @@ public class ComputerToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 		};
 
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Computers.Arity3<I1, I2, I3, O>, Computers.Arity3<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<O>>> liftComputer3 = 
 		(computer) -> {
 			return (in1, in2, in3, out) -> {
@@ -113,8 +105,6 @@ public class ComputerToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 		};
 
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Computers.Arity4<I1, I2, I3, I4, O>, Computers.Arity4<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<O>>> liftComputer4 = 
 		(computer) -> {
 			return (in1, in2, in3, in4, out) -> {
@@ -130,8 +120,6 @@ public class ComputerToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 		};
 
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Computers.Arity5<I1, I2, I3, I4, I5, O>, Computers.Arity5<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<O>>> liftComputer5 = 
 		(computer) -> {
 			return (in1, in2, in3, in4, in5, out) -> {
@@ -148,8 +136,6 @@ public class ComputerToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 		};
 
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Computers.Arity6<I1, I2, I3, I4, I5, I6, O>, Computers.Arity6<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<O>>> liftComputer6 = 
 		(computer) -> {
 			return (in1, in2, in3, in4, in5, in6, out) -> {
@@ -167,8 +153,6 @@ public class ComputerToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 		};
 
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Computers.Arity7<I1, I2, I3, I4, I5, I6, I7, O>, Computers.Arity7<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<O>>> liftComputer7 = 
 		(computer) -> {
 			return (in1, in2, in3, in4, in5, in6, in7, out) -> {
@@ -187,8 +171,6 @@ public class ComputerToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 		};
 
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Computers.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O>, Computers.Arity8<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<O>>> liftComputer8 = 
 		(computer) -> {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, out) -> {
@@ -208,8 +190,6 @@ public class ComputerToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 		};
 
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Computers.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O>, Computers.Arity9<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<O>>> liftComputer9 = 
 		(computer) -> {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, out) -> {
@@ -230,8 +210,6 @@ public class ComputerToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 		};
 
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Computers.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O>, Computers.Arity10<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<O>>> liftComputer10 = 
 		(computer) -> {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, out) -> {
@@ -253,8 +231,6 @@ public class ComputerToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 		};
 
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Computers.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O>, Computers.Arity11<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<O>>> liftComputer11 = 
 		(computer) -> {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, out) -> {
@@ -277,8 +253,6 @@ public class ComputerToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 		};
 
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Computers.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O>, Computers.Arity12<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<O>>> liftComputer12 = 
 		(computer) -> {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, out) -> {
@@ -302,8 +276,6 @@ public class ComputerToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 		};
 
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Computers.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O>, Computers.Arity13<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<O>>> liftComputer13 = 
 		(computer) -> {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, out) -> {
@@ -328,8 +300,6 @@ public class ComputerToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 		};
 
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Computers.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O>, Computers.Arity14<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<O>>> liftComputer14 = 
 		(computer) -> {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, out) -> {
@@ -355,8 +325,6 @@ public class ComputerToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 		};
 
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Computers.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O>, Computers.Arity15<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<I15>, Iterable<O>>> liftComputer15 = 
 		(computer) -> {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, out) -> {
@@ -383,8 +351,6 @@ public class ComputerToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 		};
 
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Computers.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O>, Computers.Arity16<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<I15>, Iterable<I16>, Iterable<O>>> liftComputer16 = 
 		(computer) -> {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16, out) -> {
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java
index 176831936..927d1abe3 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java
@@ -60,8 +60,6 @@ public class FunctionToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 
 	@SuppressWarnings("unchecked")
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Function<I, O>, Function<Iterable<I>, Iterable<O>>> liftFunction1 =
 		(function) -> {
 			return (in1) -> lazyIterable(itrs -> function.apply((I) itrs[0].next()), in1);
@@ -69,8 +67,6 @@ public class FunctionToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 
 	@SuppressWarnings("unchecked")
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<BiFunction<I1, I2, O>, BiFunction<Iterable<I1>, Iterable<I2>, Iterable<O>>> liftFunction2 =
 		(function) -> {
 			return (in1, in2) -> lazyIterable(itrs -> function.apply((I1) itrs[0].next(), (I2) itrs[1].next()), in1, in2);
@@ -78,8 +74,6 @@ public class FunctionToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 
 	@SuppressWarnings("unchecked")
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Functions.Arity3<I1, I2, I3, O>, Functions.Arity3<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<O>>> liftFunction3 =
 		(function) -> {
 			return (in1, in2, in3) -> lazyIterable(itrs -> function.apply((I1) itrs[0].next(), (I2) itrs[1].next(), (I3) itrs[2].next()), in1, in2, in3);
@@ -87,8 +81,6 @@ public class FunctionToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 
 	@SuppressWarnings("unchecked")
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Functions.Arity4<I1, I2, I3, I4, O>, Functions.Arity4<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<O>>> liftFunction4 =
 		(function) -> {
 			return (in1, in2, in3, in4) -> lazyIterable(itrs -> function.apply((I1) itrs[0].next(), (I2) itrs[1].next(), (I3) itrs[2].next(), (I4) itrs[3].next()), in1, in2, in3, in4);
@@ -96,8 +88,6 @@ public class FunctionToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 
 	@SuppressWarnings("unchecked")
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Functions.Arity5<I1, I2, I3, I4, I5, O>, Functions.Arity5<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<O>>> liftFunction5 =
 		(function) -> {
 			return (in1, in2, in3, in4, in5) -> lazyIterable(itrs -> function.apply((I1) itrs[0].next(), (I2) itrs[1].next(), (I3) itrs[2].next(), (I4) itrs[3].next(), (I5) itrs[4].next()), in1, in2, in3, in4, in5);
@@ -105,8 +95,6 @@ public class FunctionToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 
 	@SuppressWarnings("unchecked")
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Functions.Arity6<I1, I2, I3, I4, I5, I6, O>, Functions.Arity6<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<O>>> liftFunction6 =
 		(function) -> {
 			return (in1, in2, in3, in4, in5, in6) -> lazyIterable(itrs -> function.apply((I1) itrs[0].next(), (I2) itrs[1].next(), (I3) itrs[2].next(), (I4) itrs[3].next(), (I5) itrs[4].next(), (I6) itrs[5].next()), in1, in2, in3, in4, in5, in6);
@@ -114,8 +102,6 @@ public class FunctionToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 
 	@SuppressWarnings("unchecked")
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Functions.Arity7<I1, I2, I3, I4, I5, I6, I7, O>, Functions.Arity7<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<O>>> liftFunction7 =
 		(function) -> {
 			return (in1, in2, in3, in4, in5, in6, in7) -> lazyIterable(itrs -> function.apply((I1) itrs[0].next(), (I2) itrs[1].next(), (I3) itrs[2].next(), (I4) itrs[3].next(), (I5) itrs[4].next(), (I6) itrs[5].next(), (I7) itrs[6].next()), in1, in2, in3, in4, in5, in6, in7);
@@ -123,8 +109,6 @@ public class FunctionToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 
 	@SuppressWarnings("unchecked")
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O>, Functions.Arity8<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<O>>> liftFunction8 =
 		(function) -> {
 			return (in1, in2, in3, in4, in5, in6, in7, in8) -> lazyIterable(itrs -> function.apply((I1) itrs[0].next(), (I2) itrs[1].next(), (I3) itrs[2].next(), (I4) itrs[3].next(), (I5) itrs[4].next(), (I6) itrs[5].next(), (I7) itrs[6].next(), (I8) itrs[7].next()), in1, in2, in3, in4, in5, in6, in7, in8);
@@ -132,8 +116,6 @@ public class FunctionToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 
 	@SuppressWarnings("unchecked")
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O>, Functions.Arity9<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<O>>> liftFunction9 =
 		(function) -> {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9) -> lazyIterable(itrs -> function.apply((I1) itrs[0].next(), (I2) itrs[1].next(), (I3) itrs[2].next(), (I4) itrs[3].next(), (I5) itrs[4].next(), (I6) itrs[5].next(), (I7) itrs[6].next(), (I8) itrs[7].next(), (I9) itrs[8].next()), in1, in2, in3, in4, in5, in6, in7, in8, in9);
@@ -141,8 +123,6 @@ public class FunctionToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 
 	@SuppressWarnings("unchecked")
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O>, Functions.Arity10<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<O>>> liftFunction10 =
 		(function) -> {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10) -> lazyIterable(itrs -> function.apply((I1) itrs[0].next(), (I2) itrs[1].next(), (I3) itrs[2].next(), (I4) itrs[3].next(), (I5) itrs[4].next(), (I6) itrs[5].next(), (I7) itrs[6].next(), (I8) itrs[7].next(), (I9) itrs[8].next(), (I10) itrs[9].next()), in1, in2, in3, in4, in5, in6, in7, in8, in9, in10);
@@ -150,8 +130,6 @@ public class FunctionToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 
 	@SuppressWarnings("unchecked")
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O>, Functions.Arity11<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<O>>> liftFunction11 =
 		(function) -> {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11) -> lazyIterable(itrs -> function.apply((I1) itrs[0].next(), (I2) itrs[1].next(), (I3) itrs[2].next(), (I4) itrs[3].next(), (I5) itrs[4].next(), (I6) itrs[5].next(), (I7) itrs[6].next(), (I8) itrs[7].next(), (I9) itrs[8].next(), (I10) itrs[9].next(), (I11) itrs[10].next()), in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11);
@@ -159,8 +137,6 @@ public class FunctionToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 
 	@SuppressWarnings("unchecked")
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O>, Functions.Arity12<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<O>>> liftFunction12 =
 		(function) -> {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12) -> lazyIterable(itrs -> function.apply((I1) itrs[0].next(), (I2) itrs[1].next(), (I3) itrs[2].next(), (I4) itrs[3].next(), (I5) itrs[4].next(), (I6) itrs[5].next(), (I7) itrs[6].next(), (I8) itrs[7].next(), (I9) itrs[8].next(), (I10) itrs[9].next(), (I11) itrs[10].next(), (I12) itrs[11].next()), in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12);
@@ -168,8 +144,6 @@ public class FunctionToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 
 	@SuppressWarnings("unchecked")
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O>, Functions.Arity13<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<O>>> liftFunction13 =
 		(function) -> {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13) -> lazyIterable(itrs -> function.apply((I1) itrs[0].next(), (I2) itrs[1].next(), (I3) itrs[2].next(), (I4) itrs[3].next(), (I5) itrs[4].next(), (I6) itrs[5].next(), (I7) itrs[6].next(), (I8) itrs[7].next(), (I9) itrs[8].next(), (I10) itrs[9].next(), (I11) itrs[10].next(), (I12) itrs[11].next(), (I13) itrs[12].next()), in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13);
@@ -177,8 +151,6 @@ public class FunctionToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 
 	@SuppressWarnings("unchecked")
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O>, Functions.Arity14<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<O>>> liftFunction14 =
 		(function) -> {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14) -> lazyIterable(itrs -> function.apply((I1) itrs[0].next(), (I2) itrs[1].next(), (I3) itrs[2].next(), (I4) itrs[3].next(), (I5) itrs[4].next(), (I6) itrs[5].next(), (I7) itrs[6].next(), (I8) itrs[7].next(), (I9) itrs[8].next(), (I10) itrs[9].next(), (I11) itrs[10].next(), (I12) itrs[11].next(), (I13) itrs[12].next(), (I14) itrs[13].next()), in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
@@ -186,8 +158,6 @@ public class FunctionToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 
 	@SuppressWarnings("unchecked")
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O>, Functions.Arity15<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<I15>, Iterable<O>>> liftFunction15 =
 		(function) -> {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15) -> lazyIterable(itrs -> function.apply((I1) itrs[0].next(), (I2) itrs[1].next(), (I3) itrs[2].next(), (I4) itrs[3].next(), (I5) itrs[4].next(), (I6) itrs[5].next(), (I7) itrs[6].next(), (I8) itrs[7].next(), (I9) itrs[8].next(), (I10) itrs[9].next(), (I11) itrs[10].next(), (I12) itrs[11].next(), (I13) itrs[12].next(), (I14) itrs[13].next(), (I15) itrs[14].next()), in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
@@ -195,8 +165,6 @@ public class FunctionToIterables<I, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11
 
 	@SuppressWarnings("unchecked")
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O>, Functions.Arity16<Iterable<I1>, Iterable<I2>, Iterable<I3>, Iterable<I4>, Iterable<I5>, Iterable<I6>, Iterable<I7>, Iterable<I8>, Iterable<I9>, Iterable<I10>, Iterable<I11>, Iterable<I12>, Iterable<I13>, Iterable<I14>, Iterable<I15>, Iterable<I16>, Iterable<O>>> liftFunction16 =
 		(function) -> {
 			return (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16) -> lazyIterable(itrs -> function.apply((I1) itrs[0].next(), (I2) itrs[1].next(), (I3) itrs[2].next(), (I4) itrs[3].next(), (I5) itrs[4].next(), (I6) itrs[5].next(), (I7) itrs[6].next(), (I8) itrs[7].next(), (I9) itrs[8].next(), (I10) itrs[9].next(), (I11) itrs[10].next(), (I12) itrs[11].next(), (I13) itrs[12].next(), (I14) itrs[13].next(), (I15) itrs[14].next(), (I16) itrs[15].next()), in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/IdentityLossReporter.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/IdentityLossReporter.java
index 787145415..a23e5e1ac 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/IdentityLossReporter.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/IdentityLossReporter.java
@@ -4,9 +4,7 @@
 import org.scijava.ops.core.Op;
 import org.scijava.ops.hints.BaseOpHints.Simplification;
 import org.scijava.ops.hints.OpHints;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 import org.scijava.types.Nil;
 
 /**
@@ -17,11 +15,13 @@
  */
 @OpHints(hints = {Simplification.FORBIDDEN})
 @Plugin(type = Op.class, name = "lossReporter")
-@Parameter(key = "fromType")
-@Parameter(key = "toType")
-@Parameter(key = "maximumLoss")
 public class IdentityLossReporter<T> implements LossReporter<T, T> {
 
+	/**
+	 * @param t the Nil describing the type that is being converted from
+	 * @param u the Nil describing the type that is being converted to
+	 * @return the worst-case loss converting from type T to type T (i.e. 0)
+	 */
 	@Override
 	public Double apply(Nil<T> t, Nil<T> u) {
 		return 0.;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java
index 82dc6b4c9..0c9074269 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java
@@ -9,10 +9,6 @@
 @Plugin(type = OpCollection.class)
 public class PrimitiveArrayLossReporters {
 	
-//	@Unsimplifiable
-//	@Plugin(type = Op.class)
-//	static class ByteArrayIntArrayReporter implements LosslessReporter<Byte[], Integer[]> {}
-	
 	@OpHints(hints = {Simplification.FORBIDDEN})
 	@OpField(names = "lossReporter")
 	public final LossReporter<Byte[], Integer[]> bArrIArr = (from, to) -> 0.;
@@ -22,19 +18,3 @@ public class PrimitiveArrayLossReporters {
 	public final LossReporter<Double[], Integer[]> dArrIArr = (from, to) -> 0.;
 
 }
-
-//@Plugin(type = Op.class, name = "lossReporter")
-//@Parameter(key = "fromNil")
-//@Parameter(key = "toNil")
-//@Parameter(key = "loss")
-//public static class ArrayLossReporter<T extends Number, U extends Number> implements LossReporter<T[], U[]>{
-//
-//	@OpDependency(name = "lossReporter")
-//	private LossReporter<T, U> elementReporter;
-//	
-//	@Override
-//	public Double apply(Nil<T[]> from, Nil<U[]> to) {
-//		Nil<T> fromElement = Nil.of(from.getType())
-//	}
-//	
-//}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java
index e1eaf27ca..b813111ce 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java
@@ -34,6 +34,5 @@ public class CreateOpCollection {
 	};
 	
 	@OpField(names = "create", priority = Priority.HIGH)
-	@Parameter(key = "output")
 	public static final Producer<Double> doubleSource = () -> 0.0;
 }
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java
index 2e160b60f..69e9d464e 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java
@@ -13,13 +13,16 @@ public class Normalize {
 	public static final String NAMES = "math.minmax";
 
 	@Plugin(type = Op.class, name = NAMES)
-	@Parameter(key = "numbers")
-	@Parameter(key = "newMin")
-	@Parameter(key = "newMax")
-	@Parameter(key = "normalized")
 	public static class MathMinMaxNormalizeFunction implements Functions.Arity3<double[], Double, Double, double[]> {
 
 		@Override
+		/**
+		 * TODO
+		 * 
+		 * @param numbers
+		 * @param newMin
+		 * @param newMax
+		 */
 		public double[] apply(double[] t, Double newMin, Double newMax) {
 			if (newMax == null) {
 				newMax = 1.0;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java
index 51e20c071..85da2fc89 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java
@@ -16,7 +16,6 @@ public class Zero {
 	// --------- Computers ---------
 
 	@OpField(names = NAMES)
-	@Parameter(key = "resultArray")
 	public static final Computers.Arity0<double[]> MathParallelPointwiseZeroDoubleArrayComputer = out -> {
 		IntStream.range(0, out.length).parallel().forEach(i -> {
 			out[i] = 0.0;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Identity.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Identity.java
index 9ef175b35..ef9361593 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Identity.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Identity.java
@@ -1,3 +1,4 @@
+
 package org.scijava.ops.simplify;
 
 import java.util.function.Function;
@@ -5,19 +6,19 @@
 import org.scijava.ops.core.Op;
 import org.scijava.ops.hints.BaseOpHints.Simplification;
 import org.scijava.ops.hints.OpHints;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 @OpHints(hints = { Simplification.FORBIDDEN })
 @Plugin(type = Op.class, name = "simplify, focus")
-@Parameter(key = "input")
-@Parameter(key = "output")
 public class Identity<T> implements Function<T, T> {
 
-	public Identity() {
-	}
+	public Identity() {}
 
+	/**
+	 * @param t the object to be simplified
+	 * @return the simplified object (since we are doing an identity
+	 *         simplification, this is just a reference to the input object).
+	 */
 	@Override
 	public T apply(T t) {
 		return t;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveListSimplifier.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveListSimplifier.java
index b32fff173..67c715b8c 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveListSimplifier.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveListSimplifier.java
@@ -4,9 +4,7 @@
 import java.util.function.Function;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Simplifies {@link List}s of types extending {@link Number}.
@@ -14,11 +12,13 @@
  * @author Gabriel Selzer
  */
 @Plugin(type = Op.class, name = "simplify")
-@Parameter(key = "inList")
-@Parameter(key = "simpleList")
 public class PrimitiveListSimplifier<T extends Number> implements Function<List<T>, List<Number>>{
 
 	@Override
+	/*
+	* @param t the input List
+	* @return a List whose elements have been simplified
+	*/
 	public List<Number> apply(List<T> t) {
 		@SuppressWarnings({ "unchecked", "rawtypes" })
 		List<Number> numberList = (List) t;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java
index bc51cb40a..27081c026 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java
@@ -5,15 +5,11 @@
 
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 public class Mean {
 
 	@Plugin(type = Op.class, name = "stats.mean")
-	@Parameter(key = "iterable")
-	@Parameter(key = "mean")
 	public static class MeanFunction <N, O> implements Function<Iterable<N>, O>{
 
 		@OpDependency(name = "math.add")
@@ -25,7 +21,16 @@ public static class MeanFunction <N, O> implements Function<Iterable<N>, O>{
 		@OpDependency(name = "math.div")
 		BiFunction<O, O, O> divFunc;
 
+		/**
+		 * @param iterable the set of data to operate on
+		 * @return the mean of the data
+		 */
 		@Override
+		/**
+		 * TODO
+		 * 
+		 * @param iterable
+		 */
 		public O apply(Iterable<N> iterable) {
 			return divFunc.apply(sumFunc.apply(iterable), sizeFunc.apply(iterable));
 		}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Size.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Size.java
index eab5d7d92..1986a829f 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Size.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Size.java
@@ -1,32 +1,43 @@
+
 package org.scijava.ops.stats;
 
 import java.util.function.Function;
 import java.util.stream.StreamSupport;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 public class Size {
 
 	@Plugin(type = Op.class, name = "stats.size")
-	@Parameter(key = "iterable")
-	@Parameter(key = "size")
 	public static class StatsSizeFunction<T> implements Function<Iterable<T>, Long>{
 
+		/**
+		 * @param iterable the data to operate over
+		 * @return the size of the dataset
+		 */
 		@Override
+		/**
+		 * TODO
+		 * 
+		 * @param iterable
+		 * @param size
+		 */
 		public Long apply(Iterable<T> iterable) {
 			return StreamSupport.stream(iterable.spliterator(), false).count();
 		}
 	}
-	
+
 	   @Plugin(type = Op.class, name = "stats.size")
-	    @Parameter(key = "iterable")
-	    @Parameter(key = "size")
 	    public static class StatsSizeFunctionDouble<T> implements Function<Iterable<T>, Double>{
 
 	        @Override
+	        /**
+	         * TODO
+	         * 
+	         * @param iterable
+	         * @param size
+	         */
 	        public Double apply(Iterable<T> iterable) {
 	            return (double) StreamSupport.stream(iterable.spliterator(), false).count();
 	        }
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java
index 516ae644b..15152fefd 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java
@@ -156,7 +156,6 @@ public void cacheOpAndDependencies() throws NoSuchFieldException,
 }
 
 @Plugin(type = Op.class, name = "test.complicatedOp")
-@Parameter(key = "output")
 class ComplicatedOp implements Producer<String> {
 
 	@OpDependency(name = "test.basicOp")
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java
index ba07051b9..15a1e9931 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java
@@ -77,7 +77,6 @@ public void testRegister() {
  *
  * @author Gabriel Selzer
  */
-@Parameter(key = "output")
 class OpifyOp implements Producer<String> {
 
 	@Override
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
index 9a034b6ea..585b1f836 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
@@ -47,7 +47,6 @@ public class OpMethodTestOps {
 
 	// -- Functions -- //
 	@OpMethod(names = "test.multiplyNumericStrings", type = Producer.class)
-	@Parameter(key = "multipliedNumericStrings")
 	public static Integer multiplyNumericStringsProducer() {
 		return Integer.valueOf(1);
 	}
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java
index 095227f5b..0b6ba2d71 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java
@@ -42,7 +42,6 @@
 public class OpPriorityTest extends AbstractTestEnvironment {
 	
 	@Plugin(type = Op.class, name = "test.priority", priority = Priority.HIGH)
-	@Parameter(key = "result")
 	private static final class testDouble implements Producer<Number>{
 		@Override
 		public Number create() {
@@ -51,7 +50,6 @@ public Number create() {
 	}
 
 	@Plugin(type = Op.class, name = "test.priority", priority = Priority.LOW)
-	@Parameter(key = "result")
 	private static final class testFloat implements Producer<Number>{
 		@Override
 		public Number create() {
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java
index 5e6b189ae..582d03f34 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java
@@ -26,8 +26,6 @@ public class TestOps {
 	// AutoTransformTest
 
 	@Plugin(type = Op.class, name = "test.liftSqrt")
-	@Parameter(key = "in")
-	@Parameter(key = "out")
 	public static class LiftSqrt implements Computers.Arity1<double[], double[]> {
 
 		@Override
@@ -41,9 +39,6 @@ public void compute(double[] in, double[] out) {
 	// AdaptersTest
 
 	@Plugin(type = Op.class, name = "test.adaptersC")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "out")
 	public static class testAddTwoArraysComputer implements Computers.Arity2<double[], double[], double[]> {
 		@Override
 		public void compute(double[] arr1, double[] arr2, double[] out) {
@@ -53,9 +48,6 @@ public void compute(double[] arr1, double[] arr2, double[] out) {
 	}
 
 	@Plugin(type = Op.class, name = "test.adaptersF")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "out")
 	public static class testAddTwoArraysFunction implements BiFunction<double[], double[], double[]> {
 		@Override
 		public double[] apply(double[] arr1, double[] arr2) {
@@ -69,8 +61,6 @@ public double[] apply(double[] arr1, double[] arr2) {
 	// LiftTest
 
 	@Plugin(type = Op.class, name = "test.liftFunction")
-	@Parameter(key = "in")
-	@Parameter(key = "out")
 	public static class liftFunction implements Function<Double, Double> {
 		@Override
 		public Double apply(Double in) {
@@ -79,8 +69,6 @@ public Double apply(Double in) {
 	}
 
 	@Plugin(type = Op.class, name = "test.liftComputer")
-	@Parameter(key = "in")
-	@Parameter(key = "out")
 	public static class liftComputer implements Computers.Arity1<double[], double[]> {
 		@Override
 		public void compute(double[] in, double[] out) {
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java
index bbf10080a..166c39364 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java
@@ -75,21 +75,16 @@ public double getPriority() {
 	}
 
 	@OpField(names = "test.priorityOp")
-	@Parameter(key = "input")
-	@Parameter(key = "output")
 	public static final Computers.Arity1<Double, PriorityThing> priorityOp = (in,
 		out) -> {
 		out.increasePriority(in);
 	};
 
 	@OpField(names = "create")
-	@Parameter(key = "output")
 	public static final Producer<PriorityThing> priorityThingProducer =
 		() -> new PriorityThing(10000);
 
 	@OpField(names = "create")
-	@Parameter(key = "input")
-	@Parameter(key = "output")
 	public static final Function<Double, PriorityThing> priorityThingFunction = (
 		in) -> new PriorityThing(in);
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java
index 084579320..579bf3d34 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java
@@ -44,8 +44,6 @@
 public class ComputerToFunctionAdaptTestOps {
 	
 	@OpField(names = "test.CtF")
-	@Parameter(key = "in")
-	@Parameter(key = "out")
 	public static final Computers.Arity1<double[], double[]> toFunc1 = (in, out) -> {
 		for(int i = 0; i < in.length; i++) {
 			out[i] = 0.0;
@@ -54,9 +52,6 @@ public class ComputerToFunctionAdaptTestOps {
 	};
 	
 	@OpField(names = "test.CtF")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "out")
 	public static final Computers.Arity2<double[], double[], double[]> toFunc2 = (in1, in2, out) -> {
 		for(int i = 0; i < in1.length; i++) {
 			out[i] = 0.0;
@@ -66,10 +61,6 @@ public class ComputerToFunctionAdaptTestOps {
 	};
 	
 	@OpField(names = "test.CtF")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "in3")
-	@Parameter(key = "out")
 	public static final Computers.Arity3<double[], double[], double[], double[]> toFunc3 = (in1, in2, in3, out) -> {
 		for(int i = 0; i < in1.length; i++) {
 			out[i] = 0.0;
@@ -80,11 +71,6 @@ public class ComputerToFunctionAdaptTestOps {
 	};
 	
 	@OpField(names = "test.CtF")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "in3")
-	@Parameter(key = "in4")
-	@Parameter(key = "out")
 	public static final Computers.Arity4<double[], double[], double[], double[], double[]> toFunc4 = (in1, in2, in3, in4, out) -> {
 		for(int i = 0; i < in1.length; i++) {
 			out[i] = 0.0;
@@ -96,12 +82,6 @@ public class ComputerToFunctionAdaptTestOps {
 	};
 	
 	@OpField(names = "test.CtF")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "in3")
-	@Parameter(key = "in4")
-	@Parameter(key = "in5")
-	@Parameter(key = "out")
 	public static final Computers.Arity5<double[], double[], double[], double[], double[], double[]> toFunc5 = (in1, in2, in3, in4, in5, out) -> {
 		for(int i = 0; i < in1.length; i++) {
 			out[i] = 0.0;
@@ -114,13 +94,6 @@ public class ComputerToFunctionAdaptTestOps {
 	};
 	
 	@OpField(names = "test.CtF")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "in3")
-	@Parameter(key = "in4")
-	@Parameter(key = "in5")
-	@Parameter(key = "in6")
-	@Parameter(key = "out")
 	public static final Computers.Arity6<double[], double[], double[], double[], double[], double[], double[]> toFunc6 = (in1, in2, in3, in4, in5, in6, out) -> {
 		for(int i = 0; i < in1.length; i++) {
 			out[i] = 0.0;
@@ -134,14 +107,6 @@ public class ComputerToFunctionAdaptTestOps {
 	};
 	
 	@OpField(names = "test.CtF")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "in3")
-	@Parameter(key = "in4")
-	@Parameter(key = "in5")
-	@Parameter(key = "in6")
-	@Parameter(key = "in7")
-	@Parameter(key = "out")
 	public static final Computers.Arity7<double[], double[], double[], double[], double[], double[], double[], double[]> toFunc7 = (in1, in2, in3, in4, in5, in6, in7, out) -> {
 		for(int i = 0; i < in1.length; i++) {
 			out[i] = 0.0;
@@ -156,15 +121,6 @@ public class ComputerToFunctionAdaptTestOps {
 	};
 	
 	@OpField(names = "test.CtF")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "in3")
-	@Parameter(key = "in4")
-	@Parameter(key = "in5")
-	@Parameter(key = "in6")
-	@Parameter(key = "in7")
-	@Parameter(key = "in8")
-	@Parameter(key = "out")
 	public static final Computers.Arity8<double[], double[], double[], double[], double[], double[], double[], double[], double[]> toFunc8 = (in1, in2, in3, in4, in5, in6, in7, in8, out) -> {
 		for(int i = 0; i < in1.length; i++) {
 			out[i] = 0.0;
@@ -180,16 +136,6 @@ public class ComputerToFunctionAdaptTestOps {
 	};
 	
 	@OpField(names = "test.CtF")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "in3")
-	@Parameter(key = "in4")
-	@Parameter(key = "in5")
-	@Parameter(key = "in6")
-	@Parameter(key = "in7")
-	@Parameter(key = "in8")
-	@Parameter(key = "in9")
-	@Parameter(key = "out")
 	public static final Computers.Arity9<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> toFunc9 = (in1, in2, in3, in4, in5, in6, in7, in8, in9, out) -> {
 		for(int i = 0; i < in1.length; i++) {
 			out[i] = 0.0;
@@ -206,17 +152,6 @@ public class ComputerToFunctionAdaptTestOps {
 	};
 	
 	@OpField(names = "test.CtF")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "in3")
-	@Parameter(key = "in4")
-	@Parameter(key = "in5")
-	@Parameter(key = "in6")
-	@Parameter(key = "in7")
-	@Parameter(key = "in8")
-	@Parameter(key = "in9")
-	@Parameter(key = "in10")
-	@Parameter(key = "out")
 	public static final Computers.Arity10<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> toFunc10 = (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, out) -> {
 		for(int i = 0; i < in1.length; i++) {
 			out[i] = 0.0;
@@ -234,18 +169,6 @@ public class ComputerToFunctionAdaptTestOps {
 	};
 	
 	@OpField(names = "test.CtF")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "in3")
-	@Parameter(key = "in4")
-	@Parameter(key = "in5")
-	@Parameter(key = "in6")
-	@Parameter(key = "in7")
-	@Parameter(key = "in8")
-	@Parameter(key = "in9")
-	@Parameter(key = "in10")
-	@Parameter(key = "in11")
-	@Parameter(key = "out")
 	public static final Computers.Arity11<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> toFunc11 = (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, out) -> {
 		for(int i = 0; i < in1.length; i++) {
 			out[i] = 0.0;
@@ -264,19 +187,6 @@ public class ComputerToFunctionAdaptTestOps {
 	};
 	
 	@OpField(names = "test.CtF")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "in3")
-	@Parameter(key = "in4")
-	@Parameter(key = "in5")
-	@Parameter(key = "in6")
-	@Parameter(key = "in7")
-	@Parameter(key = "in8")
-	@Parameter(key = "in9")
-	@Parameter(key = "in10")
-	@Parameter(key = "in11")
-	@Parameter(key = "in12")
-	@Parameter(key = "out")
 	public static final Computers.Arity12<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> toFunc12 = (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, out) -> {
 		for(int i = 0; i < in1.length; i++) {
 			out[i] = 0.0;
@@ -296,20 +206,6 @@ public class ComputerToFunctionAdaptTestOps {
 	};
 	
 	@OpField(names = "test.CtF")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "in3")
-	@Parameter(key = "in4")
-	@Parameter(key = "in5")
-	@Parameter(key = "in6")
-	@Parameter(key = "in7")
-	@Parameter(key = "in8")
-	@Parameter(key = "in9")
-	@Parameter(key = "in10")
-	@Parameter(key = "in11")
-	@Parameter(key = "in12")
-	@Parameter(key = "in13")
-	@Parameter(key = "out")
 	public static final Computers.Arity13<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> toFunc13 = (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, out) -> {
 		for(int i = 0; i < in1.length; i++) {
 			out[i] = 0.0;
@@ -330,21 +226,6 @@ public class ComputerToFunctionAdaptTestOps {
 	};
 	
 	@OpField(names = "test.CtF")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "in3")
-	@Parameter(key = "in4")
-	@Parameter(key = "in5")
-	@Parameter(key = "in6")
-	@Parameter(key = "in7")
-	@Parameter(key = "in8")
-	@Parameter(key = "in9")
-	@Parameter(key = "in10")
-	@Parameter(key = "in11")
-	@Parameter(key = "in12")
-	@Parameter(key = "in13")
-	@Parameter(key = "in14")
-	@Parameter(key = "out")
 	public static final Computers.Arity14<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> toFunc14 = (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, out) -> {
 		for(int i = 0; i < in1.length; i++) {
 			out[i] = 0.0;
@@ -366,22 +247,6 @@ public class ComputerToFunctionAdaptTestOps {
 	};
 	
 	@OpField(names = "test.CtF")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "in3")
-	@Parameter(key = "in4")
-	@Parameter(key = "in5")
-	@Parameter(key = "in6")
-	@Parameter(key = "in7")
-	@Parameter(key = "in8")
-	@Parameter(key = "in9")
-	@Parameter(key = "in10")
-	@Parameter(key = "in11")
-	@Parameter(key = "in12")
-	@Parameter(key = "in13")
-	@Parameter(key = "in14")
-	@Parameter(key = "in15")
-	@Parameter(key = "out")
 	public static final Computers.Arity15<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> toFunc15 = (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, out) -> {
 		for(int i = 0; i < in1.length; i++) {
 			out[i] = 0.0;
@@ -404,23 +269,6 @@ public class ComputerToFunctionAdaptTestOps {
 	};
 	
 	@OpField(names = "test.CtF")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "in3")
-	@Parameter(key = "in4")
-	@Parameter(key = "in5")
-	@Parameter(key = "in6")
-	@Parameter(key = "in7")
-	@Parameter(key = "in8")
-	@Parameter(key = "in9")
-	@Parameter(key = "in10")
-	@Parameter(key = "in11")
-	@Parameter(key = "in12")
-	@Parameter(key = "in13")
-	@Parameter(key = "in14")
-	@Parameter(key = "in15")
-	@Parameter(key = "in16")
-	@Parameter(key = "out")
 	public static final Computers.Arity16<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> toFunc16 = (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16, out) -> {
 		for(int i = 0; i < in1.length; i++) {
 			out[i] = 0.0;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java
index 5601a67e4..1de4500de 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java
@@ -47,8 +47,6 @@
 public class FunctionToComputerAdaptTestOps {
 
 	@OpField(names = "test.FtC")
-	@Parameter(key = "in")
-	@Parameter(key = "out")
 	public static final Function<double[], double[]> toComp1 = (in) -> {
 		double[] out = new double[in.length];
 		for(int i = 0; i < in.length; i++) {
@@ -58,9 +56,6 @@ public class FunctionToComputerAdaptTestOps {
 	};
 
 	@OpField(names = "test.FtC")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "out")
 	public static final BiFunction<double[], double[], double[]> toComp2 = (in1, in2) -> {
 		double[] out = new double[in1.length];
 		for(int i = 0; i < in1.length; i++) {
@@ -71,10 +66,6 @@ public class FunctionToComputerAdaptTestOps {
 	};
 
 	@OpField(names = "test.FtC")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "in3")
-	@Parameter(key = "out")
 	public static final Functions.Arity3<double[], double[], double[], double[]> toComp3 = (in1, in2, in3) -> {
 		double[] out = new double[in1.length];
 		for(int i = 0; i < in1.length; i++) {
@@ -86,11 +77,6 @@ public class FunctionToComputerAdaptTestOps {
 	};
 
 	@OpField(names = "test.FtC")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "in3")
-	@Parameter(key = "in4")
-	@Parameter(key = "out")
 	public static final Functions.Arity4<double[], double[], double[], double[], double[]> toComp4 = (in1, in2, in3, in4) -> {
 		double[] out = new double[in1.length];
 		for(int i = 0; i < in1.length; i++) {
@@ -103,12 +89,6 @@ public class FunctionToComputerAdaptTestOps {
 	};
 
 	@OpField(names = "test.FtC")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "in3")
-	@Parameter(key = "in4")
-	@Parameter(key = "in5")
-	@Parameter(key = "out")
 	public static final Functions.Arity5<double[], double[], double[], double[], double[], double[]> toComp5 = (in1, in2, in3, in4, in5) -> {
 		double[] out = new double[in1.length];
 		for(int i = 0; i < in1.length; i++) {
@@ -122,13 +102,6 @@ public class FunctionToComputerAdaptTestOps {
 	};
 
 	@OpField(names = "test.FtC")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "in3")
-	@Parameter(key = "in4")
-	@Parameter(key = "in5")
-	@Parameter(key = "in6")
-	@Parameter(key = "out")
 	public static final Functions.Arity6<double[], double[], double[], double[], double[], double[], double[]> toComp6 = (in1, in2, in3, in4, in5, in6) -> {
 		double[] out = new double[in1.length];
 		for(int i = 0; i < in1.length; i++) {
@@ -143,14 +116,6 @@ public class FunctionToComputerAdaptTestOps {
 	};
 
 	@OpField(names = "test.FtC")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "in3")
-	@Parameter(key = "in4")
-	@Parameter(key = "in5")
-	@Parameter(key = "in6")
-	@Parameter(key = "in7")
-	@Parameter(key = "out")
 	public static final Functions.Arity7<double[], double[], double[], double[], double[], double[], double[], double[]> toComp7 = (in1, in2, in3, in4, in5, in6, in7) -> {
 		double[] out = new double[in1.length];
 		for(int i = 0; i < in1.length; i++) {
@@ -166,15 +131,6 @@ public class FunctionToComputerAdaptTestOps {
 	};
 
 	@OpField(names = "test.FtC")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "in3")
-	@Parameter(key = "in4")
-	@Parameter(key = "in5")
-	@Parameter(key = "in6")
-	@Parameter(key = "in7")
-	@Parameter(key = "in8")
-	@Parameter(key = "out")
 	public static final Functions.Arity8<double[], double[], double[], double[], double[], double[], double[], double[], double[]> toComp8 = (in1, in2, in3, in4, in5, in6, in7, in8) -> {
 		double[] out = new double[in1.length];
 		for(int i = 0; i < in1.length; i++) {
@@ -191,16 +147,6 @@ public class FunctionToComputerAdaptTestOps {
 	};
 
 	@OpField(names = "test.FtC")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "in3")
-	@Parameter(key = "in4")
-	@Parameter(key = "in5")
-	@Parameter(key = "in6")
-	@Parameter(key = "in7")
-	@Parameter(key = "in8")
-	@Parameter(key = "in9")
-	@Parameter(key = "out")
 	public static final Functions.Arity9<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> toComp9 = (in1, in2, in3, in4, in5, in6, in7, in8, in9) -> {
 		double[] out = new double[in1.length];
 		for(int i = 0; i < in1.length; i++) {
@@ -218,17 +164,6 @@ public class FunctionToComputerAdaptTestOps {
 	};
 
 	@OpField(names = "test.FtC")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "in3")
-	@Parameter(key = "in4")
-	@Parameter(key = "in5")
-	@Parameter(key = "in6")
-	@Parameter(key = "in7")
-	@Parameter(key = "in8")
-	@Parameter(key = "in9")
-	@Parameter(key = "in10")
-	@Parameter(key = "out")
 	public static final Functions.Arity10<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> toComp10 = (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10) -> {
 		double[] out = new double[in1.length];
 		for(int i = 0; i < in1.length; i++) {
@@ -247,18 +182,6 @@ public class FunctionToComputerAdaptTestOps {
 	};
 
 	@OpField(names = "test.FtC")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "in3")
-	@Parameter(key = "in4")
-	@Parameter(key = "in5")
-	@Parameter(key = "in6")
-	@Parameter(key = "in7")
-	@Parameter(key = "in8")
-	@Parameter(key = "in9")
-	@Parameter(key = "in10")
-	@Parameter(key = "in11")
-	@Parameter(key = "out")
 	public static final Functions.Arity11<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> toComp11 = (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11) -> {
 		double[] out = new double[in1.length];
 		for(int i = 0; i < in1.length; i++) {
@@ -278,19 +201,6 @@ public class FunctionToComputerAdaptTestOps {
 	};
 
 	@OpField(names = "test.FtC")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "in3")
-	@Parameter(key = "in4")
-	@Parameter(key = "in5")
-	@Parameter(key = "in6")
-	@Parameter(key = "in7")
-	@Parameter(key = "in8")
-	@Parameter(key = "in9")
-	@Parameter(key = "in10")
-	@Parameter(key = "in11")
-	@Parameter(key = "in12")
-	@Parameter(key = "out")
 	public static final Functions.Arity12<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> toComp12 = (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12) -> {
 		double[] out = new double[in1.length];
 		for(int i = 0; i < in1.length; i++) {
@@ -311,20 +221,6 @@ public class FunctionToComputerAdaptTestOps {
 	};
 
 	@OpField(names = "test.FtC")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "in3")
-	@Parameter(key = "in4")
-	@Parameter(key = "in5")
-	@Parameter(key = "in6")
-	@Parameter(key = "in7")
-	@Parameter(key = "in8")
-	@Parameter(key = "in9")
-	@Parameter(key = "in10")
-	@Parameter(key = "in11")
-	@Parameter(key = "in12")
-	@Parameter(key = "in13")
-	@Parameter(key = "out")
 	public static final Functions.Arity13<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> toComp13 = (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13) -> {
 		double[] out = new double[in1.length];
 		for(int i = 0; i < in1.length; i++) {
@@ -346,21 +242,6 @@ public class FunctionToComputerAdaptTestOps {
 	};
 
 	@OpField(names = "test.FtC")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "in3")
-	@Parameter(key = "in4")
-	@Parameter(key = "in5")
-	@Parameter(key = "in6")
-	@Parameter(key = "in7")
-	@Parameter(key = "in8")
-	@Parameter(key = "in9")
-	@Parameter(key = "in10")
-	@Parameter(key = "in11")
-	@Parameter(key = "in12")
-	@Parameter(key = "in13")
-	@Parameter(key = "in14")
-	@Parameter(key = "out")
 	public static final Functions.Arity14<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> toComp14 = (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14) -> {
 		double[] out = new double[in1.length];
 		for(int i = 0; i < in1.length; i++) {
@@ -383,22 +264,6 @@ public class FunctionToComputerAdaptTestOps {
 	};
 
 	@OpField(names = "test.FtC")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "in3")
-	@Parameter(key = "in4")
-	@Parameter(key = "in5")
-	@Parameter(key = "in6")
-	@Parameter(key = "in7")
-	@Parameter(key = "in8")
-	@Parameter(key = "in9")
-	@Parameter(key = "in10")
-	@Parameter(key = "in11")
-	@Parameter(key = "in12")
-	@Parameter(key = "in13")
-	@Parameter(key = "in14")
-	@Parameter(key = "in15")
-	@Parameter(key = "out")
 	public static final Functions.Arity15<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> toComp15 = (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15) -> {
 		double[] out = new double[in1.length];
 		for(int i = 0; i < in1.length; i++) {
@@ -422,23 +287,6 @@ public class FunctionToComputerAdaptTestOps {
 	};
 
 	@OpField(names = "test.FtC")
-	@Parameter(key = "in1")
-	@Parameter(key = "in2")
-	@Parameter(key = "in3")
-	@Parameter(key = "in4")
-	@Parameter(key = "in5")
-	@Parameter(key = "in6")
-	@Parameter(key = "in7")
-	@Parameter(key = "in8")
-	@Parameter(key = "in9")
-	@Parameter(key = "in10")
-	@Parameter(key = "in11")
-	@Parameter(key = "in12")
-	@Parameter(key = "in13")
-	@Parameter(key = "in14")
-	@Parameter(key = "in15")
-	@Parameter(key = "in16")
-	@Parameter(key = "out")
 	public static final Functions.Arity16<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> toComp16 = (in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16) -> {
 		double[] out = new double[in1.length];
 		for(int i = 0; i < in1.length; i++) {
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java
index b3f6bd972..ea16621d5 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java
@@ -85,9 +85,6 @@ public void testRunAnyFunction1FromComputer2() {
 }
 
 @Plugin(type = Op.class, name = "test.functionAndLongToLong")
-@Parameter(key = "input")
-@Parameter(key = "op")
-@Parameter(key = "output")
 class FunctionAndLongToLong implements BiFunction<Function<Long, Long>, Long, Long> {
 
 	@Override
@@ -98,9 +95,6 @@ public Long apply(Function<Long, Long> t, Long u) {
 }
 
 @Plugin(type = Op.class, name = "test.integerAndLongAndNotAnyComputer")
-@Parameter(key = "input1")
-@Parameter(key = "input2")
-@Parameter(key = "output")
 class IntegerAndLongAndNotAnyComputer implements Computers.Arity2<Integer, Long, StringContainer> {
 
 	@Override
@@ -123,7 +117,6 @@ public void setValue(String value) {
 }
 
 @Plugin(type = Op.class, name = "create, create.stringContainer")
-@Parameter(key = "stringContainer")
 class StringContainerCreator implements Producer<StringContainer> {
 
 	@Override
@@ -164,8 +157,6 @@ public double create(V u) {
 }
 
 @Plugin(type = Op.class, name = "test.any")
-@Parameter(key = "thing")
-@Parameter(key = "output")
 class ThingFunction implements Function<Thing<String>, Double> {
 
 	@Override
@@ -176,8 +167,6 @@ public Double apply(Thing<String> t) {
 }
 
 @Plugin(type = Op.class, name = "test.exceptionalAny")
-@Parameter(key = "thing")
-@Parameter(key = "output")
 class ExceptionalThingFunction implements Function<ExceptionalThing<String>, Double> {
 
 	@Override
@@ -189,8 +178,6 @@ public Double apply(ExceptionalThing<String> t) {
 }
 
 @Plugin(type = Op.class, name = "test.nestedAny")
-@Parameter(key = "nestedThing")
-@Parameter(key = "output")
 class NestedThingFunction implements Function<NestedThing<String, Thing<String>>, Double> {
 
 	@Override
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java
index d5c737ad4..bd1a83cf2 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java
@@ -53,8 +53,6 @@ static class YThing implements Thing {
 	}
 
 	@OpField(names = "test.listTypeReification")
-	@Parameter(key = "input")
-	@Parameter(key = "output")
 	public static final Function<List<? extends Thing>, List<Double>> fooOP = (in) -> {
 		List<Double> returnList = new ArrayList<>();
 		returnList.add(0.);
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java
index 5e5b106f8..b67a07fa9 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java
@@ -86,8 +86,6 @@ public void testProgress() throws InterruptedException, ExecutionException{
 }
 
 @Plugin(type = Op.class, name = "test.opMonitor")
-@Parameter(key = "monitor")
-@Parameter(key = "bigInteger")
 class InfiniteOp implements Function<OpMonitor, BigInteger> {
 
 	@Override
@@ -106,9 +104,6 @@ public BigInteger apply(OpMonitor opMonitor) {
 }
 
 @Plugin(type = Op.class, name = "test.progress")
-@Parameter(key = "monitor")
-@Parameter(key = "target")
-@Parameter(key = "output")
 class CountingOp implements BiFunction<OpMonitor, BigInteger, BigInteger> {
 
 	@Override
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
index a137689cf..4b091d538 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
@@ -21,14 +21,9 @@
 public class OpsAsParametersTest extends AbstractTestEnvironment {
 
 	@OpField(names = "test.parameter.computer")
-	@Parameter(key = "input")
-	@Parameter(key = "output")
 	public final Function<Number, Double> func = (x) -> x.doubleValue();
 
 	@OpField(names = "test.parameter.op")
-	@Parameter(key = "inputList")
-	@Parameter(key = "op")
-	@Parameter(key = "outputList")
 	public final BiFunction<List<Number>, Function<Number, Double>, List<Double>> biFunc = (x, op) -> {
 		List<Double> output = new ArrayList<>();
 		for (Number n : x)
@@ -86,8 +81,6 @@ public void TestOpWithOpClass() {
 }
 
 @Plugin(type = Op.class, name = "test.parameter.class")
-@Parameter(key = "input")
-@Parameter(key = "output")
 class FuncClass implements Function<Number, Double> {
 
 	@Override
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
index 451cd20b5..42677a83d 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
@@ -19,7 +19,6 @@
 import org.scijava.ops.OpMethod;
 import org.scijava.ops.core.Op;
 import org.scijava.ops.core.OpCollection;
-import org.scijava.ops.function.Computers;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.vm
index 4ce032cb5..c05667e64 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.vm
@@ -76,7 +76,6 @@ import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
@@ -89,8 +88,6 @@ public class ComputersToFunctionsAndLift {
 
 #foreach($arity in [1..$maxArity])
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer${arity}ToFunction${arity}AndLiftViaSource$generics.call($arity)
 			implements Function<$computerArity.call($arity)$generics.call($arity), $functionArity.call($arity)$iterableGenerics.call($arity)> {
 
@@ -99,6 +96,10 @@ public class ComputersToFunctionsAndLift {
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<$functionArity.call($arity)$generics.call($arity), $functionArity.call($arity)$iterableGenerics.call($arity)> lifter;
 
+		/**
+		 * @param computer the Computer to convert
+		 * @return {@code computer} as a Function
+		 */
 		@Override
 		public $functionArity.call($arity)$iterableGenerics.call($arity) apply($computerArity.call($arity)$generics.call($arity) computer) {
 			return lifter.apply(adaptor.apply(computer));
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.vm
index ce1342b9b..59d0088c8 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.vm
@@ -42,7 +42,6 @@ import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
@@ -56,8 +55,6 @@ public class FunctionsToComputersAndLift {
 #foreach($arity in [1..$maxArity])
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function${arity}ToComputer${arity}AndLiftAfter$generics.call($arity) implements
 		Function<$functionArity.call($arity)$generics.call($arity), $computerArity.call($arity)$iterableGenerics.call($arity)>
 	{
@@ -67,6 +64,10 @@ public class FunctionsToComputersAndLift {
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<$computerArity.call($arity)$generics.call($arity), $computerArity.call($arity)$iterableGenerics.call($arity)> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public $computerArity.call($arity)$iterableGenerics.call($arity) apply(
 			$functionArity.call($arity)$generics.call($arity) function)
@@ -77,8 +78,6 @@ public class FunctionsToComputersAndLift {
 	}
 
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW + 1)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function${arity}ToComputer${arity}AndLiftBefore$generics.call($arity) implements
 		Function<$functionArity.call($arity)$generics.call($arity), $computerArity.call($arity)$iterableGenerics.call($arity)>
 	{
@@ -88,6 +87,10 @@ public class FunctionsToComputersAndLift {
 		@OpDependency(name = "adapt", adaptable = false)
 		Function<$functionArity.call($arity)$generics.call($arity), $functionArity.call($arity)$iterableGenerics.call($arity)> lifter;
 
+		/**
+		 * @param function - the Function to convert
+		 * @return the function as a Computer
+		 */
 		@Override
 		public $computerArity.call($arity)$iterableGenerics.call($arity) apply(
 			$functionArity.call($arity)$generics.call($arity) function)
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.vm
index b4592f2f3..788fd0d0f 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.vm
@@ -41,7 +41,6 @@ import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
@@ -55,14 +54,16 @@ public class ComputersToFunctionsViaFunction {
 
 #foreach($arity in [1..$maxArity])
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer${arity}ToFunction${arity}ViaFunction$generics.call($arity)
 			implements Function<$computerArity.call($arity)$generics.call($arity), $functionArity.call($arity)$generics.call($arity)> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Function<I#if($arity == 1)#{else}1#end, O> creator;
 
+		/**
+		 * @param computer the Computer to adapt
+		 * @return computer, adapted into a Function
+		 */
 		@Override
 		public $functionArity.call($arity)$generics.call($arity) apply($computerArity.call($arity)$generics.call($arity) computer) {
 			return ($applyArgs.call($arity)) -> {
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.vm
index 7117e84be..389325b38 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.vm
@@ -43,7 +43,6 @@ import org.scijava.function.Functions;
 import org.scijava.function.Producer;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
@@ -57,14 +56,16 @@ public class ComputersToFunctionsViaSource {
 
 #foreach($arity in [0..$maxArity])
 	@Plugin(type = Op.class, name = "adapt", priority = Priority.LOW)
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Computer${arity}ToFunction${arity}ViaSource$generics.call($arity)
 			implements Function<$computerArity.call($arity)$generics.call($arity), $functionArity.call($arity)$generics.call($arity)> {
 
 		@OpDependency(name = "create", adaptable = false)
 		Producer<O> creator;
 
+		/**
+		 * @param computer the computer to adapt
+		 * @return a Function adaptation of computer
+		 */
 		@Override
 		public $functionArity.call($arity)$generics.call($arity) apply($computerArity.call($arity)$generics.call($arity) computer) {
 			return (#if($arity == 0)#{else}$applyArgs.call($arity)#end) -> {
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.vm
index 75a785eb9..e0b00c492 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.vm
@@ -42,7 +42,6 @@ import org.scijava.function.Functions;
 import org.scijava.function.Producer;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
@@ -56,13 +55,15 @@ public class FunctionsToComputers {
 
 #foreach($arity in [0..$maxArity])
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public static class Function${arity}ToComputer${arity}$generics.call($arity) implements Function<$functionArity.call($arity)$generics.call($arity), $computerArity.call($arity)$generics.call($arity)> {
 
 		@OpDependency(name = "copy", adaptable = false)
 		Computers.Arity1<O, O> copyOp;
 
+		/**
+		 * @param function the function to adapt
+		 * @return an adaptation of function
+		 */
 		@Override
 		public $computerArity.call($arity)$generics.call($arity) apply($functionArity.call($arity)$generics.call($arity) function) {
 			return ($computeArgs.call($arity)) -> {
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.vm
index 058fe743f..f3e3a1183 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.vm
@@ -41,10 +41,8 @@ import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.OpField;
 import org.scijava.ops.core.Op;
 import org.scijava.ops.core.OpCollection;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 #set($classArity = $maxArity + 1)
@@ -60,8 +58,6 @@ public class InplacesToFunctions$generics.call($classArity, $classArity) {
 #foreach($arity in [1..$maxArity])
 #foreach($a in [1..$arity])
 	@Plugin(type = Op.class, name = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	static class Inplace$inplaceSuffix.call($arity, $a)ToFunction${arity}$generics.call($arity, $a) implements Function<$inplaceType.call($arity, $a)$generics.call($arity, $a), $functionArity.call($arity)$functionGenerics.call($arity, $a)> {
 		
 		@OpDependency(name = "create", adaptable = false)
@@ -69,6 +65,10 @@ public class InplacesToFunctions$generics.call($classArity, $classArity) {
 		@OpDependency(name = "copy", adaptable = false)
 		private Computers.Arity1<IO, IO> copyOp;
 
+		/**
+		 * @param t the Inplace to adapt
+		 * @return an adaptation of inplace
+		 */
 		@Override
 		public $functionArity.call($arity)$functionGenerics.call($arity, $a) apply($inplaceType.call($arity, $a)$generics.call($arity, $a) t) {
 			return ($mutateArgs.call($arity, $a)) -> {
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm
index 6aae73953..702bb69ac 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm
@@ -56,8 +56,6 @@ public class ComputerToIterables$classGenerics.call($maxArity) {
 
 #foreach($arity in [0..$maxArity])
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<$computerArity.call($arity)$generics.call($arity), $computerArity.call($arity)$iterableGenerics.call($arity)> liftComputer$arity = 
 		(computer) -> {
 			return ($computeArgs.call($arity)) -> {
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.vm
index c47d12798..bb3889fa0 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.vm
@@ -61,8 +61,6 @@ public class FunctionToIterables$classGenerics.call($maxArity) {
 #foreach($arity in [1..$maxArity])
 	@SuppressWarnings("unchecked")
 	@OpField(names = "adapt")
-	@Parameter(key = "fromOp")
-	@Parameter(key = "toOp")
 	public final Function<$functionArity.call($arity)$generics.call($arity), $functionArity.call($arity)$iterableGenerics.call($arity)> liftFunction$arity =
 		(function) -> {
 			return ($iteratorInputs.call($arity)) -> lazyIterable(itrs -> function.apply(${funcItrsNext.call($arity)}), $iteratorInputs.call($arity));
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTestOps.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTestOps.vm
index 89b21ac81..2db2868e7 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTestOps.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTestOps.vm
@@ -47,7 +47,6 @@ public class OpMethodTestOps {
 
 	// -- Functions -- //
 	@OpMethod(names = "test.multiplyNumericStrings", type = Producer.class)
-	@Parameter(key = "multipliedNumericStrings")
 	public static Integer multiplyNumericStringsProducer() {
 		return Integer.valueOf(1);
 	}
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm
index 8270bdcd1..d0f04a48c 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm
@@ -45,9 +45,6 @@ public class ComputerToFunctionAdaptTestOps {
 #foreach($arity in [1..$maxArity])
 	
 	@OpField(names = "test.CtF")
-#foreach($p in $genericsNamesList.call($arity))
-	@Parameter(key = "$p")
-#end
 	public static final $computerArity.call($arity)$doubleGenerics.call($arity) toFunc${arity} = ($computeArgs.call($arity)) -> {
 		for(int i = 0; i < in#if($arity == 1)#{else}1#end.length; i++) {
 			out[i] = 0.0;
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.vm
index 7822613cb..7ee4547e3 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.vm
@@ -48,9 +48,6 @@ public class FunctionToComputerAdaptTestOps {
 #foreach($arity in [1..$maxArity])
 
 	@OpField(names = "test.FtC")
-#foreach($p in $genericsNamesList.call($arity))
-	@Parameter(key = "$p")
-#end
 	public static final $functionArity.call($arity)$doubleGenerics.call($arity) toComp${arity} = ($applyArgs.call($arity)) -> {
 		double[] out = new double[in#if($arity == 1)#{else}1#end.length];
 		for(int i = 0; i < in#if($arity == 1)#{else}1#end.length; i++) {

From 250dc99dc672923e1e58795f5b5424d38af5fee7 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 19 Mar 2021 09:55:05 -0500
Subject: [PATCH 09/91] Avoid searching for @Parameter annotations

---
 .../java/org/scijava/param/ParameterStructs.java    | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java
index 9f88288b4..96b5a8322 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java
@@ -131,22 +131,15 @@ public static List<Member<?>> parse(final Class<?> type)
 		// NB: Reject abstract classes.
 		checkModifiers(type.getName() + ": ", problems, type.getModifiers(), true, Modifier.ABSTRACT);
 
-		// obatin a parameterData (preferably one that scrapes the javadoc)
-		final Class<?> paramsClass = findParametersDeclaration(type);
+		// obtain a parameterData (preferably one that scrapes the javadoc)
 		ParameterData paramData;
 		try {
-			paramData = new JavadocParameterData(paramsClass);
+			paramData = new JavadocParameterData(type);
 		} catch(NullPointerException | IllegalArgumentException e) {
 			paramData = new SynthesizedParameterData();
 		}
 
-		// Parse class level (i.e., generic) @Parameter annotations.
-		if (paramsClass != null) {
-			parseFunctionalParameters(items, names, problems, paramsClass, paramData);
-		}
-		else {
-			parseFunctionalParameters(items, names, problems, type, paramData);
-		}
+		parseFunctionalParameters(items, names, problems, type, paramData);
 
 		// Parse field level @OpDependency annotations.
 		parseFieldOpDependencies(items, problems, type);

From e1599cda65fbf151be4a2c90ff186c0b6518e0ad Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Thu, 20 May 2021 11:05:36 -0500
Subject: [PATCH 10/91] JavadocParameterTest: remove Parameter annotations

---
 .../src/test/java/org/scijava/param/JavadocParameterTest.java   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
index 42677a83d..f326b39d3 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
@@ -149,8 +149,6 @@ public void testJavadocClass() {
  * @author Gabriel Selzer
  */
 @Plugin(type = Op.class, name = "test.javadoc.class")
-@Parameter(key = "input")
-@Parameter(key = "output", itemIO = ItemIO.OUTPUT)
 class JavadocOp implements Function<Double, Double> {
 
 	/**

From 38b6c56907451517755155a1f7048720faf2ec14 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 19 Mar 2021 10:07:31 -0500
Subject: [PATCH 11/91] Remove obsolete Parameter imports

---
 .../src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java           | 1 -
 .../java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java   | 1 -
 .../java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java     | 1 -
 .../imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java   | 1 -
 .../net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java | 1 -
 .../main/java/net/imagej/ops2/features/haralick/DefaultASM.java  | 1 -
 .../imagej/ops2/features/haralick/DefaultClusterPromenence.java  | 1 -
 .../net/imagej/ops2/features/haralick/DefaultClusterShade.java   | 1 -
 .../java/net/imagej/ops2/features/haralick/DefaultContrast.java  | 1 -
 .../net/imagej/ops2/features/haralick/DefaultCorrelation.java    | 1 -
 .../imagej/ops2/features/haralick/DefaultDifferenceEntropy.java  | 1 -
 .../imagej/ops2/features/haralick/DefaultDifferenceVariance.java | 1 -
 .../java/net/imagej/ops2/features/haralick/DefaultEntropy.java   | 1 -
 .../main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java | 1 -
 .../net/imagej/ops2/features/haralick/DefaultMaxProbability.java | 1 -
 .../net/imagej/ops2/features/haralick/DefaultSumAverage.java     | 1 -
 .../net/imagej/ops2/features/haralick/DefaultSumEntropy.java     | 1 -
 .../imagej/ops2/features/haralick/DefaultTextureHomogeneity.java | 1 -
 .../java/net/imagej/ops2/features/haralick/DefaultVariance.java  | 1 -
 .../java/net/imagej/ops2/features/haralick/helper/CoocHXY.java   | 1 -
 .../java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java | 1 -
 .../java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java | 1 -
 .../java/net/imagej/ops2/features/haralick/helper/CoocPX.java    | 1 -
 .../net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java   | 1 -
 .../net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java    | 1 -
 .../java/net/imagej/ops2/features/haralick/helper/CoocPY.java    | 1 -
 .../java/net/imagej/ops2/features/haralick/helper/CoocStdX.java  | 1 -
 .../java/net/imagej/ops2/features/haralick/helper/CoocStdY.java  | 1 -
 .../net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java    | 1 -
 .../main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java | 1 -
 .../net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java     | 1 -
 .../main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java | 1 -
 .../src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java | 1 -
 .../net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java     | 1 -
 .../java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java | 1 -
 .../java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java   | 1 -
 .../src/main/java/net/imagej/ops2/geom/CentroidII.java           | 1 -
 .../src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java  | 1 -
 .../src/main/java/net/imagej/ops2/geom/CentroidMesh.java         | 1 -
 .../src/main/java/net/imagej/ops2/geom/CentroidPolygon.java      | 1 -
 .../main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java   | 1 -
 .../imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java   | 1 -
 .../ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java   | 1 -
 .../java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java     | 1 -
 .../java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java | 1 -
 .../main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java    | 1 -
 .../java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java    | 1 -
 .../net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java     | 1 -
 .../java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java    | 1 -
 .../java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java    | 1 -
 .../java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java  | 1 -
 .../imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java    | 1 -
 .../ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java      | 1 -
 .../java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java | 1 -
 .../java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java    | 1 -
 .../java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java    | 1 -
 .../java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java   | 1 -
 .../java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java | 1 -
 .../net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java  | 1 -
 .../java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java    | 1 -
 .../ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java       | 1 -
 .../net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java | 1 -
 .../main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java | 1 -
 .../src/main/java/net/imagej/ops2/help/HelpForName.java          | 1 -
 .../java/net/imagej/ops2/image/histogram/HistogramCreate.java    | 1 -
 .../java/net/imagej/ops2/image/integral/WrappedIntegralImg.java  | 1 -
 .../ops2/imagemoments/centralmoments/DefaultCentralMoment01.java | 1 -
 .../ops2/imagemoments/centralmoments/DefaultCentralMoment10.java | 1 -
 .../net/imagej/ops2/imagemoments/moments/DefaultMoment00.java    | 1 -
 .../net/imagej/ops2/imagemoments/moments/DefaultMoment01.java    | 1 -
 .../net/imagej/ops2/imagemoments/moments/DefaultMoment10.java    | 1 -
 .../net/imagej/ops2/imagemoments/moments/DefaultMoment11.java    | 1 -
 .../main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java   | 1 -
 .../main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java  | 1 -
 .../java/net/imagej/ops2/morphology/thin/ThinMorphological.java  | 1 -
 .../main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java | 1 -
 .../ops2/segment/detectJunctions/DefaultDetectJunctions.java     | 1 -
 .../src/main/java/net/imagej/ops2/stats/DefaultMinMax.java       | 1 -
 .../src/main/java/net/imagej/ops2/stats/IterableMinMax.java      | 1 -
 .../net/imagej/ops2/stats/regression/leastSquares/Quadric.java   | 1 -
 .../net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java  | 1 -
 .../net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java   | 1 -
 .../java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java  | 1 -
 .../ops2/threshold/intermodes/ComputeIntermodesThreshold.java    | 1 -
 .../imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java   | 1 -
 .../java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java    | 1 -
 .../ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java    | 1 -
 .../threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java   | 1 -
 .../net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java     | 1 -
 .../imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java | 1 -
 .../imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java   | 1 -
 .../imagej/ops2/threshold/moments/ComputeMomentsThreshold.java   | 1 -
 .../net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java     | 1 -
 .../ops2/threshold/percentile/ComputePercentileThreshold.java    | 1 -
 .../threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java     | 1 -
 .../net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java   | 1 -
 .../imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java | 1 -
 .../imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java | 1 -
 .../java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java  | 1 -
 .../src/main/java/org/scijava/ops/math/MathOpCollection.java     | 1 -
 .../scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java | 1 -
 .../src/test/java/org/scijava/ops/OpEnvironmentTest.java         | 1 -
 .../src/test/java/org/scijava/ops/OpPriorityTest.java            | 1 -
 .../test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java  | 1 -
 .../src/test/java/org/scijava/ops/util/OpsAsParametersTest.java  | 1 -
 105 files changed, 105 deletions(-)

diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java
index f4b81e2b7..7fec78037 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java
@@ -40,7 +40,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java
index aff6cf41b..9e5b3be7a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java
@@ -39,7 +39,6 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java
index b112d4ee6..df343c2b3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java
@@ -36,7 +36,6 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java
index f0453fde0..5b282f28e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.ops.util.Maps;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java
index 72c79d62e..175f4c73b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java
@@ -49,7 +49,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.ops.util.Adapt;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java
index 375331d2d..0a8c5030d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java
@@ -34,7 +34,6 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java
index eb4d848d9..856efdd0e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java
@@ -37,7 +37,6 @@
 
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java
index 06eaae991..4a572c700 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java
@@ -37,7 +37,6 @@
 
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java
index 83e3afb0c..b2723d6bc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java
@@ -37,7 +37,6 @@
 
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java
index e34ed7be8..3de219046 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java
@@ -37,7 +37,6 @@
 
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java
index eb3e839c7..1c2b0580a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java
@@ -37,7 +37,6 @@
 
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java
index 7f7b5fd13..1dda50507 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java
@@ -37,7 +37,6 @@
 
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java
index bd3a20927..27add20dd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java
@@ -34,7 +34,6 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java
index 33e166d71..0d362cacd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java
@@ -34,7 +34,6 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java
index 80cd08d6c..8c0a733fc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java
@@ -34,7 +34,6 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java
index 79436f755..64462fad8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java
@@ -38,7 +38,6 @@
 
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java
index 6159485ae..70aaf59c7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java
@@ -37,7 +37,6 @@
 
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java
index 9d6028fe8..1e1eaa4c0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java
@@ -35,7 +35,6 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java
index 86e7f6ccb..286e1dfcb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java
@@ -35,7 +35,6 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java
index 89649ee5f..ed23ab53d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java
@@ -33,7 +33,6 @@
 
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java
index bce77a2cd..50967b267 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java
@@ -34,7 +34,6 @@
 
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java
index a827c3af7..4d10febf8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java
@@ -35,7 +35,6 @@
 
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java
index a71042ebf..1a3a8bcab 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java
@@ -31,7 +31,6 @@
 import java.util.function.Function;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java
index 6ac21ae25..faf5d8bb7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java
@@ -31,7 +31,6 @@
 import java.util.function.Function;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java
index 996fb487b..68e3d6615 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java
@@ -31,7 +31,6 @@
 import java.util.function.Function;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java
index e95df36e4..6ec08b685 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java
@@ -31,7 +31,6 @@
 import java.util.function.Function;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java
index 2cb307218..8c7e65150 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java
@@ -34,7 +34,6 @@
 
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java
index 448db0baf..30f8efa12 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java
@@ -35,7 +35,6 @@
 
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java
index 0ac6f1f7c..bd8a9db44 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java
@@ -34,7 +34,6 @@
 import net.imglib2.Dimensions;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java
index 19ce5cd95..ac1c1f898 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.ops.util.Adapt;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java
index 468fd01ad..db748f3cc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.ops.util.Adapt;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java
index f41a5cde6..a6391dae5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.ops.util.Adapt;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java
index 9f39745ec..7df642163 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java
@@ -42,7 +42,6 @@
 
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java
index fdae8b070..857d13748 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.ops.util.Adapt;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java
index 9ca202e33..11c2f4762 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java
@@ -40,7 +40,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java
index 413d5ae2f..0c8f99d6f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java
@@ -38,7 +38,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java
index d95bc6237..ef6b30bf3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java
@@ -37,7 +37,6 @@
 import net.imglib2.roi.IterableRegion;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java
index faf9b4a1a..eda0cada7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java
@@ -37,7 +37,6 @@
 import net.imglib2.roi.labeling.LabelRegion;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java
index 13db03291..bff839fbe 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java
@@ -38,7 +38,6 @@
 
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java
index 19449d34b..d462fd635 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java
@@ -38,7 +38,6 @@
 
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java
index 0e6ae0b54..dd6db8f7a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java
@@ -39,7 +39,6 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java
index 668e276ba..99a7acf4d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java
@@ -36,7 +36,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java
index 4a2c81edf..278dd0cb2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java
@@ -34,7 +34,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java
index 14d7b0535..7725f76be 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java
@@ -40,7 +40,6 @@
 import net.imglib2.roi.geom.real.Polygon2D;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java
index 6e9356fab..575998ed2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java
@@ -34,7 +34,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java
index f1d0451e9..292236d07 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java
@@ -45,7 +45,6 @@
 import net.imglib2.view.Views;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java
index 7d99188bc..61d58a0bd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java
@@ -41,7 +41,6 @@
 import net.imglib2.roi.geom.real.Polygon2D;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java
index ee49c49be..e885e9d9c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java
@@ -33,7 +33,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java
index 292b3e9f4..12cae7e8c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java
@@ -40,7 +40,6 @@
 
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java
index dd7c13c5e..edafbcf62 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java
@@ -43,7 +43,6 @@
 import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java
index bd1510f11..3b4656c37 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java
@@ -43,7 +43,6 @@
 import net.imglib2.util.ValuePair;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java
index 8db07c9b1..ba99037f2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java
@@ -34,7 +34,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java
index f8aad4851..bef513772 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java
@@ -42,7 +42,6 @@
 
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java
index 40250b6b1..42958f8d3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java
@@ -34,7 +34,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java
index 3f442a1c4..9df71d856 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java
@@ -34,7 +34,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java
index e7dbf2875..31688f066 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java
@@ -48,7 +48,6 @@
 
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java
index 55e5e64d6..565ff9912 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java
@@ -34,7 +34,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java
index c4acf6762..1c1a7e95a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java
@@ -40,7 +40,6 @@
 import org.apache.commons.math3.linear.RealMatrix;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java
index 2ef45fcd0..f6859891c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java
@@ -40,7 +40,6 @@
 import org.apache.commons.math3.linear.RealMatrix;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java
index b5b86e601..79b126eff 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java
@@ -34,7 +34,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java
index 0b544ac84..3e7882afe 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java
@@ -34,7 +34,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java
index 65a5bd81f..dd1180666 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java
@@ -34,7 +34,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java
index 1689fd57e..dcce7af60 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java
@@ -37,7 +37,6 @@
 import org.apache.commons.math3.util.MathArrays;
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java
index eb1daeb35..bf8e40b70 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java
@@ -35,7 +35,6 @@
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpService;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java
index 34a18a2a3..d6c7f5407 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java
@@ -39,7 +39,6 @@
 
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java
index 89bb90134..77f9f8ef3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java
@@ -39,7 +39,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment01.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment01.java
index 72745689f..e01a61f8a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment01.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment01.java
@@ -35,7 +35,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment10.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment10.java
index 7de3106ee..a5869f2bc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment10.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment10.java
@@ -35,7 +35,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment00.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment00.java
index 5d0725c57..ec359ab16 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment00.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment00.java
@@ -40,7 +40,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment01.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment01.java
index 2b800d4a0..468cece69 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment01.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment01.java
@@ -40,7 +40,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment10.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment10.java
index e995a1e30..adc7e134a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment10.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment10.java
@@ -40,7 +40,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment11.java
index f60179d4c..a0540a311 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment11.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment11.java
@@ -40,7 +40,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java
index 3f5b8b6da..de4796ca3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java
@@ -33,7 +33,6 @@
 import net.imglib2.type.logic.BitType;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java
index 16a82b717..8bfc5447b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java
@@ -33,7 +33,6 @@
 import net.imglib2.type.logic.BitType;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java
index b72cbde67..bf51b7aa1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java
@@ -33,7 +33,6 @@
 import net.imglib2.type.logic.BitType;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java
index 79f15a5a4..09094157f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java
@@ -33,7 +33,6 @@
 import net.imglib2.type.logic.BitType;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java
index 9e6aca40c..7be59bb9c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java
@@ -46,7 +46,6 @@
 
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java
index 87e2f53c0..3b756966a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java
@@ -41,7 +41,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java
index 78bf40c83..a418db632 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java
@@ -37,7 +37,6 @@
 import net.imglib2.util.ValuePair;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java
index 5703562e6..e1537445b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java
@@ -39,7 +39,6 @@
 import org.ojalgo.matrix.PrimitiveMatrix;
 import org.ojalgo.random.Deterministic;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java
index 4c156e06c..5cd77db8b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.ops.util.Adapt;
 import org.scijava.ops.util.Maps;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java
index 76fa27cf2..639520967 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java
@@ -34,7 +34,6 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java
index 0ba6d0a8d..5d38c40a3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java
@@ -35,7 +35,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java
index 15ec4246c..96428f856 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java
@@ -37,7 +37,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.OpExecutionException;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java
index a73f2954b..3b15367f8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java
@@ -36,7 +36,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.OpExecutionException;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java
index daeb4489a..fc2b0dc1d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java
@@ -35,7 +35,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java
index 7c07f942f..6b71356ca 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java
@@ -35,7 +35,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java
index 6c725ad00..02510014b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java
@@ -36,7 +36,6 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java
index 3571d7d30..ba331a5cb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java
@@ -34,7 +34,6 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java
index 0b9569b38..57a08b081 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java
@@ -38,7 +38,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.OpExecutionException;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java
index 7d57a82d7..2d0cf5f3f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java
@@ -36,7 +36,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java
index 48625a5e6..4a267d58d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java
@@ -35,7 +35,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java
index 57c7ef02e..7d7742854 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java
@@ -35,7 +35,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/percentile/ComputePercentileThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/percentile/ComputePercentileThreshold.java
index d26d8467f..df710bf1d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/percentile/ComputePercentileThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/percentile/ComputePercentileThreshold.java
@@ -35,7 +35,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java
index f68823971..bedfab66e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java
@@ -35,7 +35,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java
index cedff5ce3..3d6207eba 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java
@@ -35,7 +35,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java
index 806ee4a9f..a68358404 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java
@@ -35,7 +35,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java
index 95acc5294..2e06d3520 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java
@@ -35,7 +35,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java
index 5dfb56973..0bff00d11 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java
@@ -35,7 +35,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOpCollection.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOpCollection.java
index 75d5f4326..32c5397a1 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOpCollection.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOpCollection.java
@@ -6,7 +6,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.OpField;
 import org.scijava.ops.core.OpCollection;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java
index 15152fefd..865232878 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java
@@ -45,7 +45,6 @@
 import org.scijava.ops.impl.DefaultOpEnvironment;
 import org.scijava.ops.impl.MatchingConditions;
 import org.scijava.ops.provenance.OpHistoryService;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.plugin.PluginService;
 import org.scijava.types.TypeService;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java
index 15a1e9931..3e3f7a2dd 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java
@@ -8,7 +8,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Producer;
 import org.scijava.ops.matcher.OpClassInfo;
-import org.scijava.param.Parameter;
 import org.scijava.struct.ItemIO;
 import org.scijava.types.GenericTyped;
 import org.scijava.types.Nil;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java
index 0b6ba2d71..644c51fb4 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java
@@ -35,7 +35,6 @@
 import org.scijava.function.Producer;
 import org.scijava.ops.core.Op;
 import org.scijava.types.Nil;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java
index bd1a83cf2..7c966f4f7 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java
@@ -11,7 +11,6 @@
 import org.scijava.ops.OpField;
 import org.scijava.ops.core.OpCollection;
 import org.scijava.ops.core.builder.OpBuilder;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
index 4b091d538..34a3eb2bb 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
@@ -13,7 +13,6 @@
 import org.scijava.ops.core.OpCollection;
 import org.scijava.ops.core.builder.OpBuilder;
 import org.scijava.types.Nil;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 

From 0432a0f1180c8e817d96298e2f976d34e5a71060 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 19 Mar 2021 10:23:47 -0500
Subject: [PATCH 12/91] Move @Override annotations around javadoc

---
 .../src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java    | 4 ++--
 .../net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java | 2 +-
 .../java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java   | 4 ++--
 .../java/net/imagej/ops2/coloc/pValue/DefaultPValue.java  | 6 +++---
 .../net/imagej/ops2/coloc/pearsons/DefaultPearsons.java   | 2 +-
 .../java/net/imagej/ops2/convert/clip/ClipRealTypes.java  | 2 +-
 .../java/net/imagej/ops2/convert/copy/CopyRealTypes.java  | 2 +-
 .../src/main/java/net/imagej/ops2/copy/CopyArrayImg.java  | 4 ++--
 .../src/main/java/net/imagej/ops2/copy/CopyII.java        | 4 ++--
 .../src/main/java/net/imagej/ops2/copy/CopyImg.java       | 4 ++--
 .../main/java/net/imagej/ops2/copy/CopyImgLabeling.java   | 2 +-
 .../java/net/imagej/ops2/copy/CopyLabelingMapping.java    | 2 +-
 .../src/main/java/net/imagej/ops2/copy/CopyRAI.java       | 2 +-
 .../src/main/java/net/imagej/ops2/copy/CopyType.java      | 2 +-
 .../imagej/ops2/deconvolve/NonCirculantFirstGuess.java    | 2 +-
 .../java/net/imagej/ops2/deconvolve/RichardsonLucyC.java  | 2 +-
 .../java/net/imagej/ops2/deconvolve/RichardsonLucyF.java  | 2 +-
 .../src/main/java/net/imagej/ops2/eval/DefaultEval.java   | 2 +-
 .../net/imagej/ops2/features/haralick/DefaultASM.java     | 2 +-
 .../ops2/features/haralick/DefaultClusterPromenence.java  | 2 +-
 .../ops2/features/haralick/DefaultClusterShade.java       | 2 +-
 .../imagej/ops2/features/haralick/DefaultContrast.java    | 2 +-
 .../imagej/ops2/features/haralick/DefaultCorrelation.java | 2 +-
 .../ops2/features/haralick/DefaultDifferenceEntropy.java  | 2 +-
 .../ops2/features/haralick/DefaultDifferenceVariance.java | 2 +-
 .../net/imagej/ops2/features/haralick/DefaultEntropy.java | 2 +-
 .../net/imagej/ops2/features/haralick/DefaultICM1.java    | 2 +-
 .../net/imagej/ops2/features/haralick/DefaultICM2.java    | 2 +-
 .../net/imagej/ops2/features/haralick/DefaultIFDM.java    | 2 +-
 .../ops2/features/haralick/DefaultMaxProbability.java     | 2 +-
 .../imagej/ops2/features/haralick/DefaultSumAverage.java  | 2 +-
 .../imagej/ops2/features/haralick/DefaultSumEntropy.java  | 2 +-
 .../imagej/ops2/features/haralick/DefaultSumVariance.java | 2 +-
 .../ops2/features/haralick/DefaultTextureHomogeneity.java | 2 +-
 .../imagej/ops2/features/haralick/DefaultVariance.java    | 2 +-
 .../net/imagej/ops2/features/haralick/helper/CoocHXY.java | 2 +-
 .../imagej/ops2/features/haralick/helper/CoocMeanX.java   | 2 +-
 .../imagej/ops2/features/haralick/helper/CoocMeanY.java   | 2 +-
 .../net/imagej/ops2/features/haralick/helper/CoocPX.java  | 2 +-
 .../ops2/features/haralick/helper/CoocPXMinusY.java       | 2 +-
 .../imagej/ops2/features/haralick/helper/CoocPXPlusY.java | 2 +-
 .../net/imagej/ops2/features/haralick/helper/CoocPY.java  | 2 +-
 .../imagej/ops2/features/haralick/helper/CoocStdX.java    | 2 +-
 .../imagej/ops2/features/haralick/helper/CoocStdY.java    | 2 +-
 .../ops2/features/hog/HistogramOfOrientedGradients2D.java | 4 ++--
 .../java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java | 2 +-
 .../ops2/features/tamura2d/DefaultCoarsenessFeature.java  | 2 +-
 .../ops2/features/tamura2d/DefaultContrastFeature.java    | 2 +-
 .../features/tamura2d/DefaultDirectionalityFeature.java   | 2 +-
 .../ops2/features/zernike/DefaultMagnitudeFeature.java    | 2 +-
 .../imagej/ops2/features/zernike/DefaultPhaseFeature.java | 2 +-
 .../ops2/features/zernike/helper/ZernikeComputer.java     | 2 +-
 .../imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java    | 2 +-
 .../net/imagej/ops2/filter/convolve/ConvolveFFTC.java     | 4 ++--
 .../net/imagej/ops2/filter/convolve/ConvolveFFTF.java     | 6 +++---
 .../net/imagej/ops2/filter/convolve/ConvolveNaiveC.java   | 2 +-
 .../net/imagej/ops2/filter/convolve/ConvolveNaiveF.java   | 4 ++--
 .../net/imagej/ops2/filter/correlate/CorrelateFFTC.java   | 2 +-
 .../net/imagej/ops2/filter/correlate/CorrelateFFTF.java   | 2 +-
 .../ops2/filter/derivative/PartialDerivativeRAI.java      | 2 +-
 .../ops2/filter/derivative/PartialDerivativesRAI.java     | 2 +-
 .../filter/derivativeGauss/DefaultDerivativeGauss.java    | 2 +-
 .../main/java/net/imagej/ops2/filter/dog/DefaultDoG.java  | 2 +-
 .../java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java | 4 ++--
 .../imagej/ops2/filter/fft/CreateOutputFFTMethods.java    | 4 ++--
 .../java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java    | 2 +-
 .../java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java    | 2 +-
 .../imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java | 2 +-
 .../net/imagej/ops2/filter/fftSize/ComputeFFTSize.java    | 2 +-
 .../imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java | 2 +-
 .../java/net/imagej/ops2/filter/hessian/HessianRAI.java   | 2 +-
 .../java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java  | 2 +-
 .../java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java  | 2 +-
 .../java/net/imagej/ops2/filter/max/DefaultMaxFilter.java | 2 +-
 .../net/imagej/ops2/filter/mean/DefaultMeanFilter.java    | 2 +-
 .../imagej/ops2/filter/median/DefaultMedianFilter.java    | 2 +-
 .../java/net/imagej/ops2/filter/min/DefaultMinFilter.java | 2 +-
 .../net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java  | 2 +-
 .../main/java/net/imagej/ops2/filter/sobel/SobelRAI.java  | 2 +-
 .../net/imagej/ops2/filter/tubeness/DefaultTubeness.java  | 4 ++--
 .../ops2/filter/variance/DefaultVarianceFilter.java       | 2 +-
 .../net/imagej/ops2/filter/vesselness/DefaultFrangi.java  | 2 +-
 .../src/main/java/net/imagej/ops2/geom/CentroidII.java    | 2 +-
 .../java/net/imagej/ops2/geom/CentroidLabelRegion.java    | 2 +-
 .../src/main/java/net/imagej/ops2/geom/CentroidMesh.java  | 2 +-
 .../main/java/net/imagej/ops2/geom/CentroidPolygon.java   | 2 +-
 .../java/net/imagej/ops2/geom/DefaultCenterOfGravity.java | 2 +-
 .../src/main/java/net/imagej/ops2/geom/SizeII.java        | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java   | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultCircularity.java   | 2 +-
 .../java/net/imagej/ops2/geom/geom2d/DefaultContour.java  | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java  | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultEccentricity.java  | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultElongation.java    | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java   | 2 +-
 .../imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java    | 2 +-
 .../ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java   | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java     | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java  | 2 +-
 .../imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java | 2 +-
 .../ops2/geom/geom2d/DefaultMaximumFeretDiameter.java     | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java  | 2 +-
 .../imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java | 2 +-
 .../ops2/geom/geom2d/DefaultMinimumFeretDiameter.java     | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java     | 2 +-
 .../imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java    | 2 +-
 .../imagej/ops2/geom/geom2d/DefaultPerimeterLength.java   | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultRoundness.java     | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java   | 2 +-
 .../geom/geom2d/DefaultSmallestEnclosingRectangle.java    | 2 +-
 .../geom2d/DefaultVerticesCountConvexHullPolygon.java     | 2 +-
 .../ops2/geom/geom2d/DefaultVerticesCountPolygon.java     | 2 +-
 .../net/imagej/ops2/geom/geom3d/DefaultCompactness.java   | 2 +-
 .../net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java  | 4 ++--
 .../imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java   | 2 +-
 .../ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java      | 2 +-
 .../imagej/ops2/geom/geom3d/DefaultMainElongation.java    | 2 +-
 .../net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java | 4 ++--
 .../imagej/ops2/geom/geom3d/DefaultMedianElongation.java  | 2 +-
 .../net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java | 2 +-
 .../net/imagej/ops2/geom/geom3d/DefaultSphericity.java    | 2 +-
 .../net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java   | 2 +-
 .../geom/geom3d/DefaultVerticesCountConvexHullMesh.java   | 2 +-
 .../imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java | 2 +-
 .../net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java    | 2 +-
 .../imagej/ops2/geom/geom3d/DefaultVoxelization3D.java    | 2 +-
 .../java/net/imagej/ops2/identity/DefaultIdentity.java    | 2 +-
 .../java/net/imagej/ops2/image/ascii/DefaultASCII.java    | 2 +-
 .../ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java | 2 +-
 .../distancetransform/CalibratedDistanceTransformer.java  | 2 +-
 .../DefaultDistanceTransformCalibration.java              | 2 +-
 .../ops2/image/distancetransform/DistanceTransformer.java | 2 +-
 .../ops2/image/equation/DefaultCoordinatesEquation.java   | 2 +-
 .../net/imagej/ops2/image/equation/DefaultEquation.java   | 2 +-
 .../main/java/net/imagej/ops2/image/fill/DefaultFill.java | 2 +-
 .../net/imagej/ops2/image/histogram/HistogramCreate.java  | 4 ++--
 .../imagej/ops2/image/integral/WrappedIntegralImg.java    | 2 +-
 .../imagej/ops2/image/normalize/NormalizeIIComputer.java  | 2 +-
 .../imagej/ops2/image/normalize/NormalizeIIFunction.java  | 2 +-
 .../net/imagej/ops2/image/normalize/NormalizeIILazy.java  | 2 +-
 .../ops2/image/normalize/NormalizeIILazyFunction.java     | 2 +-
 .../java/net/imagej/ops2/image/watershed/Watershed.java   | 8 ++++----
 .../net/imagej/ops2/image/watershed/WatershedBinary.java  | 8 ++++----
 .../ops2/image/watershed/WatershedBinarySingleSigma.java  | 8 ++++----
 .../net/imagej/ops2/image/watershed/WatershedSeeded.java  | 8 ++++----
 .../centralmoments/DefaultCentralMoment00.java            | 2 +-
 .../centralmoments/DefaultCentralMoment02.java            | 2 +-
 .../centralmoments/DefaultCentralMoment03.java            | 2 +-
 .../centralmoments/DefaultCentralMoment11.java            | 2 +-
 .../centralmoments/DefaultCentralMoment12.java            | 2 +-
 .../centralmoments/DefaultCentralMoment20.java            | 2 +-
 .../centralmoments/DefaultCentralMoment21.java            | 2 +-
 .../centralmoments/DefaultCentralMoment30.java            | 2 +-
 .../centralmoments/IterableCentralMoment00.java           | 2 +-
 .../centralmoments/IterableCentralMoment11.java           | 2 +-
 .../net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java | 2 +-
 .../net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java | 2 +-
 .../net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java | 2 +-
 .../net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java | 2 +-
 .../net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java | 2 +-
 .../net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java | 2 +-
 .../net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java | 2 +-
 .../main/java/net/imagej/ops2/labeling/MergeLabeling.java | 4 ++--
 .../java/net/imagej/ops2/labeling/cca/DefaultCCA.java     | 4 ++--
 .../src/main/java/net/imagej/ops2/logic/Default.java      | 2 +-
 .../src/main/java/net/imagej/ops2/logic/Ternary.java      | 2 +-
 .../ops2/map/neighborhood/DefaultMapNeighborhood.java     | 4 ++--
 .../ops2/map/neighborhood/MapNeighborhoodWithCenter.java  | 4 ++--
 .../ops2/math/multiply/ComplexConjugateMultiplyOp.java    | 2 +-
 .../java/net/imagej/ops2/morphology/ExtractHoles.java     | 4 ++--
 .../main/java/net/imagej/ops2/morphology/FillHoles.java   | 2 +-
 .../src/main/java/net/imagej/ops2/morphology/Outline.java | 2 +-
 .../java/net/imagej/ops2/morphology/thin/ThinGuoHall.java | 2 +-
 .../net/imagej/ops2/morphology/thin/ThinHilditch.java     | 2 +-
 .../imagej/ops2/morphology/thin/ThinMorphological.java    | 2 +-
 .../net/imagej/ops2/morphology/thin/ThinZhangSuen.java    | 2 +-
 .../imagej/ops2/project/ProjectRAIToIterableInterval.java | 2 +-
 .../segment/detectJunctions/DefaultDetectJunctions.java   | 4 ++--
 .../ops2/segment/detectRidges/DefaultDetectRidges.java    | 2 +-
 .../src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java | 2 +-
 .../java/net/imagej/ops2/stats/DefaultGeometricMean.java  | 2 +-
 .../java/net/imagej/ops2/stats/DefaultHarmonicMean.java   | 2 +-
 .../main/java/net/imagej/ops2/stats/DefaultKurtosis.java  | 2 +-
 .../src/main/java/net/imagej/ops2/stats/DefaultMax.java   | 2 +-
 .../main/java/net/imagej/ops2/stats/DefaultMedian.java    | 2 +-
 .../src/main/java/net/imagej/ops2/stats/DefaultMin.java   | 2 +-
 .../main/java/net/imagej/ops2/stats/DefaultMinMax.java    | 2 +-
 .../net/imagej/ops2/stats/DefaultMoment1AboutMean.java    | 2 +-
 .../net/imagej/ops2/stats/DefaultMoment2AboutMean.java    | 2 +-
 .../net/imagej/ops2/stats/DefaultMoment3AboutMean.java    | 2 +-
 .../net/imagej/ops2/stats/DefaultMoment4AboutMean.java    | 2 +-
 .../net/imagej/ops2/stats/DefaultMomentNAboutMean.java    | 2 +-
 .../java/net/imagej/ops2/stats/DefaultPercentile.java     | 2 +-
 .../main/java/net/imagej/ops2/stats/DefaultQuantile.java  | 2 +-
 .../src/main/java/net/imagej/ops2/stats/DefaultSize.java  | 2 +-
 .../main/java/net/imagej/ops2/stats/DefaultSkewness.java  | 2 +-
 .../net/imagej/ops2/stats/DefaultStandardDeviation.java   | 2 +-
 .../src/main/java/net/imagej/ops2/stats/DefaultSum.java   | 2 +-
 .../java/net/imagej/ops2/stats/DefaultSumOfInverses.java  | 2 +-
 .../main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java | 2 +-
 .../java/net/imagej/ops2/stats/DefaultSumOfSquares.java   | 2 +-
 .../main/java/net/imagej/ops2/stats/DefaultVariance.java  | 2 +-
 .../src/main/java/net/imagej/ops2/stats/IntegralMean.java | 2 +-
 .../src/main/java/net/imagej/ops2/stats/IntegralSum.java  | 2 +-
 .../main/java/net/imagej/ops2/stats/IntegralVariance.java | 2 +-
 .../java/net/imagej/ops2/stats/IterableGeometricMean.java | 2 +-
 .../java/net/imagej/ops2/stats/IterableHarmonicMean.java  | 2 +-
 .../src/main/java/net/imagej/ops2/stats/IterableMax.java  | 2 +-
 .../src/main/java/net/imagej/ops2/stats/IterableMean.java | 2 +-
 .../src/main/java/net/imagej/ops2/stats/IterableMin.java  | 2 +-
 .../main/java/net/imagej/ops2/stats/IterableMinMax.java   | 2 +-
 .../net/imagej/ops2/stats/IterableMoment3AboutMean.java   | 2 +-
 .../net/imagej/ops2/stats/IterableMoment4AboutMean.java   | 2 +-
 .../src/main/java/net/imagej/ops2/stats/IterableSize.java | 2 +-
 .../net/imagej/ops2/stats/IterableStandardDeviation.java  | 2 +-
 .../src/main/java/net/imagej/ops2/stats/IterableSum.java  | 2 +-
 .../java/net/imagej/ops2/stats/IterableSumOfInverses.java | 2 +-
 .../java/net/imagej/ops2/stats/IterableSumOfLogs.java     | 2 +-
 .../java/net/imagej/ops2/stats/IterableSumOfSquares.java  | 2 +-
 .../main/java/net/imagej/ops2/stats/IterableVariance.java | 2 +-
 .../ops2/stats/regression/leastSquares/Quadric.java       | 2 +-
 .../imagej/ops2/thread/chunker/ChunkerInterleaved.java    | 2 +-
 .../net/imagej/ops2/thread/chunker/DefaultChunker.java    | 2 +-
 .../ops2/threshold/apply/ApplyConstantThreshold.java      | 4 ++--
 .../ops2/threshold/apply/ApplyThresholdComparable.java    | 2 +-
 .../ops2/threshold/apply/ApplyThresholdComparator.java    | 2 +-
 .../ops2/threshold/huang/ComputeHuangThreshold.java       | 2 +-
 .../imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java    | 2 +-
 .../ops2/threshold/isoData/ComputeIsoDataThreshold.java   | 2 +-
 .../net/imagej/ops2/threshold/li/ComputeLiThreshold.java  | 2 +-
 .../localBernsen/ComputeLocalBernsenThreshold.java        | 2 +-
 .../threshold/localBernsen/LocalBernsenThreshold.java     | 2 +-
 .../localContrast/ComputeLocalContrastThreshold.java      | 2 +-
 .../threshold/localContrast/LocalContrastThreshold.java   | 2 +-
 .../threshold/localMean/ComputeLocalMeanThreshold.java    | 2 +-
 .../ops2/threshold/localMean/LocalMeanThreshold.java      | 2 +-
 .../localMedian/ComputeLocalMedianThreshold.java          | 2 +-
 .../ops2/threshold/localMedian/LocalMedianThreshold.java  | 2 +-
 .../maxLikelihood/ComputeMaxLikelihoodThreshold.java      | 2 +-
 .../imagej/ops2/threshold/mean/ComputeMeanThreshold.java  | 2 +-
 .../ops2/threshold/minError/ComputeMinErrorThreshold.java | 2 +-
 .../ops2/threshold/minimum/ComputeMinimumThreshold.java   | 2 +-
 .../ops2/threshold/moments/ComputeMomentsThreshold.java   | 2 +-
 .../imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java  | 2 +-
 .../ops2/threshold/rosin/ComputeRosinThreshold.java       | 2 +-
 .../ops2/threshold/shanbhag/ComputeShanbhagThreshold.java | 2 +-
 .../ops2/threshold/triangle/ComputeTriangleThreshold.java | 2 +-
 .../imagej/ops2/threshold/yen/ComputeYenThreshold.java    | 2 +-
 .../src/main/java/net/imagej/ops2/topology/BoxCount.java  | 2 +-
 .../eulerCharacteristic/EulerCharacteristic26N.java       | 4 ++--
 .../EulerCharacteristic26NFloating.java                   | 4 ++--
 .../topology/eulerCharacteristic/EulerCorrection.java     | 4 ++--
 remove-params.sh                                          | 3 ++-
 .../src/main/java/org/scijava/ops/math/Normalize.java     | 4 ++--
 .../src/main/java/org/scijava/ops/stats/Mean.java         | 4 ++--
 .../src/main/java/org/scijava/ops/stats/Size.java         | 8 ++++----
 256 files changed, 302 insertions(+), 301 deletions(-)

diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java
index 7fec78037..ea414ce8e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java
@@ -60,7 +60,6 @@ public class LiICQ<T extends RealType<T>, U extends RealType<U>, V extends RealT
 	@OpDependency(name = "stats.mean")
 	private Computers.Arity1<Iterable<U>, DoubleType> meanUOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -70,6 +69,7 @@ public class LiICQ<T extends RealType<T>, U extends RealType<U>, V extends RealT
 	 * @param mean2
 	 * @return the output
 	 */
+	@Override
 	public Double apply(final Iterable<T> image1, final Iterable<U> image2, final DoubleType mean1, final DoubleType mean2) {
 
 		if (!ColocUtil.sameIterationOrder(image1, image2))
@@ -129,7 +129,6 @@ class LiICQSimple<T extends RealType<T>, U extends RealType<U>, V extends RealTy
 	@OpDependency(name = "coloc.icq")
 	private Functions.Arity4<Iterable<T>, Iterable<U>, DoubleType, DoubleType, Double> colocOp;
 	
-	@Override
 	/**
 	 * TODO
 	 *
@@ -137,6 +136,7 @@ class LiICQSimple<T extends RealType<T>, U extends RealType<U>, V extends RealTy
 	 * @param image2
 	 * @return the output
 	 */
+	@Override
 	public Double apply(Iterable<T> image1, Iterable<U> image2) {
 		return colocOp.apply(image1, image2, null, null);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java
index 9e5b3be7a..cb3fd0165 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java
@@ -78,7 +78,6 @@
 public class KendallTauBRank<T extends RealType<T>, U extends RealType<U>>
 		/* extends Algorithm<T> */ implements BiFunction<Iterable<T>, Iterable<U>, Double> {
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -86,6 +85,7 @@ public class KendallTauBRank<T extends RealType<T>, U extends RealType<U>>
 	 * @param image2
 	 * @return the output
 	 */
+	@Override
 	public Double apply(Iterable<T> image1, Iterable<U> image2) {
 		if (!ColocUtil.sameIterationOrder(image1, image2))
 			throw new IllegalArgumentException("Input and output must be of the same iteration order!");
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java
index 3f93317ce..a51bc5f5a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java
@@ -82,7 +82,6 @@ public class MTKT<T extends RealType<T>, U extends RealType<U>>
 	@OpDependency(name = "threshold.otsu")
 	private Computers.Arity1<Histogram1d<U>, U> thresholdOpU;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -91,6 +90,7 @@ public class MTKT<T extends RealType<T>, U extends RealType<U>>
 	 * @param seed
 	 * @return the output
 	 */
+	@Override
 	public Double apply(final RandomAccessibleInterval<T> image1, final RandomAccessibleInterval<U> image2, final Long seed) {
 		// check image sizes
 		// TODO: Add these checks to conforms().
@@ -261,7 +261,6 @@ class MTKTSimple<T extends RealType<T>, U extends RealType<U>>
 	
 	private long seed = 0x89302341;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -269,6 +268,7 @@ class MTKTSimple<T extends RealType<T>, U extends RealType<U>>
 	 * @param image2
 	 * @return the output
 	 */
+	@Override
 	public Double apply(RandomAccessibleInterval<T> image1, RandomAccessibleInterval<U> image2) {
 		return colocOp.apply(image1, image2, seed);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java
index 399ad6e5e..93481206c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java
@@ -65,7 +65,6 @@
 public class DefaultPValue<T extends RealType<T>, U extends RealType<U>> implements
 		Computers.Arity7<RandomAccessibleInterval<T>, RandomAccessibleInterval<U>, BiFunction<RandomAccessibleInterval<T>, RandomAccessibleInterval<U>, Double>, Integer, Dimensions, Long, ExecutorService, PValueResult> {
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -78,6 +77,7 @@ public class DefaultPValue<T extends RealType<T>, U extends RealType<U>> impleme
 	 * @param executorService
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<T> image1, final RandomAccessibleInterval<U> image2,
 			final BiFunction<RandomAccessibleInterval<T>, RandomAccessibleInterval<U>, Double> op,
 			final Integer nrRandomizations, final Dimensions psfSize, final Long seed, final ExecutorService es,
@@ -201,7 +201,6 @@ class PValueSimpleWithRandomizations<T extends RealType<T>, U extends RealType<U
 	@OpDependency(name = "coloc.pValue")
 	private Computers.Arity7<RandomAccessibleInterval<T>, RandomAccessibleInterval<U>, BiFunction<RandomAccessibleInterval<T>, RandomAccessibleInterval<U>, Double>, Integer, Dimensions, Long, ExecutorService, PValueResult> pValueOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -212,6 +211,7 @@ class PValueSimpleWithRandomizations<T extends RealType<T>, U extends RealType<U
 	 * @param executorService
 	 * @param output
 	 */
+	@Override
 	public void compute(RandomAccessibleInterval<T> in1, RandomAccessibleInterval<U> in2,
 			BiFunction<RandomAccessibleInterval<T>, RandomAccessibleInterval<U>, Double> in3, Integer in4,
 			ExecutorService in5, PValueResult out) {
@@ -228,7 +228,6 @@ class PValueSimple<T extends RealType<T>, U extends RealType<U>> implements
 	@OpDependency(name = "coloc.pValue")
 	private Computers.Arity5<RandomAccessibleInterval<T>, RandomAccessibleInterval<U>, BiFunction<RandomAccessibleInterval<T>, RandomAccessibleInterval<U>, Double>, Integer, ExecutorService, PValueResult> pValueOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -238,6 +237,7 @@ class PValueSimple<T extends RealType<T>, U extends RealType<U>> implements
 	 * @param executorService
 	 * @param output
 	 */
+	@Override
 	public void compute(RandomAccessibleInterval<T> in1, RandomAccessibleInterval<U> in2,
 			BiFunction<RandomAccessibleInterval<T>, RandomAccessibleInterval<U>, Double> in3, ExecutorService in4,
 			PValueResult out) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java
index df343c2b3..95d1e3fbe 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java
@@ -50,7 +50,6 @@ public class DefaultPearsons<T extends RealType<T>, U extends RealType<U>> imple
 	BiFunction<Iterable<T>, Iterable<U>, Double> 
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -58,6 +57,7 @@ public class DefaultPearsons<T extends RealType<T>, U extends RealType<U>> imple
 	 * @param image2
 	 * @return the output
 	 */
+	@Override
 	public Double apply(final Iterable<T> image1,
 		final Iterable<U> image2)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java
index e0f94486d..6d758be3e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java
@@ -48,13 +48,13 @@ public class ClipRealTypes<I extends RealType<I>, O extends RealType<O>>
 	implements Computers.Arity1<I, O>
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void compute(final I input, final O output) {
 		final double v = input.getRealDouble();
 		final double outMin = output.getMinValue();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java
index 4ebe89636..b50fec211 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java
@@ -48,13 +48,13 @@ public class CopyRealTypes<I extends RealType<I>, O extends RealType<O>>
 	implements Computers.Arity1<I, O> 
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void compute(final I input, final O output) {
 		output.setReal(input.getRealDouble());
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java
index ba3a27ad0..51fdeeeb4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java
@@ -54,13 +54,13 @@
 @Plugin(type = Op.class, name = "copy, copy.img", priority = Priority.VERY_HIGH)
 public class CopyArrayImg<T extends NativeType<T>, A extends ArrayDataAccess<A>>
 		implements Computers.Arity1<ArrayImg<T, A>, ArrayImg<T, A>> {
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param copy
 	 */
+	@Override
 	public void compute(final ArrayImg<T, A> input, final ArrayImg<T, A> output) {
 
 		if (!Intervals.equalDimensions(input, output))
@@ -79,13 +79,13 @@ class CopyArrayImgFunction<T extends NativeType<T>, A extends ArrayDataAccess<A>
 	@OpDependency(name = "copy.img")
 	private Computers.Arity1<ArrayImg<T, A>, ArrayImg<T, A>> copyOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param copy
 	 */
+	@Override
 	public ArrayImg<T, A> apply(ArrayImg<T, A> input) {
 		// NB: Workaround for ArrayImgFactory not overriding create(Dimensions, T).
 		final long[] dims = new long[input.numDimensions()];
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java
index 5b282f28e..f27ac4817 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java
@@ -56,13 +56,13 @@ public class CopyII<T> implements Computers.Arity1<IterableInterval<T>, Iterable
 	@OpDependency(name = "copy.type")
 	private Computers.Arity1<T, T> copyOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void compute(final IterableInterval<T> input, final IterableInterval<T> output) {
 		if (!input.iterationOrder().equals(output.iterationOrder()))
 			throw new IllegalArgumentException("input and output must be of the same dimensions!");
@@ -79,13 +79,13 @@ class CopyIIFunction<T> implements Function<IterableInterval<T>, IterableInterva
 	@OpDependency(name = "copy.iterableInterval")
 	private Computers.Arity1<IterableInterval<T>, IterableInterval<T>> copyOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @return the output
 	 */
+	@Override
 	public IterableInterval<T> apply(IterableInterval<T> input) {
 		IterableInterval<T> output = imgCreator.apply(input, input.firstElement());
 		copyOp.compute(input, output);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java
index e4e543c25..bbbf49310 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java
@@ -54,13 +54,13 @@ public class CopyImg<T extends NativeType<T>> implements Computers.Arity1<Img<T>
 	@OpDependency(name = "copy.iterableInterval")
 	private Computers.Arity1<Iterable<T>, Iterable<T>> copyComputer;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void compute(final Img<T> input, final Img<T> output) {
 		if (!input.iterationOrder().equals(output.iterationOrder()))
 			throw new IllegalArgumentException("input and output must have the same iteration order!");
@@ -77,13 +77,13 @@ class CopyImgFunction<T extends NativeType<T>> implements Function<Img<T>, Img<T
 	@OpDependency(name = "create.img")
 	private Function<Img<T>, Img<T>> createFunc;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @return the output
 	 */
+	@Override
 	public Img<T> apply(Img<T> input) {
 		Img<T> output = createFunc.apply(input);
 		copyComputer.compute(input, output);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java
index 0a97b53cd..776bcc748 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java
@@ -59,13 +59,13 @@ public class CopyImgLabeling<T extends IntegerType<T> & NativeType<T>, L>
 	@OpDependency(name = "copy.labelingMapping")
 	private Computers.Arity1<LabelingMapping<L>, LabelingMapping<L>> mappingCopyOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void compute(final ImgLabeling<L, T> input, final ImgLabeling<L, T> output) {
 		if (!Intervals.equalDimensions(input, output))
 			throw new IllegalArgumentException("input and output must be of the same size!");
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java
index 4d4602af6..b03d11bf6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java
@@ -51,13 +51,13 @@
 @Plugin(type = Op.class, name = "copy, copy.labelingMapping", priority = Priority.VERY_HIGH)
 public class CopyLabelingMapping<L> implements Computers.Arity1<LabelingMapping<L>, LabelingMapping<L>> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void compute(final LabelingMapping<L> input, final LabelingMapping<L> output) {
 
 		final LabelingMappingSerializationAccess<L> access = new LabelingMappingSerializationAccess<>(output);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java
index a169cb9de..8e6ee8a1b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java
@@ -54,13 +54,13 @@ public class CopyRAI<T> implements Computers.Arity1<RandomAccessibleInterval<T>,
 	@OpDependency(name = "copy")
 	private Computers.Arity1<T, T> mapComputer;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param copy
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<T> input, final RandomAccessibleInterval<T> output) {
 		if (!Intervals.equalDimensions(input, output))
 			throw new IllegalArgumentException("input and output must be of the same dimensionality!");
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java
index c85980681..b36534779 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java
@@ -46,13 +46,13 @@
 @Plugin(type = Op.class, name = "copy, copy.type")
 public class CopyType<T extends Type<T>> implements Computers.Arity1<T, T> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param copy
 	 */
+	@Override
 	public void compute(final T input, final T output) {
 		output.set(input);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java
index 7f5368743..fb749d97c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java
@@ -78,7 +78,6 @@ public class NonCirculantFirstGuess<I extends RealType<I>, O extends RealType<O>
 	 * image before extension, k is required to calculate the non-circulant
 	 * normalization factor
 	 */
-	@Override
 	/**
 	 * TODO
 	 *
@@ -87,6 +86,7 @@ public class NonCirculantFirstGuess<I extends RealType<I>, O extends RealType<O>
 	 * @param k
 	 * @return the output
 	 */
+	@Override
 	public RandomAccessibleInterval<O> apply(RandomAccessibleInterval<I> in, final O outType, final Dimensions k) {
 
 		final Img<O> firstGuess = create.apply(in, outType);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java
index 55bf627e6..33285ea51 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java
@@ -120,7 +120,6 @@ public class RichardsonLucyC<I extends RealType<I>, O extends RealType<O>, K ext
 	@OpDependency(name = "copy.rai")
 	private Computers.Arity1<RandomAccessibleInterval<O>, RandomAccessibleInterval<O>> copy2Op;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -139,6 +138,7 @@ public class RichardsonLucyC<I extends RealType<I>, O extends RealType<O>, K ext
 	 * @param executorService
 	 * @param output
 	 */
+	@Override
 	public void compute(RandomAccessibleInterval<I> in, RandomAccessibleInterval<K> kernel,
 			RandomAccessibleInterval<C> fftInput, RandomAccessibleInterval<C> fftKernel, Boolean performInputFFT,
 			Boolean performKernelFFT, C complexType, Integer maxIterations,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java
index f0ec2c36d..580c4518a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java
@@ -182,7 +182,6 @@ private void computeFilter(final RandomAccessibleInterval<I> input,
 		filter.compute(paddedInput, paddedKernel, output);
 	}
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -199,6 +198,7 @@ private void computeFilter(final RandomAccessibleInterval<I> input,
 	 * @param executorService
 	 * @return the output
 	 */
+	@Override
 	public RandomAccessibleInterval<O> apply(RandomAccessibleInterval<I> input, RandomAccessibleInterval<K> kernel,
 			long[] borderSize, OutOfBoundsFactory<I, RandomAccessibleInterval<I>> obfInput,
 			OutOfBoundsFactory<K, RandomAccessibleInterval<K>> obfKernel, O outType, C complexType,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java
index 1b0b59a2f..120f55e44 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java
@@ -53,7 +53,6 @@
 public class DefaultEval implements Functions.Arity3<String, Map<String, Object>, OpService, Object>
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -62,6 +61,7 @@ public class DefaultEval implements Functions.Arity3<String, Map<String, Object>
 	 * @param opService
 	 * @return the output
 	 */
+	@Override
 	public Object apply(final String input, final Map<String, Object> vars, final OpService ops) {
 		OpEvaluator e = new OpEvaluator(ops);
 		if (vars != null) e.setAll(vars);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java
index 0a8c5030d..38fa0e2d9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java
@@ -48,7 +48,6 @@
 @Plugin(type = Op.class, name = "features.haralick.asm")
 public class DefaultASM<T extends RealType<T>> extends AbstractHaralickFeature<T> {
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -58,6 +57,7 @@ public class DefaultASM<T extends RealType<T>> extends AbstractHaralickFeature<T
 	 * @param matrixOrientation
 	 * @return the output
 	 */
+	@Override
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java
index 856efdd0e..f77f984d5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java
@@ -56,7 +56,6 @@ public class DefaultClusterPromenence<T extends RealType<T>> extends AbstractHar
 	@OpDependency(name = "features.haralick.coocMeanY")
 	private Function<double[][], DoubleType> coocMeanYFunc;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -66,6 +65,7 @@ public class DefaultClusterPromenence<T extends RealType<T>> extends AbstractHar
 	 * @param matrixOrientation
 	 * @return the output
 	 */
+	@Override
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java
index 4a572c700..81da5e7d3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java
@@ -55,7 +55,6 @@ public class DefaultClusterShade<T extends RealType<T>> extends AbstractHaralick
 	@OpDependency(name = "features.haralick.coocMeanY")
 	private Function<double[][], DoubleType> coocMeanYFunc;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -65,6 +64,7 @@ public class DefaultClusterShade<T extends RealType<T>> extends AbstractHaralick
 	 * @param matrixOrientation
 	 * @return the output
 	 */
+	@Override
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java
index b2723d6bc..0e5cea21a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java
@@ -54,7 +54,6 @@ public class DefaultContrast<T extends RealType<T>> extends AbstractHaralickFeat
 	@OpDependency(name = "features.haralick.coocPXMinusY")
 	private Function<double[][], double[]> coocPXMinusYFunc;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -64,6 +63,7 @@ public class DefaultContrast<T extends RealType<T>> extends AbstractHaralickFeat
 	 * @param matrixOrientation
 	 * @return the output
 	 */
+	@Override
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java
index 3de219046..d66e84768 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java
@@ -63,7 +63,6 @@ public class DefaultCorrelation<T extends RealType<T>> extends
 	@OpDependency(name = "features.haralick.coocStdX")
 	private Function<double[][], DoubleType> coocStdXFunc;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -73,6 +72,7 @@ public class DefaultCorrelation<T extends RealType<T>> extends
 	 * @param matrixOrientation
 	 * @return the output
 	 */
+	@Override
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java
index 1c2b0580a..3c44f14dd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java
@@ -57,7 +57,6 @@ public class DefaultDifferenceEntropy<T extends RealType<T>> extends AbstractHar
 	@OpDependency(name = "features.haralick.coocPXMinusY")
 	private Function<double[][], double[]> coocPXMinusYFunc;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -67,6 +66,7 @@ public class DefaultDifferenceEntropy<T extends RealType<T>> extends AbstractHar
 	 * @param matrixOrientation
 	 * @return the output
 	 */
+	@Override
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java
index 1dda50507..c50a010a9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java
@@ -56,7 +56,6 @@ public class DefaultDifferenceVariance<T extends RealType<T>> extends AbstractHa
 	@OpDependency(name = "features.haralick.coocPXMinusY")
 	private Function<double[][], double[]> coocPXMinusYFunc;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -66,6 +65,7 @@ public class DefaultDifferenceVariance<T extends RealType<T>> extends AbstractHa
 	 * @param matrixOrientation
 	 * @return the output
 	 */
+	@Override
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java
index 27add20dd..ebaece148 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java
@@ -52,7 +52,6 @@ public class DefaultEntropy<T extends RealType<T>> extends AbstractHaralickFeatu
 	// Avoid log 0
 	private static final double EPSILON = Double.MIN_NORMAL;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -62,6 +61,7 @@ public class DefaultEntropy<T extends RealType<T>> extends AbstractHaralickFeatu
 	 * @param matrixOrientation
 	 * @return the output
 	 */
+	@Override
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java
index ef826226a..efe37c373 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java
@@ -58,7 +58,6 @@ public class DefaultICM1<T extends RealType<T>> extends AbstractHaralickFeature<
 	@OpDependency(name = "features.haralick.entropy")
 	private Functions.Arity4<RandomAccessibleInterval<T>, Integer, Integer, MatrixOrientation, DoubleType> entropy;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -68,6 +67,7 @@ public class DefaultICM1<T extends RealType<T>> extends AbstractHaralickFeature<
 	 * @param matrixOrientation
 	 * @return the output
 	 */
+	@Override
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java
index 718a07cb5..4e3a2b90a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java
@@ -57,7 +57,6 @@ public class DefaultICM2<T extends RealType<T>> extends AbstractHaralickFeature<
 	@OpDependency(name = "features.haralick.entropy")
 	private Functions.Arity4<RandomAccessibleInterval<T>, Integer, Integer, MatrixOrientation, DoubleType> entropy;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -67,6 +66,7 @@ public class DefaultICM2<T extends RealType<T>> extends AbstractHaralickFeature<
 	 * @param matrixOrientation
 	 * @return the output
 	 */
+	@Override
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java
index 0d362cacd..66ce43cff 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java
@@ -49,7 +49,6 @@
 @Plugin(type = Op.class, name = "features.haralick.ifdm")
 public class DefaultIFDM<T extends RealType<T>> extends AbstractHaralickFeature<T> {
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -59,6 +58,7 @@ public class DefaultIFDM<T extends RealType<T>> extends AbstractHaralickFeature<
 	 * @param matrixOrientation
 	 * @return the output
 	 */
+	@Override
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java
index 8c0a733fc..27349b55c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java
@@ -47,7 +47,6 @@
 @Plugin(type = Op.class, name = "features.haralick.maxProbability")
 public class DefaultMaxProbability<T extends RealType<T>> extends AbstractHaralickFeature<T> {
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -57,6 +56,7 @@ public class DefaultMaxProbability<T extends RealType<T>> extends AbstractHarali
 	 * @param matrixOrientation
 	 * @return the output
 	 */
+	@Override
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java
index 64462fad8..29bb1aa4c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java
@@ -53,7 +53,6 @@ public class DefaultSumAverage<T extends RealType<T>> extends AbstractHaralickFe
 	@OpDependency(name = "features.haralick.coocPXPlusY")
 	private Function<double[][], double[]> coocPXPlusFunc;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -63,6 +62,7 @@ public class DefaultSumAverage<T extends RealType<T>> extends AbstractHaralickFe
 	 * @param matrixOrientation
 	 * @return the output
 	 */
+	@Override
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java
index 70aaf59c7..250bbc365 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java
@@ -58,7 +58,6 @@ public class DefaultSumEntropy<T extends RealType<T>> extends
 	@OpDependency(name = "features.haralick.coocPXPlusY")
 	private Function<double[][], double[]> coocPXPlusFunc;
 	
-	@Override
 	/**
 	 * TODO
 	 *
@@ -68,6 +67,7 @@ public class DefaultSumEntropy<T extends RealType<T>> extends
 	 * @param matrixOrientation
 	 * @return the output
 	 */
+	@Override
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java
index 4bbed0c26..240b9f3e4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java
@@ -60,7 +60,6 @@ public class DefaultSumVariance<T extends RealType<T>> extends AbstractHaralickF
 	@OpDependency(name = "features.haralick.sumEntropy")
 	private Functions.Arity4<RandomAccessibleInterval<T>, Integer, Integer, MatrixOrientation, RealType> sumEntropyFunc;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -70,6 +69,7 @@ public class DefaultSumVariance<T extends RealType<T>> extends AbstractHaralickF
 	 * @param matrixOrientation
 	 * @return the output
 	 */
+	@Override
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java
index 1e1eaa4c0..89b40d484 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java
@@ -47,7 +47,6 @@
 @Plugin(type = Op.class, name = "features.haralick.textureHomogeneity")
 public class DefaultTextureHomogeneity<T extends RealType<T>> extends AbstractHaralickFeature<T> {
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -57,6 +56,7 @@ public class DefaultTextureHomogeneity<T extends RealType<T>> extends AbstractHa
 	 * @param matrixOrientation
 	 * @return the output
 	 */
+	@Override
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java
index 286e1dfcb..9389956e5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java
@@ -49,7 +49,6 @@
 @Plugin(type = Op.class, name = "features.haralick.variance")
 public class DefaultVariance<T extends RealType<T>> extends AbstractHaralickFeature<T> {
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -59,6 +58,7 @@ public class DefaultVariance<T extends RealType<T>> extends AbstractHaralickFeat
 	 * @param matrixOrientation
 	 * @return the output
 	 */
+	@Override
 	public DoubleType apply(final RandomAccessibleInterval<T> input, final Integer numGreyLevels, final Integer distance,
 			final MatrixOrientation orientation) {
 		final double[][] matrix = getCooccurrenceMatrix(input, numGreyLevels, distance, orientation);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java
index ed23ab53d..8c3f7993d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java
@@ -53,13 +53,13 @@ public class CoocHXY implements Function<double[][], double[]> {
 	@OpDependency(name = "features.haralick.coocPY")
 	private Function<double[][], double[]> coocPYFunc;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param matix
 	 * @return the output
 	 */
+	@Override
 	public double[] apply(double[][] matrix) {
 		double hx = 0.0d;
 		double hy = 0.0d;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java
index 50967b267..ecf5009d6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java
@@ -49,13 +49,13 @@ public class CoocMeanX implements Function<double[][], DoubleType> {
 	@OpDependency(name = "features.haralick.coocPX")
 	private Function<double[][], double[]> coocPXFunc;
 	
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @return the output
 	 */
+	@Override
 	public DoubleType apply(double[][] input) {
 
 		double res = 0;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java
index 4d10febf8..df23eda06 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java
@@ -51,13 +51,13 @@ public class CoocMeanY implements Function<double[][], DoubleType> {
 	private Function<double[][], double[]> coocPYFunc;
 
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @return the output
 	 */
+	@Override
 	public DoubleType apply(double[][] input) {
 
 		double res = 0;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java
index 1a3a8bcab..9637dc891 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java
@@ -43,13 +43,13 @@
 @Plugin(type = Op.class, name = "features.haralick.coocPX")
 public class CoocPX implements Function<double[][], double[]> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @return the output
 	 */
+	@Override
 	public double[] apply(double[][] input) {
 		final int nrGrayLevels = input.length;
 		final double[] output = new double[nrGrayLevels];
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java
index faf5d8bb7..edbde81f1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java
@@ -43,13 +43,13 @@
 @Plugin(type = Op.class, name = "features.haralick.coocPXMinusY")
 public class CoocPXMinusY implements Function<double[][], double[]> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param matrix
 	 * @return the output
 	 */
+	@Override
 	public double[] apply(final double[][] matrix) {
 
 		final int nrGrayLevels = matrix.length;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java
index 68e3d6615..b1ef25aca 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java
@@ -43,13 +43,13 @@
 @Plugin(type = Op.class, name = "features.haralick.coocPXPlusY")
 public class CoocPXPlusY implements Function<double[][], double[]> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param matrix
 	 * @return the output
 	 */
+	@Override
 	public double[] apply(double[][] matrix) {
 
 		final int nrGrayLevels = matrix.length;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java
index 6ec08b685..0ad0e34d4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java
@@ -43,13 +43,13 @@
 @Plugin(type = Op.class, name = "features.haralick.coocPY")
 public class CoocPY implements Function<double[][], double[]> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param matrix
 	 * @return the output
 	 */
+	@Override
 	public double[] apply(final double[][] matrix) {
 		final int nrGrayLevels = matrix.length;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java
index 8c7e65150..0066a5eff 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java
@@ -52,13 +52,13 @@ public class CoocStdX implements Function<double[][], DoubleType> {
 	@OpDependency(name = "features.haralick.coocPX")
 	private Function<double[][], double[]> coocPXFunc;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @return the output
 	 */
+	@Override
 	public DoubleType apply(double[][] input) {
 
 		double res = 0;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java
index 30f8efa12..9c22c8ed1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java
@@ -53,13 +53,13 @@ public class CoocStdY implements Function<double[][], DoubleType> {
 	@OpDependency(name = "features.haralick.coocPY")
 	private Function<double[][], double[]> coocPYFunc;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @return the output
 	 */
+	@Override
 	public DoubleType apply(double[][] input) {
 		double res = 0;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java
index 7fb80ca52..59055358b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java
@@ -94,7 +94,6 @@ public class HistogramOfOrientedGradients2D<T extends RealType<T>> implements
 	private Converter<GenericComposite<FloatType>, FloatType> converterGetMax;
 
 	@SuppressWarnings("unchecked")
-	@Override
 	/**
 	 * TODO
 	 *
@@ -104,6 +103,7 @@ public class HistogramOfOrientedGradients2D<T extends RealType<T>> implements
 	 * @param executorService
 	 * @param output
 	 */
+	@Override
 	public void compute(RandomAccessibleInterval<T> in, Integer numOrientations, Integer spanOfNeighborhood,
 			ExecutorService es, RandomAccessibleInterval<T> out) {
 		Interval imgOpInterval = new FinalInterval(in.dimension(0), in.dimension(1));
@@ -287,7 +287,6 @@ class HistogramOfOrientedGradients2DFunction<T extends RealType<T>> implements
 	@OpDependency(name = "features.hog")
 	private Computers.Arity4<RandomAccessibleInterval<T>, Integer, Integer, ExecutorService, RandomAccessibleInterval<T>> hogOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -297,6 +296,7 @@ class HistogramOfOrientedGradients2DFunction<T extends RealType<T>> implements
 	 * @param executorService
 	 * @return the output
 	 */
+	@Override
 	public RandomAccessibleInterval<T> apply(final RandomAccessibleInterval<T> input, final Integer numOrientations,
 			final Integer spanOfNeighborhood, final ExecutorService es) {
 		final T inType = Util.getTypeFromInterval(input);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java
index 652907617..33d25d0ef 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java
@@ -62,7 +62,6 @@ public class DefaultLBP2D<I extends RealType<I>>
 	@OpDependency(name = "image.histogram")
 	private BiFunction<ArrayList<LongType>, Integer, Histogram1d<LongType>> histOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -71,6 +70,7 @@ public class DefaultLBP2D<I extends RealType<I>>
 	 * @param histogramSize
 	 * @return the output
 	 */
+	@Override
 	public ArrayList<LongType> apply(RandomAccessibleInterval<I> input, Integer distance, Integer histogramSize) {
 		ArrayList<LongType> output = new ArrayList<>();
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java
index 4e6217756..bc7fc5dc8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java
@@ -72,13 +72,13 @@ public class DefaultCoarsenessFeature<I extends RealType<I>, O extends RealType<
 			OutOfBoundsFactory<I, RandomAccessibleInterval<I>>, RandomAccessibleInterval<I>> meanOp;
 
 	@SuppressWarnings("unchecked")
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 		if (input.numDimensions() != 2)
 			throw new IllegalArgumentException("Only 2 dimensional images allowed!");
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java
index 0ac6c721f..2e51b720b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java
@@ -56,13 +56,13 @@ public class DefaultContrastFeature<I extends RealType<I>, O extends RealType<O>
 	@OpDependency(name = "stats.stdDev")
 	private Function<Iterable<I>, O> stdOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void compute(final IterableInterval<I> input, final O output) {
 		if (input.numDimensions() != 2)
 			throw new IllegalArgumentException("Only 2 dimensional images allowed!");
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java
index 656161d5b..0f530f475 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java
@@ -71,7 +71,6 @@ public class DefaultDirectionalityFeature<I extends RealType<I>, O extends RealT
 	private BiFunction<Dimensions, I, Img<I>> imgCreator;
 
 	@SuppressWarnings("unchecked")
-	@Override
 	/**
 	 * TODO
 	 *
@@ -79,6 +78,7 @@ public class DefaultDirectionalityFeature<I extends RealType<I>, O extends RealT
 	 * @param histogramSize
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<I> input,
 		Integer histogramSize, final O output)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java
index c65f35bae..7652c87b8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java
@@ -57,7 +57,6 @@ public class DefaultMagnitudeFeature<T extends RealType<T>>
 	@OpDependency(name = "features.zernike.computer")
 	private Functions.Arity3<IterableInterval<T>, Integer, Integer, ZernikeMoment> zernikeOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -66,6 +65,7 @@ public class DefaultMagnitudeFeature<T extends RealType<T>>
 	 * @param repetition
 	 * @param output
 	 */
+	@Override
 	public void compute(IterableInterval<T> input, Integer order, Integer repetition, DoubleType output) {
 		if (input.numDimensions() != 2)
 			throw new IllegalArgumentException("Only 2 dimensional inputs allowed!");
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java
index e8e80f961..db584d0c3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java
@@ -59,7 +59,6 @@ public class DefaultPhaseFeature<T extends RealType<T>>
 	@OpDependency(name = "features.zernike.computer")
 	private Functions.Arity3<IterableInterval<T>, Integer, Integer, ZernikeMoment> zernikeOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -68,6 +67,7 @@ public class DefaultPhaseFeature<T extends RealType<T>>
 	 * @param repetition
 	 * @param output
 	 */
+	@Override
 	public void compute(IterableInterval<T> input, Integer order, Integer repetition, DoubleType output) {
 		if (input.numDimensions() != 2)
 			throw new IllegalArgumentException("Only 2 dimensional inputs allowed!");
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java
index 017bf3132..7ef4fabc2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java
@@ -49,7 +49,6 @@
 public class ZernikeComputer<T extends RealType<T>>
 		implements Functions.Arity3<IterableInterval<T>, Integer, Integer, ZernikeMoment> {
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -58,6 +57,7 @@ public class ZernikeComputer<T extends RealType<T>>
 	 * @param repetition
 	 * @param zernikeMoment
 	 */
+	@Override
 	public ZernikeMoment apply(final IterableInterval<T> ii, final Integer order, final Integer repetition) {
 
 		final double width2 = (ii.dimension(0) - 1) / 2.0;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java
index 3447b69ce..738a2a2b3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java
@@ -74,7 +74,6 @@ public class FFTMethodsLinearFFTFilterC<I extends RealType<I>, O extends RealTyp
 	/**
 	 * Perform convolution by multiplying the FFTs in the frequency domain
 	 */
-	@Override
 	/**
 	 * TODO
 	 *
@@ -88,6 +87,7 @@ public class FFTMethodsLinearFFTFilterC<I extends RealType<I>, O extends RealTyp
 	 * @param frequencyOp
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<I> in, final RandomAccessibleInterval<K> kernel,
 			final RandomAccessibleInterval<C> fftInput, final RandomAccessibleInterval<C> fftKernel,
 			final Boolean performInputFFT, final Boolean performKernelFFT, final ExecutorService es,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java
index d3738f714..5f89f5738 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java
@@ -65,7 +65,6 @@ public class ConvolveFFTC<I extends RealType<I>, O extends RealType<O>, K extend
 	/**
 	 * Call the linear filter that is set up to perform convolution
 	 */
-	@Override
 	/**
 	 * TODO
 	 *
@@ -78,6 +77,7 @@ public class ConvolveFFTC<I extends RealType<I>, O extends RealType<O>, K extend
 	 * @param executorService
 	 * @param output
 	 */
+	@Override
 	public void compute(RandomAccessibleInterval<I> in, RandomAccessibleInterval<K> kernel,
 			RandomAccessibleInterval<C> fftInput, RandomAccessibleInterval<C> fftKernel, Boolean performInputFFT,
 			Boolean performKernelFFT, ExecutorService es, RandomAccessibleInterval<O> out) {
@@ -93,7 +93,6 @@ class ConvolveFFTCSimple<I extends RealType<I>, O extends RealType<O>, K extends
 	@OpDependency(name = "filter.convolve")
 	private Computers.Arity7<RandomAccessibleInterval<I>, RandomAccessibleInterval<K>, RandomAccessibleInterval<C>, RandomAccessibleInterval<C>, Boolean, Boolean, ExecutorService, RandomAccessibleInterval<O>> convolveOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -104,6 +103,7 @@ class ConvolveFFTCSimple<I extends RealType<I>, O extends RealType<O>, K extends
 	 * @param executorService
 	 * @param output
 	 */
+	@Override
 	public void compute(RandomAccessibleInterval<I> in, RandomAccessibleInterval<K> kernel,
 			RandomAccessibleInterval<C> fftInput, RandomAccessibleInterval<C> fftKernel, ExecutorService es,
 			RandomAccessibleInterval<O> output) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java
index 8c8f0e7d8..d508fdedd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java
@@ -83,7 +83,6 @@ public class ConvolveFFTF<I extends RealType<I> & NativeType<I>, O extends RealT
 	@OpDependency(name = "filter.convolve")
 	private Computers.Arity7<RandomAccessibleInterval<I>, RandomAccessibleInterval<K>, RandomAccessibleInterval<C>, RandomAccessibleInterval<C>, Boolean, Boolean, ExecutorService, RandomAccessibleInterval<O>> convolveOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -96,6 +95,7 @@ public class ConvolveFFTF<I extends RealType<I> & NativeType<I>, O extends RealT
 	 * @param executorService
 	 * @return the output
 	 */
+	@Override
 	public RandomAccessibleInterval<O> apply(final RandomAccessibleInterval<I> input,
 			final RandomAccessibleInterval<K> kernel, final long[] borderSize,
 			final OutOfBoundsFactory<I, RandomAccessibleInterval<I>> obfInput,
@@ -175,8 +175,7 @@ class SimpleConvolveFFTF<I extends RealType<I> & NativeType<I>, O extends RealTy
 		@OpDependency(name = "filter.convolve")
 		Functions.Arity7<RandomAccessibleInterval<I>, RandomAccessibleInterval<K>, long[], OutOfBoundsFactory<I, RandomAccessibleInterval<I>>, FloatType, ComplexFloatType, ExecutorService, RandomAccessibleInterval<FloatType>> convolveOp;
 
-		@Override
-	/**
+		/**
 	 * TODO
 	 *
 	 * @param input
@@ -184,6 +183,7 @@ class SimpleConvolveFFTF<I extends RealType<I> & NativeType<I>, O extends RealTy
 	 * @param executorService
 	 * @return the output
 	 */
+	@Override
 		public RandomAccessibleInterval<FloatType> apply(RandomAccessibleInterval<I> t, RandomAccessibleInterval<K> u, ExecutorService es) {
 			OutOfBoundsFactory<I, RandomAccessibleInterval<I>> obfInput = new OutOfBoundsConstantValueFactory<>(Util
 					.getTypeFromInterval(t).createVariable());
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java
index 15a989db1..8055e2969 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java
@@ -54,7 +54,6 @@ public class ConvolveNaiveC<I extends RealType<I>, K extends RealType<K>, O exte
 	// if someone tried to re-use
 	// with a big kernel that should be matched with ConvolveFFT
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -62,6 +61,7 @@ public class ConvolveNaiveC<I extends RealType<I>, K extends RealType<K>, O exte
 	 * @param kernel
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessible<I> input, final RandomAccessibleInterval<K> kernel,
 			final RandomAccessibleInterval<O> output) {
 		// conforms only if the kernel is sufficiently small
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java
index ed28edf5f..fe0345a0f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java
@@ -92,7 +92,6 @@ public RandomAccessibleInterval<O> createOutput(RandomAccessibleInterval<I> inpu
 		return createOp.apply(input, outType.createVariable());
 	}
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -102,6 +101,7 @@ public RandomAccessibleInterval<O> createOutput(RandomAccessibleInterval<I> inpu
 	 * @param outType
 	 * @return the output
 	 */
+	@Override
 	public RandomAccessibleInterval<O> apply(final RandomAccessibleInterval<I> input,
 			final RandomAccessibleInterval<K> kernel, OutOfBoundsFactory<I, RandomAccessibleInterval<I>> obf,
 			final O outType) {
@@ -142,7 +142,6 @@ class SimpleConvolveNaiveF<I extends RealType<I>, O extends RealType<O> & Native
 	@OpDependency(name = "filter.convolve")
 	Functions.Arity4<RandomAccessibleInterval<I>, RandomAccessibleInterval<K>, OutOfBoundsFactory<I, RandomAccessibleInterval<I>>, O, RandomAccessibleInterval<O>> convolveOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -150,6 +149,7 @@ class SimpleConvolveNaiveF<I extends RealType<I>, O extends RealType<O> & Native
 	 * @param kernel
 	 * @return the output
 	 */
+	@Override
 	public RandomAccessibleInterval<O> apply(RandomAccessibleInterval<I> t, RandomAccessibleInterval<K> u) {
 		return convolveOp.apply(t, u, null, null);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java
index 14bc03052..8c6285af5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java
@@ -69,7 +69,6 @@ public class CorrelateFFTC<I extends RealType<I>, O extends RealType<O>, K exten
 	/**
 	 * Call the linear filter that is set up to perform correlation
 	 */
-	@Override
 	/**
 	 * TODO
 	 *
@@ -82,6 +81,7 @@ public class CorrelateFFTC<I extends RealType<I>, O extends RealType<O>, K exten
 	 * @param executorService
 	 * @param output
 	 */
+	@Override
 	public void compute(RandomAccessibleInterval<I> input, RandomAccessibleInterval<K> kernel,
 			RandomAccessibleInterval<C> fftInput, RandomAccessibleInterval<C> fftKernel, Boolean performInputFFT,
 			Boolean performKernelFFT, ExecutorService es, RandomAccessibleInterval<O> out) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java
index 3802fd8fb..4a25c9f2c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java
@@ -80,7 +80,6 @@ public class CorrelateFFTF<I extends RealType<I> & NativeType<I>, O extends Real
 	@OpDependency(name = "filter.correlate")
 	private Computers.Arity7<RandomAccessibleInterval<I>, RandomAccessibleInterval<K>, RandomAccessibleInterval<C>, RandomAccessibleInterval<C>, Boolean, Boolean, ExecutorService, RandomAccessibleInterval<O>> correlateOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -94,6 +93,7 @@ public class CorrelateFFTF<I extends RealType<I> & NativeType<I>, O extends Real
 	 * @param executorService
 	 * @return the output
 	 */
+	@Override
 	public RandomAccessibleInterval<O> apply(final RandomAccessibleInterval<I> input,
 			final RandomAccessibleInterval<K> kernel, final long[] borderSize,
 			final OutOfBoundsFactory<I, RandomAccessibleInterval<I>> obfInput,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java
index 8abe51ab3..c3a1f344a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java
@@ -169,7 +169,6 @@ public void setupConvolves(RandomAccessibleInterval<T> input, Integer dimension)
 
 	}
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -177,6 +176,7 @@ public void setupConvolves(RandomAccessibleInterval<T> input, Integer dimension)
 	 * @param dimension
 	 * @param output
 	 */
+	@Override
 	public void compute(RandomAccessibleInterval<T> input, final Integer dimension,
 			RandomAccessibleInterval<T> output) {
 		setupConvolves(input, dimension);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java
index 96482e269..e29729cc9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java
@@ -65,13 +65,13 @@ public class PartialDerivativesRAI<T extends RealType<T>>
 	@OpDependency(name = "create.img")
 	private Function<RandomAccessibleInterval<T>, RandomAccessibleInterval<T>> imgCreator;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @return the outputComposite
 	 */
+	@Override
 	public CompositeIntervalView<T, RealComposite<T>> apply(RandomAccessibleInterval<T> input) {
 		List<RandomAccessibleInterval<T>> derivatives = new ArrayList<>();
 		for (int i = 0; i < input.numDimensions(); i++) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java
index 0cf7b4899..2f9837dc3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java
@@ -275,7 +275,6 @@ private <T extends RealType<T>> void convolve_n(final RandomAccessibleInterval<T
 	}
 
 	@SuppressWarnings("unchecked")
-	@Override
 	/**
 	 * TODO
 	 *
@@ -284,6 +283,7 @@ private <T extends RealType<T>> void convolve_n(final RandomAccessibleInterval<T
 	 * @param derivatives the value at each index indicates the derivative to take in each dimension of the image.
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<T> input, final double[] sigma, final int[] derivatives, final RandomAccessibleInterval<DoubleType> output) {
 
 		// throw exception if not enough derivative values were given
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java
index 42e4914f7..a61175399 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java
@@ -63,7 +63,6 @@ public class DefaultDoG<T extends NumericType<T> & NativeType<T>> implements
 	@OpDependency(name = "math.subtract")
 	private Computers.Arity2<RandomAccessibleInterval<T>, RandomAccessibleInterval<T>, RandomAccessibleInterval<T>> subtractor;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -72,6 +71,7 @@ public class DefaultDoG<T extends NumericType<T> & NativeType<T>> implements
 	 * @param gauss2
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<T> input,
 			final Computers.Arity1<RandomAccessibleInterval<T>, RandomAccessibleInterval<T>> gauss1,
 			final Computers.Arity1<RandomAccessibleInterval<T>, RandomAccessibleInterval<T>> gauss2,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java
index 1133def2a..cd153af86 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java
@@ -63,7 +63,6 @@ public class DoGVaryingSigmas<T extends NumericType<T> & NativeType<T>> implemen
 			Computers.Arity1<RandomAccessibleInterval<T>, RandomAccessibleInterval<T>>, RandomAccessibleInterval<T>> dogOp;
 
 	//TODO: make the outOfBoundsFactory optional (see DoGTest for the default).
-	@Override
 	/**
 	 * TODO
 	 *
@@ -74,6 +73,7 @@ public class DoGVaryingSigmas<T extends NumericType<T> & NativeType<T>> implemen
 	 * @param executorService
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<T> t, final double[] sigmas1, //
 			final double[] sigmas2, final OutOfBoundsFactory<T, RandomAccessibleInterval<T>> fac,
 			final ExecutorService es, final RandomAccessibleInterval<T> output) {
@@ -98,7 +98,6 @@ class DoGSingleSigma<T extends NumericType<T> & NativeType<T>> implements
 	private Computers.Arity5<RandomAccessibleInterval<T>, double[], double[], //
 			OutOfBoundsFactory<T, RandomAccessibleInterval<T>>, ExecutorService, RandomAccessibleInterval<T>> dogOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -109,6 +108,7 @@ class DoGSingleSigma<T extends NumericType<T> & NativeType<T>> implements
 	 * @param executorService
 	 * @param output
 	 */
+	@Override
 	public void compute(RandomAccessibleInterval<T> in1, Double in2, Double in3,
 			OutOfBoundsFactory<T, RandomAccessibleInterval<T>> in4, ExecutorService in5,
 			RandomAccessibleInterval<T> out) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java
index ea0561d97..e2edafe91 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java
@@ -53,7 +53,6 @@ public class CreateOutputFFTMethods<T> implements Functions.Arity3<Dimensions, T
 	@OpDependency(name = "create.img")
 	private BiFunction<Dimensions, T, Img<T>> create;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -62,6 +61,7 @@ public class CreateOutputFFTMethods<T> implements Functions.Arity3<Dimensions, T
 	 * @param fast
 	 * @return the output
 	 */
+	@Override
 	public Img<T> apply(Dimensions paddedDimensions, T outType, Boolean fast) {
 
 		Dimensions paddedFFTMethodsFFTDimensions = FFTMethodsUtility.getFFTDimensionsRealToComplex(fast,
@@ -77,7 +77,6 @@ class CreateOutputFFTMethodsSimple<T> implements BiFunction<Dimensions, T, Img<T
 	@OpDependency(name = "filter.createFFTOutput")
 	private Functions.Arity3<Dimensions, T, Boolean, Img<T>> create;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -85,6 +84,7 @@ class CreateOutputFFTMethodsSimple<T> implements BiFunction<Dimensions, T, Img<T
 	 * @param outType
 	 * @return the output
 	 */
+	@Override
 	public Img<T> apply(Dimensions paddedDimensions, T outType) {
 		return create.apply(paddedDimensions, outType, true);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java
index f971103c3..a002677a1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java
@@ -61,7 +61,6 @@ public class FFTMethodsOpC<T extends RealType<T>, C extends ComplexType<C>>
 	/**
 	 * Computes an ND FFT using FFTMethods
 	 */
-	@Override
 	/**
 	 * TODO
 	 *
@@ -69,6 +68,7 @@ public class FFTMethodsOpC<T extends RealType<T>, C extends ComplexType<C>>
 	 * @param executorService
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<T> input,
 		final ExecutorService es, final RandomAccessibleInterval<C> output)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java
index d331e7ad1..61388c497 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java
@@ -76,7 +76,6 @@ public class FFTMethodsOpF<T extends RealType<T>, C extends ComplexType<C>> impl
 	 * FFT implementation the input will be extended to the nearest size that is
 	 * supported.
 	 */
-	@Override
 	/**
 	 * TODO
 	 *
@@ -87,6 +86,7 @@ public class FFTMethodsOpF<T extends RealType<T>, C extends ComplexType<C>> impl
 	 * @param executorService
 	 * @return the output
 	 */
+	@Override
 	public RandomAccessibleInterval<C> apply(final RandomAccessibleInterval<T> input, final long[] borderSize,
 			final Boolean fast, final C fftType, final ExecutorService es) {
 		// calculate the padded size
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java
index f1edd938f..d3c38b0d5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java
@@ -46,7 +46,6 @@
 @Plugin(type = Op.class, name = "filter.fftSize")
 public class ComputeFFTMethodsSize implements Functions.Arity3<Dimensions, Boolean, Boolean, long[][]> {
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -55,6 +54,7 @@ public class ComputeFFTMethodsSize implements Functions.Arity3<Dimensions, Boole
 	 * @param fast
 	 * @return the output
 	 */
+	@Override
 	public long[][] apply(Dimensions inputDimensions, Boolean forward, Boolean fast) {
 
 		long[][] size = new long[2][];
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java
index 24134353d..5e74db0b9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java
@@ -50,7 +50,6 @@
 @Plugin(type = Op.class, name = "filter.fftSize")
 public class ComputeFFTSize implements Functions.Arity5<Dimensions, long[], long[], Boolean, Boolean, Pair<long[], long[]>> {
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -61,6 +60,7 @@ public class ComputeFFTSize implements Functions.Arity5<Dimensions, long[], long
 	 * @param fast
 	 * @return the outputs
 	 */
+	@Override
 	public Pair<long[], long[]> apply(Dimensions inputDimensions, long[] paddedSize, long[] fftSize, Boolean forward,
 			Boolean fast) {
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java
index bd8a9db44..546cdae59 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java
@@ -49,7 +49,6 @@
 @Plugin(type = Op.class, name = "filter.fftSize")
 public class DefaultComputeFFTSize implements BiFunction<Dimensions, Boolean, long[][]> {
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -57,6 +56,7 @@ public class DefaultComputeFFTSize implements BiFunction<Dimensions, Boolean, lo
 	 * @param powerOfTwo
 	 * @return the outputSizes
 	 */
+	@Override
 	public long[][] apply(Dimensions inputDimensions, Boolean powerOfTwo) {
 
 		long[][] size = new long[2][];
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java
index a7232e360..dbbd9d6f7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java
@@ -64,13 +64,13 @@ public class HessianRAI<T extends RealType<T>>
 	@OpDependency(name = "create.img")
 	private Function<RandomAccessibleInterval<T>, RandomAccessibleInterval<T>> createRAI;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @return the output
 	 */
+	@Override
 	public CompositeIntervalView<T, RealComposite<T>> apply(RandomAccessibleInterval<T> input) {
 		List<RandomAccessibleInterval<T>> derivatives = new ArrayList<>();
 		for (int i = 0; i < input.numDimensions(); i++) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java
index 43db89f5a..2a652d3e1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java
@@ -64,7 +64,6 @@ public class IFFTMethodsOpC<C extends ComplexType<C>, T extends RealType<T>>
 	/**
 	 * Compute an ND inverse FFT
 	 */
-	@Override
 	/**
 	 * TODO
 	 *
@@ -72,6 +71,7 @@ public class IFFTMethodsOpC<C extends ComplexType<C>, T extends RealType<T>>
 	 * @param executorService
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<C> input, final ExecutorService es,
 			final RandomAccessibleInterval<T> output) {
 		if (!conforms(input))
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java
index 2ffe531b4..67975ed26 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java
@@ -56,13 +56,13 @@ public class IFFTMethodsOpI<C extends ComplexType<C>>
 	/**
 	 * Compute an ND inverse FFT
 	 */
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param executorService
 	 */
+	@Override
 	public void mutate(final RandomAccessibleInterval<C> inout, final ExecutorService es) {
 		if (!conforms(inout))
 			throw new IllegalArgumentException("The input size does not conform to a supported FFT size!");
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java
index b1d416aca..990e9593d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java
@@ -59,7 +59,6 @@ public class DefaultMaxFilter<T, V> implements
 	@OpDependency(name = "map.neighborhood")
 	private Computers.Arity3<RandomAccessibleInterval<T>, Shape, Computers.Arity1<Iterable<T>, V>, RandomAccessibleInterval<V>> mapper;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -68,6 +67,7 @@ public class DefaultMaxFilter<T, V> implements
 	 * @param outOfBoundsFactory
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<T> input, final Shape inputNeighborhoodShape,
 			final OutOfBoundsFactory<T, RandomAccessibleInterval<T>> outOfBoundsFactory,
 			final RandomAccessibleInterval<V> output) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java
index ae064f427..10ed9c8b0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java
@@ -59,7 +59,6 @@ public class DefaultMeanFilter<T, V> implements
 	@OpDependency(name = "map.neighborhood")
 	private Computers.Arity3<RandomAccessibleInterval<T>, Shape, Computers.Arity1<Iterable<T>, V>, RandomAccessibleInterval<V>> mapper;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -68,6 +67,7 @@ public class DefaultMeanFilter<T, V> implements
 	 * @param outOfBoundsFactory
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<T> input, final Shape inputNeighborhoodShape,
 			final OutOfBoundsFactory<T, RandomAccessibleInterval<T>> outOfBoundsFactory,
 			final RandomAccessibleInterval<V> output) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java
index a400f8b60..077bd7e0d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java
@@ -58,7 +58,6 @@ public class DefaultMedianFilter<T, V> implements
 	@OpDependency(name = "map.neighborhood")
 	private Computers.Arity3<RandomAccessibleInterval<T>, Shape, Computers.Arity1<Iterable<T>, V>, RandomAccessibleInterval<V>> mapper;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -67,6 +66,7 @@ public class DefaultMedianFilter<T, V> implements
 	 * @param outOfBoundsFactory
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<T> input, final Shape inputNeighborhoodShape,
 			final OutOfBoundsFactory<T, RandomAccessibleInterval<T>> outOfBoundsFactory,
 			final RandomAccessibleInterval<V> output) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java
index 20d930bd5..fb51c4ca2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java
@@ -58,7 +58,6 @@ public class DefaultMinFilter<T, V> implements
 	@OpDependency(name = "map.neighborhood")
 	private Computers.Arity3<RandomAccessibleInterval<T>, Shape, Computers.Arity1<Iterable<T>, V>, RandomAccessibleInterval<V>> mapper;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -67,6 +66,7 @@ public class DefaultMinFilter<T, V> implements
 	 * @param outOfBoundsFactory
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<T> input, final Shape inputNeighborhoodShape,
 			final OutOfBoundsFactory<T, RandomAccessibleInterval<T>> outOfBoundsFactory,
 			final RandomAccessibleInterval<V> output) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java
index 994ed2dd7..06b3a440f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java
@@ -61,7 +61,6 @@ public class DefaultSigmaFilter<T extends RealType<T>, V extends RealType<V>> im
 	@OpDependency(name = "map.neighborhood")
 	private Computers.Arity3<RandomAccessibleInterval<T>, Shape, Computers.Arity2<Iterable<T>, T, V>, RandomAccessibleInterval<V>> mapper;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -72,6 +71,7 @@ public class DefaultSigmaFilter<T extends RealType<T>, V extends RealType<V>> im
 	 * @param minPixelFraction
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<T> input, final Shape inputNeighborhoodShape,
 			OutOfBoundsFactory<T, RandomAccessibleInterval<T>> outOfBoundsFactory, final Double range,
 			final Double minPixelFraction, final RandomAccessibleInterval<V> output) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java
index a3631c753..7e264ce71 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java
@@ -68,13 +68,13 @@ public class SobelRAI<T extends RealType<T>>
 	@OpDependency(name = "filter.partialDerivative")
 	private Computers.Arity2<RandomAccessibleInterval<T>, Integer, RandomAccessibleInterval<T>> derivativeComputer;
 	
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void compute(RandomAccessibleInterval<T> input, RandomAccessibleInterval<T> output) {
 
 		for (int i = 0; i < input.numDimensions(); i++) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java
index d54c82665..b7bb1fbe6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java
@@ -110,7 +110,6 @@ public class DefaultTubeness<T extends RealType<T>> implements
 	@OpDependency(name = "project")
 	private Computers.Arity3<RandomAccessibleInterval<DoubleType>, Computers.Arity1<Iterable<DoubleType>, DoubleType>, Integer, IterableInterval<DoubleType>> projector;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -120,6 +119,7 @@ public class DefaultTubeness<T extends RealType<T>> implements
 	 * @param calibration
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<T> input, ExecutorService es, final Double sigma,
 			final double[] calibration, final IterableInterval<DoubleType> tubeness) {
 		cancelReason = null;
@@ -263,7 +263,6 @@ class DefaultTubenessWithoutCalibration<T extends RealType<T>> implements
 	@OpDependency(name = "filter.tubeness")
 	Computers.Arity4<RandomAccessibleInterval<T>, ExecutorService, Double, double[], IterableInterval<DoubleType>> tubenessOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -272,6 +271,7 @@ class DefaultTubenessWithoutCalibration<T extends RealType<T>> implements
 	 * @param sigma
 	 * @param output
 	 */
+	@Override
 	public void compute(RandomAccessibleInterval<T> in1, ExecutorService in2, Double in3,
 			IterableInterval<DoubleType> out) {
 		tubenessOp.compute(in1, in2, in3, new double[] {}, out);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java
index 44d1c361c..38f1ddc28 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java
@@ -59,7 +59,6 @@ public class DefaultVarianceFilter<T, V> implements
 	@OpDependency(name = "map.neighborhood")
 	private Computers.Arity3<RandomAccessibleInterval<T>, Shape, Computers.Arity1<Iterable<T>, V>, RandomAccessibleInterval<V>> mapper;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -68,6 +67,7 @@ public class DefaultVarianceFilter<T, V> implements
 	 * @param outOfBoundsFactory
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<T> input, final Shape inputNeighborhoodShape,
 			final OutOfBoundsFactory<T, RandomAccessibleInterval<T>> outOfBoundsFactory,
 			final RandomAccessibleInterval<V> output) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java
index e5201b554..5396469a5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java
@@ -97,7 +97,6 @@ private double derive(double val1, double val2, double distance) {
 		return ((val2 - val1) / distance);
 	}
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -106,6 +105,7 @@ private double derive(double val1, double val2, double distance) {
 	 * @param scale size of vessels to search for
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<T> input, final double[] spacing, final Integer scale,
 			final RandomAccessibleInterval<U> output) {
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java
index ef6b30bf3..71b8ee90c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java
@@ -48,13 +48,13 @@
 @Plugin(type = Op.class, name = "geom.centroid", priority = 1)
 public class CentroidII implements Function<IterableInterval<?>, RealLocalizable> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param centroid
 	 */
+	@Override
 	public RealLocalizable apply(final IterableInterval<?> input) {
 		int numDimensions = input.numDimensions();
 		double[] output = new double[numDimensions];
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java
index eda0cada7..55a0c0b54 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java
@@ -48,13 +48,13 @@
 @Plugin(type = Op.class, name = "geom.centroid", priority = 2)
 public class CentroidLabelRegion implements Function<LabelRegion<?>, RealLocalizable> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param centroid
 	 */
+	@Override
 	public RealLocalizable apply(final LabelRegion<?> input) {
 
 		return new RealPoint(input.getCenterOfMass());
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java
index bff839fbe..0c4b5d64b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java
@@ -54,13 +54,13 @@ public class CentroidMesh implements Function<Mesh, RealLocalizable> {
 	@OpDependency(name = "geom.size")
 	private Function<Mesh, DoubleType> sizeFunc;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param centroid
 	 */
+	@Override
 	public RealLocalizable apply(final Mesh input) {
 
 		double c_x = 0;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java
index d462fd635..06c73eb1b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java
@@ -52,13 +52,13 @@ public class CentroidPolygon implements Function<Polygon2D, RealLocalizable> {
 	@OpDependency(name = "geom.size")
 	private Function<Polygon2D, DoubleType> sizeFunc;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param centroid
 	 */
+	@Override
 	public RealLocalizable apply(final Polygon2D input) {
 
 		double area = sizeFunc.apply(input).get();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java
index dd6db8f7a..9146de1c1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java
@@ -51,13 +51,13 @@
 @Plugin(type = Op.class, name = "geom.centerOfGravity")
 public class DefaultCenterOfGravity<T extends RealType<T>> implements Function<IterableInterval<T>, RealLocalizable> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param centerOfGravity
 	 */
+	@Override
 	public RealLocalizable apply(final IterableInterval<T> input) {
 		final int numDimensions = input.numDimensions();
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java
index 99a7acf4d..14f7a89f5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java
@@ -47,13 +47,13 @@
 @Plugin(type = Op.class, name = "geom.size", label = "Geometric: Size", priority = Priority.VERY_HIGH)
 public class SizeII implements Function<IterableInterval<?>, DoubleType> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param size
 	 */
+	@Override
 	public DoubleType apply(IterableInterval<?> input) {
 		return new DoubleType(input.size());
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java
index 7725f76be..160bc096b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java
@@ -51,13 +51,13 @@
 @Plugin(type = Op.class, name = "geom.boundingBox")
 public class DefaultBoundingBox implements Function<Polygon2D, Polygon2D> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @return the output
 	 */
+	@Override
 	public Polygon2D apply(final Polygon2D input) {
 		double min_x = Double.POSITIVE_INFINITY;
 		double max_x = Double.NEGATIVE_INFINITY;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java
index c49630ce5..805a39497 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java
@@ -56,13 +56,13 @@ public class DefaultCircularity implements Computers.Arity1<Polygon2D, DoubleTyp
 	@OpDependency(name = "geom.boundarySize")
 	private Function<Polygon2D, DoubleType> perimeterFunc;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param circularity
 	 */
+	@Override
 	public void compute(Polygon2D input, DoubleType output) {
 		output.set(4 * Math.PI
 				* (areaFunc.apply(input).getRealDouble() / Math.pow(perimeterFunc.apply(input).getRealDouble(), 2)));
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java
index 292236d07..088022220 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java
@@ -182,7 +182,6 @@ public void backtrackSpecial() {
 		}
 	}
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -190,6 +189,7 @@ public void backtrackSpecial() {
 	 * @param useJacobs Set this flag to use refined Jacobs stopping criteria
 	 * @param contour
 	 */
+	@Override
 	public Polygon2D apply(final RandomAccessibleInterval<B> input, final Boolean useJacobs) {
 
 		// ensure validity of inputs
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java
index 61d58a0bd..5a977ae88 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java
@@ -52,13 +52,13 @@
 @Plugin(type = Op.class, name = "geom.convexHull")
 public class DefaultConvexHull2D implements Function<Polygon2D, Polygon2D> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param convexHull
 	 */
+	@Override
 	public Polygon2D apply(final Polygon2D input) {
 		// create a copy of points because se will get resorted, etc.
 		List<? extends RealLocalizable> RealPoints = new ArrayList<>(GeomUtils.vertices(input));
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java
index 86a05130f..5fc1b2545 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java
@@ -57,13 +57,13 @@ public class DefaultEccentricity implements Computers.Arity1<Polygon2D, DoubleTy
 	@OpDependency(name = "geom.majorAxis")
 	private Function<Polygon2D, DoubleType> majorAxisFunc;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param eccentricity
 	 */
+	@Override
 	public void compute(final Polygon2D input, final DoubleType output) {
 
 		final double a = majorAxisFunc.apply(input).get() / 2.0;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java
index c091841b9..0854fb55b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java
@@ -57,13 +57,13 @@ public class DefaultElongation implements Computers.Arity1<Polygon2D, DoubleType
 	@OpDependency(name = "geom.smallestEnclosingBoundingBox")
 	private Function<Polygon2D, Polygon2D> minimumBoundingBoxFunc;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param elongation
 	 */
+	@Override
 	public void compute(final Polygon2D input, final DoubleType output) {
 		final List<? extends RealLocalizable> minBB = GeomUtils.vertices(minimumBoundingBoxFunc.apply(input));
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java
index 845103423..dad25f7c8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java
@@ -47,13 +47,13 @@
 @Plugin(type = Op.class, name = "geom.feretsAngle", label = "Geometric (2D): Ferets Angle")
 public class DefaultFeretsAngle implements Computers.Arity1<Pair<RealLocalizable, RealLocalizable>, DoubleType> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param points
 	 * @param feretsAngle
 	 */
+	@Override
 	public void compute(final Pair<RealLocalizable, RealLocalizable> input, final DoubleType output) {
 
 		final RealLocalizable p1 = input.getA();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java
index ae51246c8..8d3f17d8e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java
@@ -47,13 +47,13 @@
 @Plugin(type = Op.class, name = "geom.feretsDiameter", label = "Geometric (2D): Ferets Diameter")
 public class DefaultFeretsDiameter implements Computers.Arity1<Pair<RealLocalizable, RealLocalizable>, DoubleType> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param points
 	 * @param feretsDiameter
 	 */
+	@Override
 	public void compute(final Pair<RealLocalizable, RealLocalizable> input, final DoubleType output) {
 
 		final RealLocalizable p1 = input.getA();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java
index 534f10366..6a672fd27 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java
@@ -55,7 +55,6 @@ public class DefaultFeretsDiameterForAngle implements Computers.Arity2<Polygon2D
 	@OpDependency(name = "geom.convexHull")
 	private Function<Polygon2D, Polygon2D> function;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -63,6 +62,7 @@ public class DefaultFeretsDiameterForAngle implements Computers.Arity2<Polygon2D
 	 * @param angle
 	 * @param feretsDiameter
 	 */
+	@Override
 	public void compute(Polygon2D input, final Double angle, DoubleType output) {
 		final List<? extends RealLocalizable> points = GeomUtils.vertices(function.apply(input));
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java
index 71df6e048..681d9d0e7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java
@@ -53,13 +53,13 @@ public class DefaultMajorAxis implements Computers.Arity1<Polygon2D, DoubleType>
 	@OpDependency(name = "geom.secondMoment")
 	private Function<Polygon2D, Pair<DoubleType, DoubleType>> minorMajorAxisFunc;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param majorAxis
 	 */
+	@Override
 	public void compute(final Polygon2D input, final DoubleType output) {
 		output.set(minorMajorAxisFunc.apply(input).getB());
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java
index 12cae7e8c..a5407f481 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java
@@ -54,13 +54,13 @@ public class DefaultMaximumFeret implements Function<Polygon2D, Pair<RealLocaliz
 	@OpDependency(name = "geom.convexHull")
 	private Function<Polygon2D, Polygon2D> function;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param maximumFeret
 	 */
+	@Override
 	public Pair<RealLocalizable, RealLocalizable> apply(Polygon2D input) {
 		final List<? extends RealLocalizable> points = GeomUtils.vertices(function.apply(input));
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java
index 943865fed..97148e5fa 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java
@@ -50,13 +50,13 @@ public class DefaultMaximumFeretAngle implements Computers.Arity1<Polygon2D, Dou
 	@OpDependency(name = "geom.feretsAngle")
 	private Function<Pair<RealLocalizable, RealLocalizable>, DoubleType> feretAngle;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param maxFeretsAngle
 	 */
+	@Override
 	public void compute(Polygon2D input, DoubleType output) {
 		output.set(feretAngle.apply(maxFeret.apply(input)).get());
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java
index c08626018..50dc0c48a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java
@@ -50,13 +50,13 @@ public class DefaultMaximumFeretDiameter implements Computers.Arity1<Polygon2D,
 	@OpDependency(name = "geom.feretsDiameter")
 	private Function<Pair<RealLocalizable, RealLocalizable>, DoubleType> feretDiameter;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param maxFeretsDiameter
 	 */
+	@Override
 	public void compute(Polygon2D input, DoubleType output) {
 		output.set(feretDiameter.apply(maxFeret.apply(input)).get());
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java
index edafbcf62..64c94dbc7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java
@@ -57,13 +57,13 @@ public class DefaultMinimumFeret implements Function<Polygon2D, Pair<RealLocaliz
 	@OpDependency(name = "geom.convexHull")
 	private Function<Polygon2D, Polygon2D> function;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param minFeret
 	 */
+	@Override
 	public Pair<RealLocalizable, RealLocalizable> apply(Polygon2D input) {
 		final List<? extends RealLocalizable> points = GeomUtils.vertices(function.apply(input));
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java
index 8208a967d..d06780dba 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java
@@ -50,13 +50,13 @@ public class DefaultMinimumFeretAngle implements Computers.Arity1<Polygon2D, Dou
 	@OpDependency(name = "geom.feretsAngle")
 	private Function<Pair<RealLocalizable, RealLocalizable>, DoubleType> feretAngle;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param minFeretAngle
 	 */
+	@Override
 	public void compute(Polygon2D input, DoubleType output) {
 		output.set(feretAngle.apply(minFeret.apply(input)).get());
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java
index 425118f0c..0d6ffce4d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java
@@ -50,13 +50,13 @@ public class DefaultMinimumFeretDiameter implements Computers.Arity1<Polygon2D,
 	@OpDependency(name = "geom.feretsDiameter")
 	private Function<Pair<RealLocalizable, RealLocalizable>, DoubleType> feretDiameter;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param minFeretDiameter
 	 */
+	@Override
 	public void compute(Polygon2D input, DoubleType output) {
 		output.set(feretDiameter.apply(minFeret.apply(input)).get());
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java
index 2e9b7b550..122b95a90 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java
@@ -53,13 +53,13 @@ public class DefaultMinorAxis implements Computers.Arity1<Polygon2D, DoubleType>
 	@OpDependency(name = "geom.secondMoment")
 	private Function<Polygon2D, Pair<DoubleType, DoubleType>> minorMajorAxisFunc;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param minorAxis
 	 */
+	@Override
 	public void compute(final Polygon2D input, final DoubleType output) {
 		output.set(minorMajorAxisFunc.apply(input).getA());
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java
index 3b4656c37..706648198 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java
@@ -189,13 +189,13 @@ private double getX(final Polygon2D input, final int index) {
 		return input.vertex(i).getDoublePosition(0);
 	}
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param minorMajorAxisPair
 	 */
+	@Override
 	public Pair<DoubleType, DoubleType> apply(final Polygon2D input) {
 		
 		List<RealLocalizable> points = new ArrayList<>(GeomUtils.vertices(input));
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java
index 0bf9bca42..30d3a4771 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java
@@ -50,13 +50,13 @@
 @Plugin(type = Op.class, name = "geom.boundarySize", label = "Geometric (2D): Perimeter")
 public class DefaultPerimeterLength implements Computers.Arity1<Polygon2D, DoubleType> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param boundarySize
 	 */
+	@Override
 	public void compute(final Polygon2D input, final DoubleType output) {
 		double perimeter = 0;
 		final List<? extends RealLocalizable> vertices = GeomUtils.vertices(input);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java
index 34d761b11..22a0ba094 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java
@@ -56,13 +56,13 @@ public class DefaultRoundness implements Computers.Arity1<Polygon2D, DoubleType>
 	@OpDependency(name = "geom.majorAxis")
 	private Function<Polygon2D, DoubleType> majorAxisFunc;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param roundness
 	 */
+	@Override
 	public void compute(final Polygon2D input, final DoubleType output) {
 		output.set(4 * (areaFunc.apply(input).getRealDouble()
 				/ (Math.PI * Math.pow(majorAxisFunc.apply(input).getRealDouble(), 2))));
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java
index 4a3a9cbd4..5280b2771 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java
@@ -50,13 +50,13 @@
 @Plugin(type = Op.class, name = "geom.size", label = "Geometric (2D): Size", priority = Priority.VERY_HIGH - 1)
 public class DefaultSizePolygon implements Computers.Arity1<Polygon2D, DoubleType> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param size
 	 */
+	@Override
 	public void compute(Polygon2D input, DoubleType output) {
 		double sum = 0;
 		final int numVertices = input.numVertices();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java
index bef513772..bce3748fc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java
@@ -98,13 +98,13 @@ private Polygon2D rotate(final Polygon2D inPoly, final double angle, final RealL
 		return new DefaultWritablePolygon2D(out);
 	}
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param smallestEnclosingBoundingBox
 	 */
+	@Override
 	public Polygon2D apply(final Polygon2D input) {
 		// ensure validity of inputs
 		if (input == null)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java
index e4140e520..39fe3d872 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java
@@ -51,13 +51,13 @@ public class DefaultVerticesCountConvexHullPolygon implements Computers.Arity1<P
 	@OpDependency(name = "geom.convexHull")
 	private Function<Polygon2D, Polygon2D> convexHullFunc;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param verticesCountConvexHull
 	 */
+	@Override
 	public void compute(Polygon2D input, DoubleType output) {
 		output.set(convexHullFunc.apply(input).numVertices());
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java
index 3bdd5df34..d4ffe4ca7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java
@@ -45,13 +45,13 @@
 @Plugin(type = Op.class, name = "geom.verticesCount", label = "Geometric (2D): Convex Hull Vertices Count", priority = Priority.VERY_HIGH)
 public class DefaultVerticesCountPolygon implements Computers.Arity1<Polygon2D, DoubleType> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param verticesCount
 	 */
+	@Override
 	public void compute(Polygon2D input, DoubleType output) {
 		output.set(input.numVertices());
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java
index e304f4a10..845297696 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java
@@ -62,13 +62,13 @@ public class DefaultCompactness implements Computers.Arity1<Mesh, DoubleType> {
 	@OpDependency(name = "geom.size")
 	private Function<Mesh, DoubleType> volume;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param compactness
 	 */
+	@Override
 	public void compute(final Mesh input, final DoubleType output) {
 		final double s3 = Math.pow(surfaceArea.apply(input).get(), 3);
 		final double v2 = Math.pow(volume.apply(input).get(), 2);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java
index 31688f066..bff3e801d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java
@@ -77,13 +77,13 @@ public class DefaultConvexHull3D implements Function<Mesh, Mesh>
 //		return epsilon;
 //	}
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param convexHull
 	 */
+	@Override
 	public Mesh apply(final Mesh input) {
 		Mesh output = new NaiveDoubleMesh();
 		Set<Vertex> vertices = new LinkedHashSet<>();
@@ -618,13 +618,13 @@ else if (v.getZ() < minZ) {
 class DefaultConvexHull3DEpsilon implements Function<Mesh, Double>
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param epsilon
 	 */
+	@Override
 	public Double apply(final Mesh input) {
 		Set<Vertex> vertices = new LinkedHashSet<>();
 		for (final net.imagej.mesh.Vertex v : input.vertices()) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java
index 1c1a7e95a..eb3cf3f11 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java
@@ -57,13 +57,13 @@ public class DefaultInertiaTensor3D<B extends BooleanType<B>> implements Functio
 	@OpDependency(name = "geom.centroid")
 	private Function<IterableRegion<B>, RealLocalizable> centroid;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableRegion
 	 * @param inertiaTensor
 	 */
+	@Override
 	public RealMatrix apply(final IterableRegion<B> input) {
 		// ensure validity of inputs
 		if (input.numDimensions() != 3)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java
index f6859891c..986257a9a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java
@@ -54,13 +54,13 @@ public class DefaultInertiaTensor3DMesh implements Function<Mesh, RealMatrix> {
 	@OpDependency(name = "geom.centroid")
 	private Function<Mesh, RealLocalizable> centroid;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param inertiaTensor
 	 */
+	@Override
 	public RealMatrix apply(final Mesh input) {
 		// ensure validity of inputs
 		if (input == null)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java
index 90af474be..fd9ac6c3b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java
@@ -58,13 +58,13 @@ public class DefaultMainElongation implements Computers.Arity1<Mesh, DoubleType>
 	@OpDependency(name = "geom.secondMoment")
 	private Function<Mesh, RealMatrix> inertiaTensor;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param inputMesh
 	 * @param output
 	 */
+	@Override
 	public void compute(final Mesh input, final DoubleType output) {
 		final RealMatrix it = inertiaTensor.apply(input);
 		final EigenDecomposition ed = new EigenDecomposition(it);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java
index 54a6b298e..512bc1b17 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java
@@ -71,7 +71,6 @@ public class DefaultMarchingCubes<T extends BooleanType<T>>
 	private VertexInterpolator interpolatorClass;
 
 	@SuppressWarnings({ "unchecked" })
-	@Override
 	/**
 	 * TODO
 	 *
@@ -80,6 +79,7 @@ public class DefaultMarchingCubes<T extends BooleanType<T>>
 	 * @param interpolatorClass
 	 * @return the output
 	 */
+	@Override
 	public Mesh apply(final RandomAccessibleInterval<T> input, Double isolevel, VertexInterpolator interpolatorClass) {
 
 		// ensure validity of inputs
@@ -567,13 +567,13 @@ class SimpleMarchingCubes<T extends BooleanType<T>>
 	@OpDependency(name = "geom.marchingCubes")
 	private Functions.Arity3<RandomAccessibleInterval<T>, Double, VertexInterpolator, Mesh> marchingOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @return the output
 	 */
+	@Override
 	public Mesh apply(RandomAccessibleInterval<T> t) {
 		return marchingOp.apply(t, null, null);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java
index a9cc3e99b..844a0ee2a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java
@@ -59,13 +59,13 @@ public class DefaultMedianElongation implements Computers.Arity1<Mesh, DoubleTyp
 	@OpDependency(name = "geom.secondMoment")
 	private Function<Mesh, RealMatrix> inertiaTensor;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param medianElongation
 	 */
+	@Override
 	public void compute(final Mesh input, final DoubleType output) {
 		final RealMatrix it = inertiaTensor.apply(input);
 		final EigenDecomposition ed = new EigenDecomposition(it);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java
index 6af1fab97..a2d1524b0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java
@@ -60,13 +60,13 @@ public class DefaultSparenessMesh implements Computers.Arity1<Mesh, DoubleType>
 	@OpDependency(name = "geom.size")
 	private Function<Mesh, DoubleType> volume;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param spareness
 	 */
+	@Override
 	public void compute(final Mesh input, final DoubleType output) {
 
 		final RealMatrix it = inertiaTensor.apply(input);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java
index 0ee6f52ae..fc7927059 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java
@@ -57,13 +57,13 @@ public class DefaultSphericity implements Computers.Arity1<Mesh, DoubleType> {
 	@OpDependency(name = "geom.boundarySize")
 	private Function<Mesh, DoubleType> areaFunc;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param sphericity
 	 */
+	@Override
 	public void compute(final Mesh input, final DoubleType output) {
 		final double sphereArea = Math.pow(Math.PI, 1 / 3d) * Math.pow(6 * volumeFunc.apply(input).get(), 2 / 3d);
 		output.set(sphereArea / areaFunc.apply(input).get());
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java
index 789217db3..2385cd0eb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java
@@ -49,13 +49,13 @@
 @Plugin(type = Op.class, name = "geom.boundarySize", label = "Geometric (3D): Surface Area", priority = Priority.VERY_HIGH)
 public class DefaultSurfaceArea implements Computers.Arity1<Mesh, DoubleType> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param boundarySize
 	 */
+	@Override
 	public void compute(final Mesh input, final DoubleType output) {
 		double total = 0;
 		for (final Triangle tri : input.triangles()) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java
index ae8b991cf..e0bd855b3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java
@@ -51,13 +51,13 @@ public class DefaultVerticesCountConvexHullMesh implements Computers.Arity1<Mesh
 	@OpDependency(name = "geom.convexHull")
 	private Function<Mesh, Mesh> convexHullFunc;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param verticesCountConvexHull
 	 */
+	@Override
 	public void compute(final Mesh input, final DoubleType output) {
 		output.set(convexHullFunc.apply(input).vertices().size());
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java
index fc0ab8edf..98bc6bee8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java
@@ -47,13 +47,13 @@
 @Plugin(type = Op.class, name = "geom.verticesCount", label = "Geometric3D: Surface Vertices Count", priority = Priority.VERY_HIGH)
 public class DefaultVerticesCountMesh implements Computers.Arity1<Mesh, DoubleType> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param verticesCountMesh
 	 */
+	@Override
 	public void compute(final Mesh input, final DoubleType output) {
 		output.set(input.vertices().size());
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java
index dcce7af60..aedf70b46 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java
@@ -48,13 +48,13 @@
 @Plugin(type = Op.class, name = "geom.size", label = "Geometric3D: Volume", priority = Priority.VERY_HIGH - 1)
 public class DefaultVolumeMesh implements Function<Mesh, DoubleType> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param volume
 	 */
+	@Override
 	public DoubleType apply(final Mesh input) {
 		double volume = 0;
 		for (final Triangle triangle : input.triangles()) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java
index 0f1b0410b..76c499d8f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java
@@ -78,7 +78,6 @@ public class DefaultVoxelization3D
 	@OpDependency(name = "create.img")
 	private BiFunction<Dimensions, BitType, Img<BitType>> imgCreator;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -88,6 +87,7 @@ public class DefaultVoxelization3D
 	 * @param depth
 	 * @param voxelizedImage
 	 */
+	@Override
 	public RandomAccessibleInterval<BitType> apply(Mesh input, Integer width, Integer height, Integer depth) {
 		if (width == null)
 			width = 10;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java
index 6523d677e..1a89e571c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java
@@ -44,12 +44,12 @@
 public class DefaultIdentity<A> implements Inplaces.Arity1<A>
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param io
 	 */
+	@Override
 	public void mutate(final A input) {
 		// NB: No implementation needed.
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java
index 32a74f012..434563103 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java
@@ -60,7 +60,6 @@ public class DefaultASCII<T extends RealType<T>> implements Functions.Arity3<Ite
 	@OpDependency(name = "stats.minMax")
 	private Function<IterableInterval<T>, Pair<T, T>> minMaxFunc;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -69,6 +68,7 @@ public class DefaultASCII<T extends RealType<T>> implements Functions.Arity3<Ite
 	 * @param max
 	 * @param ASCIIArt
 	 */
+	@Override
 	public String apply(final IterableInterval<T> input, T min, T max) {
 		if (min == null || max == null) {
 			final Pair<T, T> minMax = minMaxFunc.apply(input);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java
index c4b6886a3..a03ecdf4b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java
@@ -28,7 +28,6 @@ public class CooccurrenceMatrix<T extends RealType<T>>
 	@OpDependency(name = "stats.minMax")
 	private Function<RandomAccessibleInterval<T>, Pair<T, T>> minmax;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -38,6 +37,7 @@ public class CooccurrenceMatrix<T extends RealType<T>>
 	 * @param matrixOrientation
 	 * @param cooccurrenceMatrix
 	 */
+	@Override
 	public double[][] apply(RandomAccessibleInterval<T> input, Integer nrGreyLevels, Integer distance,
 			MatrixOrientation orientation) {
 		if (input.numDimensions() == 3 && orientation.isCompatible(3)) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java
index e81e4defb..f44e80a31 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java
@@ -58,7 +58,6 @@
 public class CalibratedDistanceTransformer<B extends BooleanType<B>, T extends RealType<T>>
 		implements Computers.Arity3<RandomAccessibleInterval<B>, double[], ExecutorService, RandomAccessibleInterval<T>> {
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -67,6 +66,7 @@ public class CalibratedDistanceTransformer<B extends BooleanType<B>, T extends R
 	 * @param executorService
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<B> in, final double[] calibration, final ExecutorService es,
 			final RandomAccessibleInterval<T> out) {
 		// make sure that the output type is suitable to be able to hold the maximum
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java
index b5dc5c614..9c2621d74 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java
@@ -311,7 +311,6 @@ public Void call() throws Exception {
 @Plugin(type = Op.class, name = "image.distanceTransform", priority = Priority.LAST)
 class DefaultDistanceTransformCalibrationOp <B extends BooleanType<B>, T extends RealType<T>>implements Computers.Arity3<RandomAccessibleInterval<B>, double[], ExecutorService, RandomAccessibleInterval<T>>{
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -320,6 +319,7 @@ class DefaultDistanceTransformCalibrationOp <B extends BooleanType<B>, T extends
 	 * @param executorService
 	 * @param output
 	 */
+	@Override
 	public void compute(RandomAccessibleInterval<B> in, double[] calibration, ExecutorService es,
 			RandomAccessibleInterval<T> out) {
 		DefaultDistanceTransformCalibration.compute(in, calibration, es, out);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java
index 12e9bae69..111de63bb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java
@@ -56,7 +56,6 @@
 public class DistanceTransformer<B extends BooleanType<B>, T extends RealType<T>>
 		implements Computers.Arity2<RandomAccessibleInterval<B>, ExecutorService, RandomAccessibleInterval<T>> {
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -64,6 +63,7 @@ public class DistanceTransformer<B extends BooleanType<B>, T extends RealType<T>
 	 * @param executorService
 	 * @param output
 	 */
+	@Override
 	public void compute(RandomAccessibleInterval<B> in, ExecutorService es, RandomAccessibleInterval<T> out) {
 		// make sure that the output type is suitable to be able to hold the maximum
 		// possible distance (replaces Conforms)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java
index da830a5d6..6fb758609 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java
@@ -52,13 +52,13 @@
 public class DefaultCoordinatesEquation<T extends RealType<T>, N extends Number>
 		implements Computers.Arity1<Function<long[], N>, IterableInterval<T>> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param op
 	 * @param output
 	 */
+	@Override
 	public void compute(final Function<long[], N> op, final IterableInterval<T> output) {
 
 		final Cursor<T> c = output.localizingCursor();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java
index 6a99f2cf3..90f08d920 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java
@@ -68,7 +68,6 @@ public class DefaultEquation<T extends RealType<T>> implements
 	Computers.Arity2<String, ScriptService, IterableInterval<T>> 
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -76,6 +75,7 @@ public class DefaultEquation<T extends RealType<T>> implements
 	 * @param scriptService
 	 * @param output
 	 */
+	@Override
 	public void compute(final String input, final ScriptService scriptService, final IterableInterval<T> output) {
 		final String equation = input + ";";
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java
index d511eaafd..4530d4116 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java
@@ -51,13 +51,13 @@ public class DefaultFill<T extends Type<T>> implements
 {
 
 	//TODO can we find a way to parallelize this (or use lift?)
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param constant
 	 * @param iterableOutput
 	 */
+	@Override
 	public void compute(final T constant, final Iterable<T> output) {
 		Iterator<T> iterator = output.iterator();
 		while(iterator.hasNext()) iterator.next().set(constant);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java
index d6c7f5407..d28c5f67b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java
@@ -54,7 +54,6 @@ public class HistogramCreate<T extends RealType<T>> implements BiFunction<Iterab
 	@OpDependency(name = "stats.minMax")
 	private Function<Iterable<T>, Pair<T, T>> minMaxFunc;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -62,6 +61,7 @@ public class HistogramCreate<T extends RealType<T>> implements BiFunction<Iterab
 	 * @param numBins
 	 * @param histogram
 	 */
+	@Override
 	public Histogram1d<T> apply(final Iterable<T> input, Integer numBins) {
 		if (numBins == null)
 			numBins = DEFAULT_NUM_BINS;
@@ -84,13 +84,13 @@ class HistogramCreateSimple<T extends RealType<T>> implements Function<Iterable<
 	@OpDependency(name = "image.histogram")
 	private BiFunction<Iterable<T>, Integer, Histogram1d<T>> histogramOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterable
 	 * @param histogram
 	 */
+	@Override
 	public Histogram1d<T> apply(final Iterable<T> input) {
 		return histogramOp.apply(input, null);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java
index 77f9f8ef3..c9d465f86 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java
@@ -56,13 +56,13 @@ public class WrappedIntegralImg<I extends RealType<I>>
 
 	private IntegralImg<I, DoubleType> integralImg;
 
-	@Override
 		/**
 		 * TODO
 		 *
 		 * @param input
 		 * @return the output
 		 */
+	@Override
 	public RandomAccessibleInterval<DoubleType> apply(
 		final RandomAccessibleInterval<I> input)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java
index a684c4575..6fe2019f0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java
@@ -84,7 +84,6 @@ private double[] getBounds(final RandomAccessibleInterval<I> input, final I sour
 		return result;
 	}
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -95,6 +94,7 @@ private double[] getBounds(final RandomAccessibleInterval<I> input, final I sour
 	 * @param targetMax
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<I> input, final I sourceMin, final I sourceMax, final O targetMin,
 			final O targetMax, final RandomAccessibleInterval<O> output) {
 		normalizer = new NormalizeRealTypeComputer<>();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java
index 5680dfed3..3fda9fc3b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java
@@ -63,7 +63,6 @@ public class NormalizeIIFunction<I extends RealType<I>, O extends RealType<O>>
 	@OpDependency(name = "image.normalize")
 	private Computers.Arity5<RandomAccessibleInterval<I>, I, I, O, O, RandomAccessibleInterval<O>> normalizer;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -74,6 +73,7 @@ public class NormalizeIIFunction<I extends RealType<I>, O extends RealType<O>>
 	 * @param targetMax
 	 * @return the output
 	 */
+	@Override
 	public RandomAccessibleInterval<O> apply(
 		final RandomAccessibleInterval<I> input, final I sourceMin,
 		final I sourceMax, final O targetMin, final O targetMax)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java
index 105ebb564..3b83a7fc2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java
@@ -64,13 +64,13 @@ public class NormalizeIILazy<I extends RealType<I>, O extends RealType<O>>
 	@OpDependency(name = "image.normalize")
 	private Computers.Arity5<RandomAccessibleInterval<I>, I, I, O, O, RandomAccessibleInterval<O>> normalizerFunc;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void compute(RandomAccessibleInterval<I> img, RandomAccessibleInterval<O> output) {
 		Pair<I, I> sourceMinMax = minMaxFunc.apply(img);
 		O min = Util.getTypeFromInterval(output).createVariable();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java
index 6e9d7b4cf..f2fe78e5b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java
@@ -62,13 +62,13 @@ public class NormalizeIILazyFunction<I extends RealType<I>>
 	@OpDependency(name = "image.normalize")
 	private Computers.Arity1<RandomAccessibleInterval<I>, RandomAccessibleInterval<I>> normalizer;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @return the output
 	 */
+	@Override
 	public RandomAccessibleInterval<I> apply(RandomAccessibleInterval<I> img) {
 		RandomAccessibleInterval<I> output = createFunc.apply(img);
 		normalizer.compute(img, output);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java
index dea651b68..e4ee6293b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java
@@ -111,7 +111,6 @@ public class Watershed<T extends RealType<T>, B extends BooleanType<B>> implemen
 	/** Default label for mask */
 	private static final int MASK = -3;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -121,6 +120,7 @@ public class Watershed<T extends RealType<T>, B extends BooleanType<B>> implemen
 	 * @param mask
 	 * @param outputLabeling
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<T> in, final Boolean useEightConnectivity,
 			final Boolean drawWatersheds, final RandomAccessibleInterval<B> mask,
 			final ImgLabeling<Integer, IntType> out) {
@@ -395,7 +395,6 @@ class WatershedMaskless<T extends RealType<T>, B extends BooleanType<B>> impleme
 	@OpDependency(name = "image.watershed")
 	private Computers.Arity4<RandomAccessibleInterval<T>, Boolean, Boolean, RandomAccessibleInterval<B>, ImgLabeling<Integer, IntType>> watershedOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -404,6 +403,7 @@ class WatershedMaskless<T extends RealType<T>, B extends BooleanType<B>> impleme
 	 * @param drawWatersheds
 	 * @param outputLabeling
 	 */
+	@Override
 	public void compute(RandomAccessibleInterval<T> in, Boolean useEightConnectivity, Boolean drawWatersheds,
 			ImgLabeling<Integer, IntType> outputLabeling) {
 		watershedOp.compute(in, useEightConnectivity, drawWatersheds, null, outputLabeling);
@@ -420,7 +420,6 @@ class WatershedFunction<T extends RealType<T>, B extends BooleanType<B>>
 	@OpDependency(name = "create.imgLabeling")
 	private BiFunction<Dimensions, IntType, ImgLabeling<Integer, IntType>> labelingCreator;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -430,6 +429,7 @@ class WatershedFunction<T extends RealType<T>, B extends BooleanType<B>>
 	 * @param mask
 	 * @return the outputLabeling
 	 */
+	@Override
 	public ImgLabeling<Integer, IntType> apply(RandomAccessibleInterval<T> in, Boolean useEightConnectivity,
 			Boolean drawWatersheds, RandomAccessibleInterval<B> mask) {
 		ImgLabeling<Integer, IntType> outputLabeling = labelingCreator.apply(in, new IntType());
@@ -447,7 +447,6 @@ class WatershedFunctionMaskless<T extends RealType<T>, B extends BooleanType<B>>
 	@OpDependency(name = "create.imgLabeling")
 	private BiFunction<Dimensions, IntType, ImgLabeling<Integer, IntType>> labelingCreator;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -456,6 +455,7 @@ class WatershedFunctionMaskless<T extends RealType<T>, B extends BooleanType<B>>
 	 * @param drawWatersheds
 	 * @return the outputLabeling
 	 */
+	@Override
 	public ImgLabeling<Integer, IntType> apply(RandomAccessibleInterval<T> in, Boolean useEightConnectivity,
 			Boolean drawWatersheds) {
 		ImgLabeling<Integer, IntType> outputLabeling = labelingCreator.apply(in, new IntType());
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java
index 481bde7c9..223e055ad 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java
@@ -101,7 +101,6 @@ public class WatershedBinary<T extends BooleanType<T>, B extends BooleanType<B>>
 	@OpDependency(name = "image.watershed")
 	private Computers.Arity4<RandomAccessibleInterval<FloatType>, Boolean, Boolean, RandomAccessibleInterval<B>, ImgLabeling<Integer, IntType>> watershedOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -113,6 +112,7 @@ public class WatershedBinary<T extends BooleanType<T>, B extends BooleanType<B>>
 	 * @param executorService
 	 * @param outputLabeling
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<T> in, final Boolean useEightConnectivity,
 			final Boolean drawWatersheds, final double[] sigma, final RandomAccessibleInterval<B> mask,
 			final ExecutorService es, final ImgLabeling<Integer, IntType> out) {
@@ -151,7 +151,6 @@ class WatershedBinaryMaskless<T extends BooleanType<T>, B extends BooleanType<B>
 	@OpDependency(name = "image.watershed")
 	private Computers.Arity6<RandomAccessibleInterval<T>, Boolean, Boolean, double[], RandomAccessibleInterval<B>, ExecutorService, ImgLabeling<Integer, IntType>> watershedOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -162,6 +161,7 @@ class WatershedBinaryMaskless<T extends BooleanType<T>, B extends BooleanType<B>
 	 * @param executorService
 	 * @param outputLabeling
 	 */
+	@Override
 	public void compute(RandomAccessibleInterval<T> in, Boolean useEightConnectivity, Boolean drawWatersheds,
 			double[] sigma, ExecutorService es, ImgLabeling<Integer, IntType> outputLabeling) {
 		watershedOp.compute(in, useEightConnectivity, drawWatersheds, sigma, null, es, outputLabeling);
@@ -178,7 +178,6 @@ class WatershedBinaryFunction<T extends BooleanType<T>, B extends BooleanType<B>
 	@OpDependency(name = "create.imgLabeling")
 	private BiFunction<Dimensions, IntType, ImgLabeling<Integer, IntType>> labelingCreator;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -190,6 +189,7 @@ class WatershedBinaryFunction<T extends BooleanType<T>, B extends BooleanType<B>
 	 * @param executorService
 	 * @return the outputLabeling
 	 */
+	@Override
 	public ImgLabeling<Integer, IntType> apply(RandomAccessibleInterval<T> in, Boolean useEightConnectivity,
 			Boolean drawWatersheds, double[] sigma, RandomAccessibleInterval<B> mask, ExecutorService es) {
 		ImgLabeling<Integer, IntType> outputLabeling = labelingCreator.apply(in, new IntType());
@@ -207,7 +207,6 @@ class WatershedBinaryFunctionMaskless<T extends BooleanType<T>, B extends Boolea
 	@OpDependency(name = "create.imgLabeling")
 	private BiFunction<Dimensions, IntType, ImgLabeling<Integer, IntType>> labelingCreator;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -218,6 +217,7 @@ class WatershedBinaryFunctionMaskless<T extends BooleanType<T>, B extends Boolea
 	 * @param executorService
 	 * @return the outputLabeling
 	 */
+	@Override
 	public ImgLabeling<Integer, IntType> apply(RandomAccessibleInterval<T> in, Boolean useEightConnectivity,
 			Boolean drawWatersheds, double[] sigma, ExecutorService es) {
 		ImgLabeling<Integer, IntType> outputLabeling = labelingCreator.apply(in, new IntType());
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java
index d41a60baa..7c7d0efe5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java
@@ -100,7 +100,6 @@ public class WatershedBinarySingleSigma<T extends BooleanType<T>, B extends Bool
 	@OpDependency(name = "image.watershed")
 	private Computers.Arity4<RandomAccessibleInterval<FloatType>, Boolean, Boolean, RandomAccessibleInterval<B>, ImgLabeling<Integer, IntType>> watershedOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -112,6 +111,7 @@ public class WatershedBinarySingleSigma<T extends BooleanType<T>, B extends Bool
 	 * @param executorService
 	 * @param outputLabeling
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<T> in, final Boolean useEightConnectivity,
 			final Boolean drawWatersheds, final Double sigma, final RandomAccessibleInterval<B> mask,
 			final ExecutorService es, final ImgLabeling<Integer, IntType> out) {
@@ -146,7 +146,6 @@ class WatershedBinarySingleSigmaMaskless<T extends RealType<T>, B extends Boolea
 	@OpDependency(name = "image.watershed")
 	private Computers.Arity6<RandomAccessibleInterval<T>, Boolean, Boolean, Double, RandomAccessibleInterval<B>, ExecutorService, ImgLabeling<Integer, IntType>> watershedOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -157,6 +156,7 @@ class WatershedBinarySingleSigmaMaskless<T extends RealType<T>, B extends Boolea
 	 * @param executorService
 	 * @param outputLabeling
 	 */
+	@Override
 	public void compute(RandomAccessibleInterval<T> in, Boolean useEightConnectivity, Boolean drawWatersheds,
 			Double sigma, ExecutorService es, ImgLabeling<Integer, IntType> outputLabeling) {
 		watershedOp.compute(in, useEightConnectivity, drawWatersheds, sigma, null, es, outputLabeling);
@@ -173,7 +173,6 @@ class WatershedBinarySingleSigmaFunction<T extends RealType<T>, B extends Boolea
 	@OpDependency(name = "create.imgLabeling")
 	private BiFunction<Dimensions, IntType, ImgLabeling<Integer, IntType>> labelingCreator;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -185,6 +184,7 @@ class WatershedBinarySingleSigmaFunction<T extends RealType<T>, B extends Boolea
 	 * @param executorService
 	 * @return the outputLabeling
 	 */
+	@Override
 	public ImgLabeling<Integer, IntType> apply(RandomAccessibleInterval<T> in, Boolean useEightConnectivity, Boolean drawWatersheds,
 			Double sigma, RandomAccessibleInterval<B> mask, ExecutorService es) {
 		ImgLabeling<Integer, IntType> outputLabeling = labelingCreator.apply(in, new IntType());
@@ -202,7 +202,6 @@ class WatershedBinarySigngleSigmaFunctionMaskless<T extends RealType<T>, B exten
 	@OpDependency(name = "create.imgLabeling")
 	private BiFunction<Dimensions, IntType, ImgLabeling<Integer, IntType>> labelingCreator;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -213,6 +212,7 @@ class WatershedBinarySigngleSigmaFunctionMaskless<T extends RealType<T>, B exten
 	 * @param executorService
 	 * @return the outputLabeling
 	 */
+	@Override
 	public ImgLabeling<Integer, IntType> apply(RandomAccessibleInterval<T> in, Boolean useEightConnectivity,
 			Boolean drawWatersheds, Double sigma, ExecutorService es) {
 		ImgLabeling<Integer, IntType> outputLabeling = labelingCreator.apply(in, new IntType());
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java
index 9b666aa18..659db0674 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java
@@ -127,7 +127,6 @@ public class WatershedSeeded<T extends RealType<T>, B extends BooleanType<B>> im
 	private static final AtomicLong seq = new AtomicLong();
 
 	@SuppressWarnings("unchecked")
-	@Override
 	/**
 	 * TODO
 	 *
@@ -138,6 +137,7 @@ public class WatershedSeeded<T extends RealType<T>, B extends BooleanType<B>> im
 	 * @param mask
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<T> in, final ImgLabeling<Integer, IntType> seeds,
 			final Boolean useEightConnectivity, final Boolean drawWatersheds,
 			final RandomAccessibleInterval<B> maskInput, final ImgLabeling<Integer, IntType> out) {
@@ -399,7 +399,6 @@ class WatershedSeededMaskless<T extends RealType<T>, B extends BooleanType<B>> i
 	@OpDependency(name = "image.watershed")
 	private Computers.Arity5<RandomAccessibleInterval<T>, ImgLabeling<Integer, IntType>, Boolean, Boolean, RandomAccessibleInterval<B>, ImgLabeling<Integer, IntType>> watershedOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -409,6 +408,7 @@ class WatershedSeededMaskless<T extends RealType<T>, B extends BooleanType<B>> i
 	 * @param drawWatersheds
 	 * @param outputLabeling
 	 */
+	@Override
 	public void compute(RandomAccessibleInterval<T> in, ImgLabeling<Integer, IntType> seeds,
 			Boolean useEightConnectivity, Boolean drawWatersheds,
 			ImgLabeling<Integer, IntType> outputLabeling) {
@@ -426,7 +426,6 @@ class WatershedSeededMasklessFunction<T extends RealType<T>, B extends BooleanTy
 	@OpDependency(name = "create.imgLabeling")
 	private BiFunction<Dimensions, IntType, ImgLabeling<Integer, IntType>> labelingCreator;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -436,6 +435,7 @@ class WatershedSeededMasklessFunction<T extends RealType<T>, B extends BooleanTy
 	 * @param drawWatersheds
 	 * @return the outputLabeling
 	 */
+	@Override
 	public ImgLabeling<Integer, IntType> apply(RandomAccessibleInterval<T> in, ImgLabeling<Integer, IntType> seeds,
 			Boolean useEightConnectivity, Boolean drawWatersheds) {
 		ImgLabeling<Integer, IntType> outputLabeling = labelingCreator.apply(in, new IntType());
@@ -453,7 +453,6 @@ class WatershedSeededFunction<T extends RealType<T>, B extends BooleanType<B>> i
 	@OpDependency(name = "create.imgLabeling")
 	private BiFunction<Dimensions, IntType, ImgLabeling<Integer, IntType>> labelingCreator;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -464,6 +463,7 @@ class WatershedSeededFunction<T extends RealType<T>, B extends BooleanType<B>> i
 	 * @param mask
 	 * @return the outputLabeling
 	 */
+	@Override
 	public ImgLabeling<Integer, IntType> apply(RandomAccessibleInterval<T> in, ImgLabeling<Integer, IntType> seeds,
 			Boolean useEightConnectivity, Boolean drawWatersheds, RandomAccessibleInterval<B> mask) {
 		ImgLabeling<Integer, IntType> outputLabeling = labelingCreator.apply(in, new IntType());
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java
index 835841211..c27abb82a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java
@@ -56,13 +56,13 @@ public class DefaultCentralMoment00<I extends RealType<I>, O extends RealType<O>
 	@OpDependency(name = "imageMoments.moment00")
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> moment00Cmp;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void computeMoment(final RandomAccessibleInterval<I> input, final O output) {
 		moment00Cmp.compute(input, output);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java
index 07baa4782..97a10a481 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java
@@ -67,13 +67,13 @@ public class DefaultCentralMoment02<I extends RealType<I>, O extends RealType<O>
 	@OpDependency(name = "math.power")
 	private Computers.Arity2<O, Integer, O> powerOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void computeMoment(final RandomAccessibleInterval<I> input, final O output) {
 		final O moment00 = output.createVariable();
 		moment00Func.compute(input, moment00);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java
index ada529cc7..9505191e8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java
@@ -66,13 +66,13 @@ public class DefaultCentralMoment03<I extends RealType<I>, O extends RealType<O>
 	@OpDependency(name = "math.power")
 	private Computers.Arity2<O, Integer, O> powerOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void computeMoment(final RandomAccessibleInterval<I> input,
 		final O output)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java
index 958df6fa6..24b131c48 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java
@@ -67,13 +67,13 @@ public class DefaultCentralMoment11<I extends RealType<I>, O extends RealType<O>
 	@OpDependency(name = "imageMoments.moment11")
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> moment11Func;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void computeMoment(final RandomAccessibleInterval<I> input, final O output) {
 		final O moment00 = output.createVariable();
 		moment00Func.compute(input, moment00);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java
index 0157917a4..be72739e9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java
@@ -68,13 +68,13 @@ public class DefaultCentralMoment12<I extends RealType<I>, O extends RealType<O>
 	@OpDependency(name = "imageMoments.moment10")
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> moment10Func;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void computeMoment(final RandomAccessibleInterval<I> input,
 		final O output)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java
index 1fafe4117..be5527557 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java
@@ -64,13 +64,13 @@ public class DefaultCentralMoment20<I extends RealType<I>, O extends RealType<O>
 	@OpDependency(name = "imageMoments.moment10")
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> moment10Func;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void computeMoment(final RandomAccessibleInterval<I> input,
 		final O output)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java
index 3fb4126b8..d3b2f5a4e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java
@@ -68,13 +68,13 @@ public class DefaultCentralMoment21<I extends RealType<I>, O extends RealType<O>
 	@OpDependency(name = "imageMoments.moment10")
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> moment10Func;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void computeMoment(final RandomAccessibleInterval<I> input, final O output) {
 		final O moment00 = output.createVariable();
 		moment00Func.compute(input, moment00);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java
index 978f81216..9c23d909f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java
@@ -68,13 +68,13 @@ public class DefaultCentralMoment30<I extends RealType<I>, O extends RealType<O>
 	@OpDependency(name = "math.power")
 	private Computers.Arity2<O, Integer, O> powerOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void computeMoment(final RandomAccessibleInterval<I> input,
 		final O output)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java
index 694f1cc4e..5706552cc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java
@@ -54,13 +54,13 @@
 public class IterableCentralMoment00<I extends RealType<I>, O extends RealType<O>>
 		implements Computers.Arity1<IterableInterval<I>, O> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void compute(final IterableInterval<I> input, final O output) {
 		if (input.numDimensions() != 2)
 			throw new IllegalArgumentException("Only two-dimensional inputs allowed!");
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java
index feee188b1..44027fb64 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java
@@ -54,13 +54,13 @@
 public class IterableCentralMoment11<I extends RealType<I>, O extends RealType<O>>
 		implements Computers.Arity1<IterableInterval<I>, O> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void compute(final IterableInterval<I> input, final O output) {
 		if (input.numDimensions() != 2) throw new IllegalArgumentException(
 			"Only two-dimensional inputs allowed!");
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java
index ed6c6d5b2..f892f3c1b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java
@@ -60,13 +60,13 @@ public class DefaultHuMoment1<I extends RealType<I>, O extends RealType<O>>
 	@OpDependency(name = "imageMoments.normalizedCentralMoment02")
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> normalizedCentralMoment02Func;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void computeMoment(final RandomAccessibleInterval<I> input, final O output) {
 		final O n20 = output.createVariable();
 		normalizedCentralMoment20Func.compute(input, n20);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java
index 2a4743cfc..c2c8bff63 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java
@@ -64,13 +64,13 @@ public class DefaultHuMoment2<I extends RealType<I>, O extends RealType<O>> impl
 	@OpDependency(name = "imageMoments.normalizedCentralMoment11")
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> normalizedCentralMoment11Func;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void computeMoment(final RandomAccessibleInterval<I> input, final O output) {
 
 		final O n11 = output.createVariable();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java
index 5350246c7..4ae61268f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java
@@ -66,13 +66,13 @@ public class DefaultHuMoment3<I extends RealType<I>, O extends RealType<O>> impl
 	@OpDependency(name = "imageMoments.normalizedCentralMoment03")
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> normalizedCentralMoment03Func;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void computeMoment(final RandomAccessibleInterval<I> input,
 		final O output)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java
index 90ed950fc..4690edcd4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java
@@ -66,13 +66,13 @@ public class DefaultHuMoment4<I extends RealType<I>, O extends RealType<O>> impl
 	@OpDependency(name = "imageMoments.normalizedCentralMoment03")
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> normalizedCentralMoment03Func;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void computeMoment(final RandomAccessibleInterval<I> input,
 		final O output)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java
index cc9bdf9b3..d5a37b960 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java
@@ -66,13 +66,13 @@ public class DefaultHuMoment5<I extends RealType<I>, O extends RealType<O>> impl
 	@OpDependency(name = "imageMoments.normalizedCentralMoment03")
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> normalizedCentralMoment03Func;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void computeMoment(final RandomAccessibleInterval<I> input, final O output) {
 		final O n30 = output.createVariable();
 		normalizedCentralMoment30Func.compute(input, n30);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java
index 77b1f1577..f74767049 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java
@@ -75,13 +75,13 @@ public class DefaultHuMoment6<I extends RealType<I>, O extends RealType<O>> impl
 	@OpDependency(name = "imageMoments.normalizedCentralMoment20")
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> normalizedCentralMoment20Func;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void computeMoment(final RandomAccessibleInterval<I> input, final O output) {
 		final O n02 = output.createVariable();
 		normalizedCentralMoment02Func.compute(input, n02);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java
index 76b538e95..c9da9854e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java
@@ -66,13 +66,13 @@ public class DefaultHuMoment7<I extends RealType<I>, O extends RealType<O>> impl
 	@OpDependency(name = "imageMoments.normalizedCentralMoment03")
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> normalizedCentralMoment03Func;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void computeMoment(final RandomAccessibleInterval<I> input, final O output) {
 		final O n03 = output.createVariable();
 		normalizedCentralMoment03Func.compute(input, n03);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java
index 0314f7759..a0603f0ec 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java
@@ -70,7 +70,6 @@ public class MergeLabeling<L, I extends IntegerType<I>, B extends BooleanType<B>
 	private Function<Computers.Arity2<LabelingType<L>, LabelingType<L>, LabelingType<L>>, Computers.Arity2<Iterable<LabelingType<L>>, Iterable<LabelingType<L>>, Iterable<LabelingType<L>>>> adaptor;
 
 	@SuppressWarnings({ "unchecked", "rawtypes", "hiding" })
-	@Override
 	/**
 	 * TODO
 	 *
@@ -79,6 +78,7 @@ public class MergeLabeling<L, I extends IntegerType<I>, B extends BooleanType<B>
 	 * @param mask
 	 * @param combinedLabeling
 	 */
+	@Override
 	public ImgLabeling<L, I> apply(final ImgLabeling<L, I> input1, final ImgLabeling<L, I> input2,
 			final RandomAccessibleInterval<B> mask) {
 		final ImgLabeling<L, I> output = imgLabelingCreator.apply(input1,
@@ -122,7 +122,6 @@ class MergeLabelingMaskless<L, I extends IntegerType<I>, B extends BooleanType<B
 	@OpDependency(name = "labeling.merge")
 	private Functions.Arity3<ImgLabeling<L, I>, ImgLabeling<L, I>, RandomAccessibleInterval<B>, ImgLabeling<L, I>> mergeOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -130,6 +129,7 @@ class MergeLabelingMaskless<L, I extends IntegerType<I>, B extends BooleanType<B
 	 * @param labeling2
 	 * @param combinedLabeling
 	 */
+	@Override
 	public ImgLabeling<L, I> apply(ImgLabeling<L, I> t, ImgLabeling<L, I> u) {
 		return mergeOp.apply(t, u, null);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java
index a02776f72..24c4ebc49 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java
@@ -62,7 +62,6 @@ public class DefaultCCA<T extends IntegerType<T>, L, I extends IntegerType<I>> i
 	private BiFunction<Dimensions, IntType, ImgLabeling<L, IntType>> imgLabelingCreator;
 
 	@SuppressWarnings("unchecked")
-	@Override
 	/**
 	 * TODO
 	 *
@@ -72,6 +71,7 @@ public class DefaultCCA<T extends IntegerType<T>, L, I extends IntegerType<I>> i
 	 * @param labelGenerator
 	 * @param labeling
 	 */
+	@Override
 	public ImgLabeling<Integer, IntType> apply(final RandomAccessibleInterval<T> input, ExecutorService es,
 			StructuringElement se, Iterator<Integer> labelGenerator) {
 		ImgLabeling<Integer, IntType> output = (ImgLabeling<Integer, IntType>) imgLabelingCreator.apply(input,
@@ -89,7 +89,6 @@ class SimpleCCA<T extends IntegerType<T>, L, I extends IntegerType<I>> implement
 	private Functions.Arity4<RandomAccessibleInterval<T>, ExecutorService, StructuringElement, Iterator<Integer>, ImgLabeling<Integer, IntType>> labeler;
 
 	@SuppressWarnings("unchecked")
-	@Override
 	/**
 	 * TODO
 	 *
@@ -98,6 +97,7 @@ class SimpleCCA<T extends IntegerType<T>, L, I extends IntegerType<I>> implement
 	 * @param structuringElement
 	 * @param labeling
 	 */
+	@Override
 	public ImgLabeling<Integer, IntType> apply(RandomAccessibleInterval<T> input, ExecutorService es,
 			StructuringElement structuringElement) {
 		DefaultLabelIterator defaultLabelIterator = new DefaultLabelIterator();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java
index 379c9c4f5..c640812b1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java
@@ -49,7 +49,6 @@ public class Default<I extends BooleanType<I>, O extends Type<O>> implements
 	Computers.Arity2<I, O, O> 
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -57,6 +56,7 @@ public class Default<I extends BooleanType<I>, O extends Type<O>> implements
 	 * @param defaultValue
 	 * @param output
 	 */
+	@Override
 	public void compute(final I input, final O defaultVal, final O output) {
 		if (!input.get()) output.set(defaultVal);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java
index 48a66cc37..6b5ac45c1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java
@@ -50,7 +50,6 @@ public class Ternary<I extends BooleanType<I>, O extends Type<O>> implements Com
 
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -59,6 +58,7 @@ public class Ternary<I extends BooleanType<I>, O extends Type<O>> implements Com
 	 * @param ifFalseVal
 	 * @param output
 	 */
+	@Override
 	public void compute(final I input, final O ifTrueVal, final O ifFalseVal, final O output) {
 		output.set(input.get() ? ifTrueVal : ifFalseVal);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java
index c331dff76..3710ed107 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java
@@ -57,7 +57,6 @@
 public class DefaultMapNeighborhood<I, O> implements
 	Computers.Arity3<RandomAccessibleInterval<I>, Shape, Computers.Arity1<Iterable<I>, O>, IterableInterval<O>>
 {
-	@Override
 	/**
 	 * TODO
 	 *
@@ -66,6 +65,7 @@ public class DefaultMapNeighborhood<I, O> implements
 	 * @param op
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<I> in1, final Shape in2,
 		final Computers.Arity1<Iterable<I>, O> computer, final IterableInterval<O> out)
 	{
@@ -99,7 +99,6 @@ class MapNeighborhoodAllRAI<I, O> implements
 	Computers.Arity3<RandomAccessibleInterval<I>, Shape, Computers.Arity1<Iterable<I>, O>, RandomAccessibleInterval<O>>
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -108,6 +107,7 @@ class MapNeighborhoodAllRAI<I, O> implements
 	 * @param op
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<I> in1, final Shape in2,
 		final Computers.Arity1<Iterable<I>, O> centerAwareOp,
 		final RandomAccessibleInterval<O> out)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java
index 2d4d8f6db..af1b0ebd5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java
@@ -62,7 +62,6 @@
 public class MapNeighborhoodWithCenter<I, O> implements Computers.Arity3<RandomAccessibleInterval<I>, Shape, Computers.Arity2<Iterable<I>, I, O>, IterableInterval<O>>
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -71,6 +70,7 @@ public class MapNeighborhoodWithCenter<I, O> implements Computers.Arity3<RandomA
 	 * @param op
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<I> in1, final Shape in2,
 		final Computers.Arity2<Iterable<I>, I, O> centerAwareOp, final IterableInterval<O> out)
 	{
@@ -106,7 +106,6 @@ class MapNeighborhoodWithCenterAllRAI<I, O> implements
 	Computers.Arity3<RandomAccessibleInterval<I>, Shape, Computers.Arity2<Iterable<I>, I, O>, RandomAccessibleInterval<O>>
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -115,6 +114,7 @@ class MapNeighborhoodWithCenterAllRAI<I, O> implements
 	 * @param op
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<I> in1, final Shape in2,
 		final Computers.Arity2<Iterable<I>, I, O> centerAwareOp,
 		final RandomAccessibleInterval<O> out)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java
index 05b7563cf..dd66ef464 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java
@@ -46,7 +46,6 @@ public class ComplexConjugateMultiplyOp<T extends ComplexType<T>> implements Com
 	// TODO: code generate this and all add ops to generalize them to other
 	// operators.
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -54,6 +53,7 @@ public class ComplexConjugateMultiplyOp<T extends ComplexType<T>> implements Com
 	 * @param input2
 	 * @param output
 	 */
+	@Override
 	public void compute(final T input1, final T input2, final T output) {
 		T temp = input2.copy();
 		temp.complexConjugate();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java
index 11bad2af6..41aa080fa 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java
@@ -60,7 +60,6 @@ public class ExtractHoles<T extends BooleanType<T>> implements
 	@OpDependency(name = "morphology.fillHoles")
 	private Computers.Arity2<RandomAccessibleInterval<T>, Shape, RandomAccessibleInterval<T>> fillHolesComp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -68,6 +67,7 @@ public class ExtractHoles<T extends BooleanType<T>> implements
 	 * @param structElement
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<T> input,
 		final Shape structElement, final RandomAccessibleInterval<T> output)
 	{
@@ -84,13 +84,13 @@ class SimpleExtractHolesComputer<T extends BooleanType<T>> implements
 	@OpDependency(name = "morphology.extractHoles")
 	private Computers.Arity2<RandomAccessibleInterval<T>, Shape, RandomAccessibleInterval<T>> extractOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void compute(RandomAccessibleInterval<T> in1, RandomAccessibleInterval<T> out) {
 		Shape defaultStructElement = new RectangleShape(1, false);
 		extractOp.compute(in1, defaultStructElement, out);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java
index ff75e7e4e..af1bfcd4f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java
@@ -60,7 +60,6 @@ public class FillHoles<T extends BooleanType<T>> implements
 	@OpDependency(name = "morphology.floodFill")
 	private Computers.Arity3<RandomAccessibleInterval<T>, Localizable, Shape, RandomAccessibleInterval<T>> floodFillComp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -68,6 +67,7 @@ public class FillHoles<T extends BooleanType<T>> implements
 	 * @param structElement
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<T> op,
 		final Shape structElement, final RandomAccessibleInterval<T> r)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java
index b7fc7170e..bb6e36089 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java
@@ -79,7 +79,6 @@ public class Outline<B extends BooleanType<B>>
 	 * @param output
 	 *            outlines of the objects in interval
 	 */
-	@Override
 	/**
 	 * TODO
 	 *
@@ -87,6 +86,7 @@ public class Outline<B extends BooleanType<B>>
 	 * @param excludeEdges
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<B> input, final Boolean excludeEdges,
 			final RandomAccessibleInterval<BitType> output) {
 		if (!Intervals.equalDimensions(input, output))
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java
index de4796ca3..0d57bce19 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java
@@ -45,13 +45,13 @@
 @Plugin(type = Op.class, name = "morphology.thinGuoHall")
 public class ThinGuoHall extends AbstractThin {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<BitType> input, //
 			final RandomAccessibleInterval<BitType> output) {
 		m_strategy = new GuoHallThinningStrategy();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java
index 8bfc5447b..bff561920 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java
@@ -45,13 +45,13 @@
 @Plugin(type = Op.class, name = "morphology.thinHilditch")
 public class ThinHilditch extends AbstractThin {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<BitType> input, //
 			final RandomAccessibleInterval<BitType> output) {
 		m_strategy = new HilditchThinningStrategy();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java
index bf51b7aa1..9ee73c93c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java
@@ -45,13 +45,13 @@
 @Plugin(type = Op.class, name = "morphology.thinMorphological")
 public class ThinMorphological extends AbstractThin {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<BitType> input, //
 			final RandomAccessibleInterval<BitType> output) {
 		m_strategy = new MorphologicalThinningStrategy();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java
index 09094157f..daf148ae7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java
@@ -45,13 +45,13 @@
 @Plugin(type = Op.class, name = "morphology.thinZhangSuen")
 public class ThinZhangSuen extends AbstractThin {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<BitType> input, //
 			final RandomAccessibleInterval<BitType> output) {
 		m_strategy = new ZhangSuenThinningStrategy();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java
index 541fd6461..3556dd7f1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java
@@ -47,7 +47,6 @@
 public class ProjectRAIToIterableInterval<T, V>
 		implements Computers.Arity3<RandomAccessibleInterval<T>, Computers.Arity1<Iterable<T>, V>, Integer, IterableInterval<V>> {
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -56,6 +55,7 @@ public class ProjectRAIToIterableInterval<T, V>
 	 * @param dim
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<T> input, final Computers.Arity1<Iterable<T>, V> method,
 			final Integer dim, final IterableInterval<V> output) {
 		if (input.numDimensions() != output.numDimensions() + 1)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java
index 7be59bb9c..a3d986698 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java
@@ -96,7 +96,6 @@ private RealPoint makeRealPoint(RealLocalizableRealPositionable input) {
 		return new RealPoint(input);
 	}
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -104,6 +103,7 @@ private RealPoint makeRealPoint(RealLocalizableRealPositionable input) {
 	 * @param threshold Maximum distance between polylines to be considered a junction
 	 * @param junctions
 	 */
+	@Override
 	public List<RealPoint> apply(final List<? extends WritablePolyline> input, final Double threshold) {
 
 		// check arguments for validity
@@ -325,13 +325,13 @@ class SimpleDetectJunctions implements Function<List<? extends WritablePolyline>
 	@OpDependency(name = "segment.detectJunctions")
 	private BiFunction<List<? extends WritablePolyline>, Double, List<RealPoint>> junctionDetector;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param lines
 	 * @param junctions
 	 */
+	@Override
 	public List<RealPoint> apply(List<? extends WritablePolyline> t) {
 		return junctionDetector.apply(t, null);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java
index 536b6616f..7d34781a1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java
@@ -223,7 +223,6 @@ private void getNextPoint(RandomAccess<DoubleType> gradientRA, RandomAccess<Doub
 		}
 	}
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -234,6 +233,7 @@ private void getNextPoint(RandomAccess<DoubleType> gradientRA, RandomAccess<Doub
 	 * @param ridgeLengthMin
 	 * @param ridges
 	 */
+	@Override
 	public List<DefaultWritablePolyline> apply(final RandomAccessibleInterval<T> input, final Double width,
 			final Double lowerThreshold, final Double higherThreshold, final Integer ridgeLengthMin) {
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java
index 72f819af9..fc0355bf2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java
@@ -55,7 +55,6 @@
 public class SliceRAI2RAI<I, O> implements
 		Computers.Arity4<RandomAccessibleInterval<I>, Computers.Arity1<RandomAccessibleInterval<I>, RandomAccessibleInterval<O>>, int[], Boolean, RandomAccessibleInterval<O>> {
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -65,6 +64,7 @@ public class SliceRAI2RAI<I, O> implements
 	 * @param dropSingleDimensions
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<I> input,
 			final Computers.Arity1<RandomAccessibleInterval<I>, RandomAccessibleInterval<O>> op, final int[] axisIndices,
 			final Boolean dropSingleDimensions, final RandomAccessibleInterval<O> output) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java
index 3b7679dca..4c73dc5c9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java
@@ -59,13 +59,13 @@ public class DefaultGeometricMean<I extends RealType<I>, O extends RealType<O>>
 	@OpDependency(name = "stats.sumOfLogs")
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> sumOfLogsComputer;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param geometricMean
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 		final O size = output.createVariable();
 		sizeComputer.compute(input, size);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java
index 26c5fb89b..ca5c4258e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java
@@ -59,13 +59,13 @@ public class DefaultHarmonicMean<I extends RealType<I>, O extends RealType<O>>
 	@OpDependency(name = "stats.sumOfInverses")
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> sumOfInversesComputer;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param harmonicMean
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 		final O area = output.createVariable();
 		sizeComputer.compute(input, area);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java
index 336a59f26..7d96f0b19 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java
@@ -59,13 +59,13 @@ public class DefaultKurtosis<I extends RealType<I>, O extends RealType<O>>
 	@OpDependency(name = "stats.moment4AboutMean")
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> moment4AboutMeanComputer;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param kurtosis
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 		output.setReal(Double.NaN);
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java
index de4f4afcd..b4331ed7d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java
@@ -55,13 +55,13 @@ public class DefaultMax<T extends RealType<T>> implements Computers.Arity1<Rando
 	@OpDependency(name = "stats.minMax")
 	private Function<RandomAccessibleInterval<T>, Pair<T, T>> minMaxOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param max
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<T> input, final T output) {
 		output.set(minMaxOp.apply(input).getB());
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java
index 2f44b4736..bc3f2a8eb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java
@@ -59,13 +59,13 @@ public class DefaultMedian<I extends RealType<I>, O extends RealType<O>>
 	@OpDependency(name = "stats.quantile")
 	private Computers.Arity2<Iterable<I>, Double, O> quantileOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param median
 	 */
+	@Override
 	public void compute(final Iterable<I> input, final O output) {
 		final ArrayList<Double> statistics = new ArrayList<>();
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java
index 80a9ce093..e2d14e212 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java
@@ -55,13 +55,13 @@ public class DefaultMin<T extends RealType<T>> implements Computers.Arity1<Rando
 	@OpDependency(name = "stats.minMax")
 	private Function<RandomAccessibleInterval<T>, Pair<T, T>> minMaxOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param max
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<T> input, final T output) {
 		output.set(minMaxOp.apply(input).getA());
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java
index 3b756966a..e8c467306 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java
@@ -55,13 +55,13 @@
 @Plugin(type = Op.class, name = "stats.minMax", priority = Priority.HIGH)
 public class DefaultMinMax<I extends RealType<I>> implements Function<RandomAccessibleInterval<I>, Pair<I, I>> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param minMax
 	 */
+	@Override
 	public Pair<I, I> apply(final RandomAccessibleInterval<I> input) {
 		// set minVal to the largest possible value and maxVal to the smallest possible.
 		final I minVal = Util.getTypeFromInterval(input).createVariable();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java
index 3d0e29b09..1658da3ef 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java
@@ -56,13 +56,13 @@
 public class DefaultMoment1AboutMean<I extends RealType<I>, O extends RealType<O>>
 	implements Computers.Arity1<RandomAccessibleInterval<I>, O>
 {
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param moment1AboutMean
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 		output.setZero();
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java
index f93d97a99..f135bd32d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java
@@ -56,13 +56,13 @@ public class DefaultMoment2AboutMean<I extends RealType<I>, O extends RealType<O
 	@OpDependency(name = "stats.momentNAboutMean")
 	private Computers.Arity2<RandomAccessibleInterval<I>, Integer, O> momentComputer;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param moment2AboutMean
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 		momentComputer.compute(input, 2, output);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java
index b14462b53..a2c6ca665 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java
@@ -56,13 +56,13 @@ public class DefaultMoment3AboutMean<I extends RealType<I>, O extends RealType<O
 	@OpDependency(name = "stats.momentNAboutMean")
 	private Computers.Arity2<RandomAccessibleInterval<I>, Integer, O> momentComputer;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param moment3AboutMean
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 		momentComputer.compute(input, 3, output);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java
index d4961fcb8..26d298132 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java
@@ -56,13 +56,13 @@ public class DefaultMoment4AboutMean<I extends RealType<I>, O extends RealType<O
 	@OpDependency(name = "stats.momentNAboutMean")
 	private Computers.Arity2<RandomAccessibleInterval<I>, Integer, O> momentComputer;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param moment4AboutMean
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 		momentComputer.compute(input, 4, output);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java
index b84674277..5b6c7920f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java
@@ -64,13 +64,13 @@ public class DefaultMomentNAboutMean<I extends RealType<I>, O extends RealType<O
 	@OpDependency(name = "math.power")
 	private Computers.Arity2<DoubleType, Integer, DoubleType> powOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param moment3AboutMean
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<I> input, final Integer n, final O output) {
 		final DoubleType mean = new DoubleType();
 		meanComputer.compute(input, mean);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java
index 089c38e65..379fe802e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java
@@ -56,7 +56,6 @@ public class DefaultPercentile<I extends RealType<I>, O extends RealType<O>>
 	@OpDependency(name = "stats.quantile")
 	private Computers.Arity2<Iterable<I>, Double, O> op;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -64,6 +63,7 @@ public class DefaultPercentile<I extends RealType<I>, O extends RealType<O>>
 	 * @param percent
 	 * @param percentile
 	 */
+	@Override
 	public void compute(final Iterable<I> input, final Double percent, final O output) {
 		op.compute(input, percent / 100, output);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java
index 1fa795a54..39eefc593 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java
@@ -60,7 +60,6 @@ public class DefaultQuantile<I extends RealType<I>, O extends RealType<O>>
 implements Computers.Arity2<Iterable<I>, Double, O>
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -68,6 +67,7 @@ public class DefaultQuantile<I extends RealType<I>, O extends RealType<O>>
 	 * @param quantile
 	 * @param output
 	 */
+	@Override
 	public void compute(final Iterable<I> input, final Double quantile,
 		final O output)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java
index 6b1bf3828..68a78caf7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java
@@ -49,13 +49,13 @@
 public class DefaultSize<I extends RealType<I>, O extends RealType<O>> 
 	implements Computers.Arity1<Interval, O>
 {
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param interval
 	 * @param size
 	 */
+	@Override
 	public void compute(final Interval input, final O output) {
 		output.setOne();
 		for(int i = 0; i < input.numDimensions(); i++) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java
index 9a21db36e..a4a302d5d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java
@@ -58,13 +58,13 @@ public class DefaultSkewness<I extends RealType<I>, O extends RealType<O>> imple
 	@OpDependency(name = "stats.stdDev")
 	private Computers.Arity1<RandomAccessibleInterval<I>, O> stdDevComputer;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param skewness
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 		final O moment3 = output.createVariable();
 		moment3AboutMeanComputer.compute(input, moment3);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java
index 3f7518fe1..5af643a65 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java
@@ -59,13 +59,13 @@ public class DefaultStandardDeviation<I extends RealType<I>, O extends RealType<
 	@OpDependency(name = "math.sqrt")
 	private Computers.Arity1<O, O> sqrtComputer;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param raiInput
 	 * @param stdDev
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 		O variance = output.createVariable();
 		varianceComputer.compute(input, variance);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java
index 8921727c3..a6cccc247 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java
@@ -54,13 +54,13 @@ public class DefaultSum<I extends RealType<I>, O extends RealType<O>> implements
 	Computers.Arity1<RandomAccessibleInterval<I>, O>
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param raiInput
 	 * @param sum
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 		output.setZero();
 		List<O> chunkSums = LoopBuilder.setImages(input).multiThreaded()
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java
index dacf302b2..e929543cf 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java
@@ -66,13 +66,13 @@ public class DefaultSumOfInverses<I extends RealType<I>, O extends RealType<O>>
 	@OpDependency(name = "stats.sum")
 	private Computers.Arity1<RandomAccessibleInterval<O>, O> sumOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param raiInput
 	 * @param sumOfInverses
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<I> input, final O dbzValue, final O output) {
 		RandomAccessibleInterval<O> tmpImg = imgCreator.apply(input, output);
 		//TODO: Can we lift this? Would require making a RAI of Doubles.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java
index 6f36b32f4..f57802ad7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java
@@ -66,13 +66,13 @@ public class DefaultSumOfLogs<I extends RealType<I>, O extends RealType<O>> impl
 	@OpDependency(name = "stats.sum")
 	private Computers.Arity1<RandomAccessibleInterval<DoubleType>, O> sumOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param raiInput
 	 * @param sumOfLogs
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 		RandomAccessibleInterval<DoubleType> logImg = imgCreator.apply(input, new DoubleType());
 		logOp.compute(input, logImg);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java
index 8f2ad7b55..a769398af 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java
@@ -64,13 +64,13 @@ public class DefaultSumOfSquares<I extends RealType<I>, O extends RealType<O>>
 	@OpDependency(name = "stats.sum")
 	private Computers.Arity1<RandomAccessibleInterval<O>, O> sumOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param raiInput
 	 * @param sumOfSquares
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 		RandomAccessibleInterval<O> tmpImg = imgCreator.apply(input, output);
 		sqrOp.compute(input, tmpImg);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java
index f72eb13a6..02fa76696 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java
@@ -69,13 +69,13 @@ public class DefaultVariance<I extends RealType<I>, O extends RealType<O>> imple
 	@OpDependency(name = "stats.size")
 	private Computers.Arity1<RandomAccessibleInterval<I>, LongType> sizeOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param raiInput
 	 * @param variance
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<I> input, final O output) {
 
 		final DoubleType mean = new DoubleType();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java
index 6a305acc5..4d4457754 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java
@@ -55,13 +55,13 @@
 @Plugin(type = Op.class, name = "stats.integralMean")
 public class IntegralMean<I extends RealType<I>> implements Computers.Arity1<RectangleNeighborhood<? extends Composite<I>>, DoubleType> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param integralMean
 	 */
+	@Override
 	public void compute(final RectangleNeighborhood<? extends Composite<I>> input, final DoubleType output) {
 		// computation according to
 		// https://en.wikipedia.org/wiki/Summed_area_table
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java
index 6de7aec38..e77cd80b4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java
@@ -53,13 +53,13 @@
 @Plugin(type = Op.class, name = "stats.integralSum")
 public class IntegralSum<I extends RealType<I>> implements Computers.Arity1<RectangleNeighborhood<I>, DoubleType> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param integralSum
 	 */
+	@Override
 	public void compute(final RectangleNeighborhood<I> input, final DoubleType output) {
 		// computation according to
 		// https://en.wikipedia.org/wiki/Summed_area_table
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java
index d0c856797..fa80d712e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java
@@ -56,13 +56,13 @@
 public class IntegralVariance<I extends RealType<I>>
 		implements Computers.Arity1<RectangleNeighborhood<? extends Composite<I>>, DoubleType> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param integralVariance
 	 */
+	@Override
 	public void compute(final RectangleNeighborhood<? extends Composite<I>> input, final DoubleType output) {
 		// computation according to
 		// https://en.wikipedia.org/wiki/Summed_area_table
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java
index a8f4e9901..80b50dbde 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java
@@ -51,13 +51,13 @@
 @Plugin(type = Op.class, name = "stats.geometricMean", priority = Priority.VERY_HIGH)
 public class IterableGeometricMean<I extends RealType<I>, O extends RealType<O>> implements Computers.Arity1<Iterable<I>, O> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param geometricMean
 	 */
+	@Override
 	public void compute(final Iterable<I> input, final O output) {
 		double size = 0;
 		double sumOfLogs = 0;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java
index 96e163461..0a3622ae8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java
@@ -51,13 +51,13 @@
 @Plugin(type = Op.class, name = "stats.harmonicMean", priority = Priority.VERY_HIGH)
 public class IterableHarmonicMean<I extends RealType<I>, O extends RealType<O>> implements Computers.Arity1<Iterable<I>, O> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param harmonicMean
 	 */
+	@Override
 	public void compute(final Iterable<I> input, final O output) {
 		double size = 0;
 		double sumOfInverses = 0;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java
index de1379c46..c06ff5b45 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java
@@ -50,13 +50,13 @@
 @Plugin(type = Op.class, name = "stats.max")
 public class IterableMax<T extends RealType<T>> implements Computers.Arity1<Iterable<T>, T> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param max
 	 */
+	@Override
 	public void compute(final Iterable<T> input, final T output) {
 		// Re-use output to compare against
 		output.setReal(output.getMinValue());
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java
index 5d6d77e59..f862f0e70 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java
@@ -51,13 +51,13 @@
 @Plugin(type = Op.class, name = "stats.mean", priority = Priority.VERY_HIGH)
 public class IterableMean<I extends RealType<I>, O extends RealType<O>> implements Computers.Arity1<Iterable<I>, O> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param mean
 	 */
+	@Override
 	public void compute(final Iterable<I> input, final O output) {
 
 		double sum = 0;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java
index 29be26044..ddd7a1d18 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java
@@ -50,13 +50,13 @@
 @Plugin(type = Op.class, name = "stats.min")
 public class IterableMin<T extends RealType<T>> implements Computers.Arity1<Iterable<T>, T> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param min
 	 */
+	@Override
 	public void compute(final Iterable<T> input, final T output) {
 		// Re-use output to compare against
 		output.setReal(output.getMaxValue());
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java
index a418db632..333b5e6c6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java
@@ -51,13 +51,13 @@
 @Plugin(type = Op.class, name = "stats.minMax")
 public class IterableMinMax<I extends RealType<I>> implements Function<Iterable<I>, Pair<I, I>> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param minMax
 	 */
+	@Override
 	public Pair<I, I> apply(final Iterable<I> input) {
 
 		// set minVal to the largest possible value and maxVal to the smallest possible.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java
index 8545b3631..cb6453961 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java
@@ -57,13 +57,13 @@ public class IterableMoment3AboutMean<I extends RealType<I>, O extends RealType<
 	@OpDependency(name = "stats.size")
 	private Computers.Arity1<Iterable<I>, O> sizeComputer;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param moment3AboutMean
 	 */
+	@Override
 	public void compute(final Iterable<I> input, final O output) {
 		final O mean = output.createVariable();
 		meanComputer.compute(input, mean);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java
index c2083237a..596a519da 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java
@@ -57,13 +57,13 @@ public class IterableMoment4AboutMean<I extends RealType<I>, O extends RealType<
 	@OpDependency(name = "stats.size")
 	private Computers.Arity1<Iterable<I>, O> sizeComputer;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param moment4AboutMean
 	 */
+	@Override
 	public void compute(final Iterable<I> input, final O output) {
 
 		final O mean = output.createVariable();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java
index 7f3be747f..f3e4596fd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java
@@ -51,13 +51,13 @@ public class IterableSize<I extends RealType<I>, O extends RealType<O>>
 	implements Computers.Arity1<Iterable<I>, O>
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param size
 	 */
+	@Override
 	public void compute(final Iterable<I> input, final O output) {
 		double size = 0;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java
index 4699cb045..a3ee8fc23 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java
@@ -52,13 +52,13 @@
 public class IterableStandardDeviation<I extends RealType<I>, O extends RealType<O>>
 		implements Computers.Arity1<Iterable<I>, O> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param stdDev
 	 */
+	@Override
 	public void compute(final Iterable<I> input, final O output) {
 		double sum = 0;
 		double sumSqr = 0;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java
index 3f1fdd831..e2c399088 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java
@@ -50,13 +50,13 @@ public class IterableSum<I extends RealType<I>, O extends RealType<O>>
 	implements Computers.Arity1<Iterable<I>, O>
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param sum
 	 */
+	@Override
 	public void compute(final Iterable<I> input, final O output) {
 		double sum = 0;
 		for (final I in : input) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java
index ee1d6d500..b02ed18ff 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java
@@ -51,13 +51,13 @@
 @Plugin(type = Op.class, name = "stats.sumOfInverses")
 public class IterableSumOfInverses<I extends RealType<I>, O extends RealType<O>> implements Computers.Arity2<Iterable<I>, O, O> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param sumOfInverses
 	 */
+	@Override
 	public void compute(final Iterable<I> input, final O dbzValue,
 		final O output)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java
index 56e93ce37..4446b25fa 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java
@@ -50,13 +50,13 @@
 @Plugin(type = Op.class, name = "stats.sumOfLogs")
 public class IterableSumOfLogs<I extends RealType<I>, O extends RealType<O>> implements Computers.Arity1<Iterable<I>, O> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param sumOfLogs
 	 */
+	@Override
 	public void compute(final Iterable<I> input, final O output) {
 		double res = 0.0;
 		for (final I in : input) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java
index 914b8411d..e22cb76bd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java
@@ -50,13 +50,13 @@ public class IterableSumOfSquares<I extends RealType<I>, O extends RealType<O>>
 	implements Computers.Arity1<Iterable<I>, O>
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param sumOfSquares
 	 */
+	@Override
 	public void compute(final Iterable<I> input, final O output) {
 		double res = 0.0;
 		for (final I in : input) {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java
index 9600bc202..d4ef6a773 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java
@@ -55,13 +55,13 @@
 @Plugin(type = Op.class, name = "stats.variance")
 public class IterableVariance<I extends RealType<I>, O extends RealType<O>> implements Computers.Arity1<Iterable<I>, O> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param iterableInput
 	 * @param variance
 	 */
+	@Override
 	public void compute(final Iterable<I> input, final O output) {
 		int n = 0;
 		double mean = 0.0;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java
index e1537445b..ffa281b0a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java
@@ -68,13 +68,13 @@ public class Quadric implements
 	 */
 	public static final int MIN_DATA = 9;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param vectorCollection
 	 * @return the outputMatrix
 	 */
+	@Override
 	public Matrix4d apply(final Collection<Vector3d> points) {
 		if (points.size() < MIN_DATA)
 			throw new IllegalArgumentException("Must pass more points in order to fit a quadric equation!");
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java
index 7c13bb2d1..0487ca683 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java
@@ -53,7 +53,6 @@ public class ChunkerInterleaved implements Inplaces.Arity3_1<Chunk, Long, Execut
 
 	private String cancellationMsg;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -61,6 +60,7 @@ public class ChunkerInterleaved implements Inplaces.Arity3_1<Chunk, Long, Execut
 	 * @param numberOfElements
 	 * @param executorService
 	 */
+	@Override
 	public void mutate(final Chunk chunk, final Long numberOfElements, final ExecutorService es) {
 
 		final int numThreads = Runtime.getRuntime().availableProcessors();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java
index 4ced8cb35..a73b98ae1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java
@@ -53,7 +53,6 @@ public class DefaultChunker implements Inplaces.Arity3_1<Chunk, Long, ExecutorSe
 
 	private final int STEP_SIZE = 1;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -61,6 +60,7 @@ public class DefaultChunker implements Inplaces.Arity3_1<Chunk, Long, ExecutorSe
 	 * @param numberOfElements
 	 * @param executorService
 	 */
+	@Override
 	public void mutate(final Chunk chunk, final Long numberOfElements, final ExecutorService es) {
 
 		// TODO: is there a better way to determine the optimal chunk size?
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java
index 5cd77db8b..86bcfb364 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java
@@ -57,7 +57,6 @@ public class ApplyConstantThreshold<T extends RealType<T>>
 	Computers.Arity3<T, T, Comparator<? super T>, BitType> applyThreshold;
 
 	// TODO can/should the Comparator be of <? super T> instead of just <T>?
-	@Override
 	/**
 	 * TODO
 	 *
@@ -66,6 +65,7 @@ public class ApplyConstantThreshold<T extends RealType<T>>
 	 * @param comparator
 	 * @param output
 	 */
+	@Override
 	public void compute(final Iterable<T> input1, final T input2, final Comparator<T> comparator,
 			final Iterable<BitType> output) {
 		Computers.Arity1<T, BitType> thresholdComputer = Adapt.ComputerAdapt.asComputer(applyThreshold, input2, comparator);
@@ -87,7 +87,6 @@ class ApplyConstantThresholdSimple<T extends RealType<T>> implements Computers.A
 	Computers.Arity3<Iterable<T>, T, Comparator<T>, Iterable<BitType>> applyThreshold;
 
 	// TODO can/should the Comparator be of <? super T> instead of just <T>?
-	@Override
 	/**
 	 * TODO
 	 *
@@ -95,6 +94,7 @@ class ApplyConstantThresholdSimple<T extends RealType<T>> implements Computers.A
 	 * @param threshold
 	 * @param output
 	 */
+	@Override
 	public void compute(final Iterable<T> input1, final T input2, final Iterable<BitType> output) {
 
 		applyThreshold.compute(input1, input2, (in1, in2) -> in1.compareTo(in2), output);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java
index f05ea2b67..f72d50f63 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java
@@ -49,7 +49,6 @@ public class ApplyThresholdComparable<T> implements
 	Computers.Arity2<Comparable<? super T>, T, BitType>
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -57,6 +56,7 @@ public class ApplyThresholdComparable<T> implements
 	 * @param threshold
 	 * @param output
 	 */
+	@Override
 	public void compute(final Comparable<? super T> input, final T threshold,
 		final BitType output)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java
index 08e800147..216cbd0d9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java
@@ -50,7 +50,6 @@
 public class ApplyThresholdComparator<T> implements Computers.Arity3<T, T, Comparator<? super T>, BitType>
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -59,6 +58,7 @@ public class ApplyThresholdComparator<T> implements Computers.Arity3<T, T, Compa
 	 * @param comparator
 	 * @param output
 	 */
+	@Override
 	public void compute(T input1, T input2, Comparator<? super T> comparator, BitType out) {
 		out.set(comparator.compare(input1, input2) > 0);
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java
index 639520967..f01c4f070 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java
@@ -51,13 +51,13 @@ public class ComputeHuangThreshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param inputHistogram
 	 * @param output
 	 */
+	@Override
 	public long computeBin(final Histogram1d<T> hist) {
 		final long[] histogram = hist.toLongArray();
 		return computeBin(histogram);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java
index 5d38c40a3..c60012f10 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java
@@ -54,13 +54,13 @@ public class ComputeIJ1Threshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param inputHistogram
 	 * @param output
 	 */
+	@Override
 	public long computeBin(final Histogram1d<T> hist) {
 		final long[] histogram = hist.toLongArray();
 		return computeBin(histogram);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java
index 3b15367f8..2f6707d66 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java
@@ -54,13 +54,13 @@ public class ComputeIsoDataThreshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param inputHistogram
 	 * @param output
 	 */
+	@Override
 	public long computeBin(final Histogram1d<T> hist) {
 		final long[] histogram = hist.toLongArray();
 		return computeBin(histogram);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java
index fc2b0dc1d..ba078a336 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java
@@ -53,13 +53,13 @@ public class ComputeLiThreshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param inputHistogram
 	 * @param output
 	 */
+	@Override
 	public long computeBin(final Histogram1d<T> hist) {
 		final long[] histogram = hist.toLongArray();
 		return computeBin(histogram);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java
index d126dae60..6b934db57 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java
@@ -61,7 +61,6 @@ public class ComputeLocalBernsenThreshold<T extends RealType<T>> implements
 	@OpDependency(name = "stats.minMax")
 	private Function<Iterable<T>, Pair<T, T>> minMaxOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -71,6 +70,7 @@ public class ComputeLocalBernsenThreshold<T extends RealType<T>> implements
 	 * @param halfMaxValue
 	 * @param output
 	 */
+	@Override
 	public void compute(final Iterable<T> inputNeighborhood,
 		final T inputCenterPixel, final Double contrastThreshold,
 		final Double halfMaxValue, final BitType output)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java
index 1522df172..d1d87f27c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java
@@ -57,7 +57,6 @@ public class LocalBernsenThreshold<T extends RealType<T>> implements
 	@OpDependency(name = "threshold.localBernsen")
 	private Computers.Arity4<Iterable<T>, T, Double, Double, BitType> computeThresholdOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -68,6 +67,7 @@ public class LocalBernsenThreshold<T extends RealType<T>> implements
 	 * @param outOfBoundsFactory
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<T> input,
 		final Shape inputNeighborhoodShape, final Double contrastThreshold,
 		final Double halfMaxValue,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java
index 5486eddf1..b383b0b36 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java
@@ -57,7 +57,6 @@ public class ComputeLocalContrastThreshold<T extends RealType<T>> implements
 	@OpDependency(name = "stats.minMax")
 	private Function<Iterable<T>, Pair<T, T>> minMaxOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -65,6 +64,7 @@ public class ComputeLocalContrastThreshold<T extends RealType<T>> implements
 	 * @param inputCenterPixel
 	 * @param output
 	 */
+	@Override
 	public void compute(final Iterable<T> inputNeighborhood,
 		final T inputCenterPixel, final BitType output)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java
index 0ec2bf308..0772b90fc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java
@@ -56,7 +56,6 @@ public class LocalContrastThreshold<T extends RealType<T>> implements
 	@OpDependency(name = "threshold.localContrast")
 	private Computers.Arity2<Iterable<T>, T, BitType> computeThresholdOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -65,6 +64,7 @@ public class LocalContrastThreshold<T extends RealType<T>> implements
 	 * @param outOfBoundsFactory
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<T> input,
 		final Shape inputNeighborhoodShape,
 		final OutOfBoundsFactory<T, RandomAccessibleInterval<T>> outOfBoundsFactory,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java
index 4b3284851..5223e52ed 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java
@@ -56,7 +56,6 @@ public class ComputeLocalMeanThreshold<T extends RealType<T>> implements
 	@OpDependency(name = "stats.mean")
 	private Computers.Arity1<Iterable<T>, DoubleType> meanOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -65,6 +64,7 @@ public class ComputeLocalMeanThreshold<T extends RealType<T>> implements
 	 * @param c
 	 * @param output
 	 */
+	@Override
 	public void compute(final Iterable<T> inputNeighborhood,
 		final T inputCenterPixel, final Double c, final BitType output)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java
index d19885658..0a202e62e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java
@@ -77,7 +77,6 @@ public class LocalMeanThreshold<T extends RealType<T>> extends
 	@OpDependency(name = "threshold.localMean")
 	private Computers.Arity3<RectangleNeighborhood<? extends Composite<DoubleType>>, T, Double, BitType> computeThresholdIntegralOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -87,6 +86,7 @@ public class LocalMeanThreshold<T extends RealType<T>> extends
 	 * @param outOfBoundsFactory
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<T> input,
 		final Shape inputNeighborhoodShape, final Double c,
 		final OutOfBoundsFactory<T, RandomAccessibleInterval<T>> outOfBoundsFactory,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java
index 6df8c4d00..e0dc3e87c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java
@@ -54,7 +54,6 @@ public class ComputeLocalMedianThreshold<T extends RealType<T>> implements
 	@OpDependency(name = "stats.median")
 	private Computers.Arity1<Iterable<T>, DoubleType> medianOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -63,6 +62,7 @@ public class ComputeLocalMedianThreshold<T extends RealType<T>> implements
 	 * @param c
 	 * @param output
 	 */
+	@Override
 	public void compute(final Iterable<T> inputNeighborhood,
 		final T inputCenterPixel, final Double c, final BitType output)
 	{
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java
index 3232c18a3..014ec88eb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java
@@ -56,7 +56,6 @@ public class LocalMedianThreshold<T extends RealType<T>> implements
 	@OpDependency(name = "threshold.localMedian")
 	private Computers.Arity3<Iterable<T>, T, Double, BitType> computeThresholdOp;
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -66,6 +65,7 @@ public class LocalMedianThreshold<T extends RealType<T>> implements
 	 * @param outOfBoundsFactory
 	 * @param output
 	 */
+	@Override
 	public void compute(final RandomAccessibleInterval<T> input,
 		final Shape inputNeighborhoodShape, final Double c,
 		final OutOfBoundsFactory<T, RandomAccessibleInterval<T>> outOfBoundsFactory,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java
index 02510014b..744469f59 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java
@@ -56,13 +56,13 @@ public class ComputeMaxLikelihoodThreshold<T extends RealType<T>> extends
 
 	private static final int MAX_ATTEMPTS = 10000;
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param inputHistogram
 	 * @param output
 	 */
+	@Override
 	public long computeBin(final Histogram1d<T> hist) {
 		final long[] histogram = hist.toLongArray();
 		return computeBin(histogram);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java
index ba331a5cb..17bc402c3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java
@@ -51,13 +51,13 @@ public class ComputeMeanThreshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param inputHistogram
 	 * @param output
 	 */
+	@Override
 	public long computeBin(final Histogram1d<T> hist) {
 		final long[] histogram = hist.toLongArray();
 		return computeBin(histogram);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java
index 57a08b081..cb1cd8a17 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java
@@ -56,13 +56,13 @@ public class ComputeMinErrorThreshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param inputHistogram
 	 * @param output
 	 */
+	@Override
 	public long computeBin(final Histogram1d<T> hist) {
 		final long[] histogram = hist.toLongArray();
 		return computeBin(histogram);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java
index 2d0cf5f3f..a7bf2e3cb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java
@@ -53,13 +53,13 @@ public class ComputeMinimumThreshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param inputHistogram
 	 * @param output
 	 */
+	@Override
 	public long computeBin(final Histogram1d<T> hist) {
 		final long[] histogram = hist.toLongArray();
 		return computeBin(histogram);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java
index 4a267d58d..3e52dd801 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java
@@ -52,13 +52,13 @@ public class ComputeMomentsThreshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param inputHistogram
 	 * @param output
 	 */
+	@Override
 	public long computeBin(final Histogram1d<T> hist) {
 		final long[] histogram = hist.toLongArray();
 		return computeBin(histogram);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java
index 7d7742854..4f9830001 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java
@@ -52,13 +52,13 @@ public class ComputeOtsuThreshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param inputHistogram
 	 * @param output
 	 */
+	@Override
 	public long computeBin(final Histogram1d<T> hist) {
 		final long[] histogram = hist.toLongArray();
 		return computeBin(histogram);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java
index 3d6207eba..3a19d9e2b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java
@@ -52,13 +52,13 @@
 @Plugin(type = Op.class, name = "threshold.rosin", priority = Priority.HIGH)
 public class ComputeRosinThreshold<T extends RealType<T>> extends AbstractComputeThresholdHistogram<T> {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param inputHistogram
 	 * @param output
 	 */
+	@Override
 	public long computeBin(final Histogram1d<T> histo) {
 		final long[] hist = histo.toLongArray();
 		return computeBin(hist);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java
index a68358404..93378a921 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java
@@ -52,13 +52,13 @@ public class ComputeShanbhagThreshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param inputHistogram
 	 * @param output
 	 */
+	@Override
 	public long computeBin(final Histogram1d<T> hist) {
 		final long[] histogram = hist.toLongArray();
 		return computeBin(histogram);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java
index 2e06d3520..415f37ec6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java
@@ -53,13 +53,13 @@ public class ComputeTriangleThreshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param inputHistogram
 	 * @param output
 	 */
+	@Override
 	public long computeBin(final Histogram1d<T> hist) {
 		final long[] histogram = hist.toLongArray();
 		return computeBin(histogram);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java
index 0bff00d11..cff32acfb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java
@@ -53,13 +53,13 @@ public class ComputeYenThreshold<T extends RealType<T>> extends
 	AbstractComputeThresholdHistogram<T>
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
 	 * @param inputHistogram
 	 * @param output
 	 */
+	@Override
 	public long computeBin(final Histogram1d<T> hist) {
 		final long[] histogram = hist.toLongArray();
 		return computeBin(histogram);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java
index 4c6ef5303..f8d81da9b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java
@@ -331,7 +331,6 @@ class DefaultBoxCount<B extends BooleanType<B>> implements
 	Functions.Arity5<RandomAccessibleInterval<B>, Long, Long, Double, Long, List<ValuePair<DoubleType, DoubleType>>>
 {
 
-	@Override
 	/**
 	 * TODO
 	 *
@@ -342,6 +341,7 @@ class DefaultBoxCount<B extends BooleanType<B>> implements
 	 * @param gridMoves
 	 * @return the output
 	 */
+	@Override
 	public List<ValuePair<DoubleType, DoubleType>> apply(
 		RandomAccessibleInterval<B> input, Long maxSize, Long minSize,
 		Double scaling, Long gridMoves)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java
index 3d3287d5c..e0e6f95a6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java
@@ -91,13 +91,13 @@ public class EulerCharacteristic26N<B extends BooleanType<B>>
              0, -1, -1,  0, -1,  0,  2,  1, -1,  2,  0,  1,  0,  1,  1,  0
     };
 
-    @Override
-	/**
+   	/**
 	 * TODO
 	 *
 	 * @param interval
 	 * @param output
 	 */
+ @Override
     public void compute(RandomAccessibleInterval<B> interval, DoubleType output) {
     	if(interval.numDimensions() != 3) throw new IllegalArgumentException("Input must have 3 dimensions!");
         final RandomAccess<B> access = interval.randomAccess();
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java
index 5402913c1..f810acf71 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java
@@ -213,13 +213,13 @@ public class EulerCharacteristic26NFloating
     }
     //endregion
 
-    @Override
-	/**
+   	/**
 	 * TODO
 	 *
 	 * @param interval
 	 * @param output
 	 */
+ @Override
     public void compute(RandomAccessibleInterval<B> interval, DoubleType output) {
     	if(interval.numDimensions() != 3) throw new IllegalArgumentException("Input must have 3 dimensions!");
         final Octant<B> octant = new Octant<>(interval);
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java
index bd17dd978..39e0af8f9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java
@@ -74,13 +74,13 @@
 public class EulerCorrection<B extends BooleanType<B>>
         implements Computers.Arity1<RandomAccessibleInterval<B>, DoubleType> {
 
-    @Override
-	/**
+   	/**
 	 * TODO
 	 *
 	 * @param input
 	 * @param output
 	 */
+ @Override
     public void compute(RandomAccessibleInterval<B> interval, DoubleType output) {
     	if(interval.numDimensions() != 3) throw new IllegalArgumentException("Input must have 3 dimensions!");
         final Traverser<B> traverser = new Traverser<>(interval);
diff --git a/remove-params.sh b/remove-params.sh
index 450fa2417..c07cebcde 100644
--- a/remove-params.sh
+++ b/remove-params.sh
@@ -4,5 +4,6 @@
 #perl -0777 -i -pe 's/ \*\/\n([\s]*[\*])/\1/igs' **/*.java
 #perl -0777 -i -pe 's/ \*\/\n([\s]*\@Parameter)/\1/igs' **/*.java
 #perl -0777 -i -pe 's/ \*\/\n([\s]*\/\/[\s]*\*)/\1/igs' **/*.java
-perl -0777 -i -pe 's/ \* \@param output([^\n]*\n[\s]*\*\/\n[\s]*public[^\(]*apply\()/ \* \@return the output\1/igs' **/*.java
+#perl -0777 -i -pe 's/ \* \@param output([^\n]*\n[\s]*\*\/\n[\s]*public[^\(]*apply\()/ \* \@return the output\1/igs' **/*.java
+perl -0777 -i -pe 's/(\s\@Override[^\n]*)\n([\s]*\/\*\*[^\/]*\/)/\2\n\1/igs' **/*.java
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java
index 69e9d464e..cf0938da8 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java
@@ -15,14 +15,14 @@ public class Normalize {
 	@Plugin(type = Op.class, name = NAMES)
 	public static class MathMinMaxNormalizeFunction implements Functions.Arity3<double[], Double, Double, double[]> {
 
-		@Override
-		/**
+			/**
 		 * TODO
 		 * 
 		 * @param numbers
 		 * @param newMin
 		 * @param newMax
 		 */
+	@Override
 		public double[] apply(double[] t, Double newMin, Double newMax) {
 			if (newMax == null) {
 				newMax = 1.0;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java
index 27081c026..c173c46ed 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java
@@ -25,12 +25,12 @@ public static class MeanFunction <N, O> implements Function<Iterable<N>, O>{
 		 * @param iterable the set of data to operate on
 		 * @return the mean of the data
 		 */
-		@Override
-		/**
+			/**
 		 * TODO
 		 * 
 		 * @param iterable
 		 */
+	@Override
 		public O apply(Iterable<N> iterable) {
 			return divFunc.apply(sumFunc.apply(iterable), sizeFunc.apply(iterable));
 		}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Size.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Size.java
index 1986a829f..7119fd12e 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Size.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Size.java
@@ -16,13 +16,13 @@ public static class StatsSizeFunction<T> implements Function<Iterable<T>, Long>{
 		 * @param iterable the data to operate over
 		 * @return the size of the dataset
 		 */
-		@Override
-		/**
+			/**
 		 * TODO
 		 * 
 		 * @param iterable
 		 * @param size
 		 */
+	@Override
 		public Long apply(Iterable<T> iterable) {
 			return StreamSupport.stream(iterable.spliterator(), false).count();
 		}
@@ -31,13 +31,13 @@ public Long apply(Iterable<T> iterable) {
 	   @Plugin(type = Op.class, name = "stats.size")
 	    public static class StatsSizeFunctionDouble<T> implements Function<Iterable<T>, Double>{
 
-	        @Override
-	        /**
+	       	        /**
 	         * TODO
 	         * 
 	         * @param iterable
 	         * @param size
 	         */
+ @Override
 	        public Double apply(Iterable<T> iterable) {
 	            return (double) StreamSupport.stream(iterable.spliterator(), false).count();
 	        }

From 61d959d1db7289f5fe4729a976d07c0cd970607c Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 19 Mar 2021 10:36:03 -0500
Subject: [PATCH 13/91] Remove unused ItemIO imports

These imports were used by the @Parameter declarations; since we removed
those declarations we can also remove the imports
---
 .../src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java          | 1 -
 .../java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java  | 1 -
 .../main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java    | 1 -
 .../main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java   | 1 -
 .../java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java    | 1 -
 .../src/main/java/net/imagej/ops2/convert/ConvertTypes.java     | 1 -
 .../src/main/java/net/imagej/ops2/convert/Converters.java       | 1 -
 .../main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java   | 1 -
 .../main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java   | 1 -
 .../src/main/java/net/imagej/ops2/copy/CopyArrayImg.java        | 1 -
 .../imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java  | 1 -
 .../imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java | 1 -
 .../src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java     | 1 -
 .../src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java | 1 -
 .../imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java | 1 -
 .../src/main/java/net/imagej/ops2/copy/CopyType.java            | 1 -
 .../src/main/java/net/imagej/ops2/create/CreateTypes.java       | 1 -
 .../java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java | 1 -
 .../imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java | 1 -
 .../main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java   | 1 -
 .../net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java    | 1 -
 .../main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java   | 1 -
 .../main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java | 1 -
 .../java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java | 1 -
 .../java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java   | 1 -
 .../imagej/ops2/deconvolve/accelerate/VectorAccelerator.java    | 1 -
 .../src/main/java/net/imagej/ops2/eval/DefaultEval.java         | 1 -
 .../main/java/net/imagej/ops2/features/haralick/DefaultASM.java | 1 -
 .../imagej/ops2/features/haralick/DefaultClusterPromenence.java | 1 -
 .../net/imagej/ops2/features/haralick/DefaultClusterShade.java  | 1 -
 .../java/net/imagej/ops2/features/haralick/DefaultContrast.java | 1 -
 .../net/imagej/ops2/features/haralick/DefaultCorrelation.java   | 1 -
 .../imagej/ops2/features/haralick/DefaultDifferenceEntropy.java | 1 -
 .../ops2/features/haralick/DefaultDifferenceVariance.java       | 1 -
 .../java/net/imagej/ops2/features/haralick/DefaultEntropy.java  | 1 -
 .../java/net/imagej/ops2/features/haralick/DefaultICM1.java     | 1 -
 .../java/net/imagej/ops2/features/haralick/DefaultICM2.java     | 1 -
 .../java/net/imagej/ops2/features/haralick/DefaultIFDM.java     | 1 -
 .../imagej/ops2/features/haralick/DefaultMaxProbability.java    | 1 -
 .../net/imagej/ops2/features/haralick/DefaultSumAverage.java    | 1 -
 .../net/imagej/ops2/features/haralick/DefaultSumEntropy.java    | 1 -
 .../net/imagej/ops2/features/haralick/DefaultSumVariance.java   | 1 -
 .../ops2/features/haralick/DefaultTextureHomogeneity.java       | 1 -
 .../java/net/imagej/ops2/features/haralick/DefaultVariance.java | 1 -
 .../java/net/imagej/ops2/features/haralick/helper/CoocHXY.java  | 1 -
 .../net/imagej/ops2/features/haralick/helper/CoocMeanX.java     | 1 -
 .../net/imagej/ops2/features/haralick/helper/CoocMeanY.java     | 1 -
 .../java/net/imagej/ops2/features/haralick/helper/CoocPX.java   | 1 -
 .../net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java  | 1 -
 .../net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java   | 1 -
 .../java/net/imagej/ops2/features/haralick/helper/CoocPY.java   | 1 -
 .../java/net/imagej/ops2/features/haralick/helper/CoocStdX.java | 1 -
 .../java/net/imagej/ops2/features/haralick/helper/CoocStdY.java | 1 -
 .../ops2/features/hog/HistogramOfOrientedGradients2D.java       | 1 -
 .../main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java  | 1 -
 .../imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java | 1 -
 .../imagej/ops2/features/tamura2d/DefaultContrastFeature.java   | 1 -
 .../ops2/features/tamura2d/DefaultDirectionalityFeature.java    | 1 -
 .../imagej/ops2/features/zernike/DefaultMagnitudeFeature.java   | 1 -
 .../net/imagej/ops2/features/zernike/DefaultPhaseFeature.java   | 1 -
 .../imagej/ops2/features/zernike/helper/ZernikeComputer.java    | 1 -
 .../java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java | 1 -
 .../main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java  | 1 -
 .../java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java | 1 -
 .../main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java | 1 -
 .../main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java | 1 -
 .../java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java    | 1 -
 .../java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java    | 1 -
 .../java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java    | 1 -
 .../java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java    | 1 -
 .../net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java | 1 -
 .../imagej/ops2/filter/derivative/PartialDerivativesRAI.java    | 1 -
 .../ops2/filter/derivativeGauss/DefaultDerivativeGauss.java     | 1 -
 .../src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java    | 1 -
 .../main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java  | 1 -
 .../java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java | 1 -
 .../src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java | 1 -
 .../src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java | 1 -
 .../net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java   | 1 -
 .../java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java     | 1 -
 .../net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java   | 1 -
 .../src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java   | 1 -
 .../main/java/net/imagej/ops2/filter/hessian/HessianRAI.java    | 1 -
 .../main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java   | 1 -
 .../main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java   | 1 -
 .../main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java  | 1 -
 .../java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java     | 1 -
 .../java/net/imagej/ops2/filter/median/DefaultMedianFilter.java | 1 -
 .../main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java  | 1 -
 .../java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java     | 1 -
 .../net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java    | 1 -
 .../src/main/java/net/imagej/ops2/filter/pad/PadInput.java      | 1 -
 .../java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java     | 1 -
 .../main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java    | 1 -
 .../net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java    | 1 -
 .../net/imagej/ops2/filter/pad/PaddingIntervalCentered.java     | 1 -
 .../java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java  | 1 -
 .../java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java   | 1 -
 .../src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java    | 1 -
 .../java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java   | 1 -
 .../net/imagej/ops2/filter/variance/DefaultVarianceFilter.java  | 1 -
 .../java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java   | 1 -
 .../src/main/java/net/imagej/ops2/geom/CentroidII.java          | 1 -
 .../src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java | 1 -
 .../src/main/java/net/imagej/ops2/geom/CentroidMesh.java        | 1 -
 .../src/main/java/net/imagej/ops2/geom/CentroidPolygon.java     | 1 -
 .../main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java  | 1 -
 .../imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java  | 1 -
 .../ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java  | 1 -
 .../java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java    | 1 -
 .../net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java     | 1 -
 .../java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java    | 1 -
 .../main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java   | 1 -
 .../java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java   | 1 -
 .../net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java    | 1 -
 .../java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java   | 1 -
 .../java/net/imagej/ops2/geom/geom2d/DefaultElongation.java     | 1 -
 .../java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java    | 1 -
 .../java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java | 1 -
 .../imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java  | 1 -
 .../main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java | 1 -
 .../java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java   | 1 -
 .../net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java   | 1 -
 .../imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java    | 1 -
 .../java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java   | 1 -
 .../net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java   | 1 -
 .../imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java    | 1 -
 .../main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java | 1 -
 .../java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java | 1 -
 .../net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java     | 1 -
 .../main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java | 1 -
 .../imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java   | 1 -
 .../java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java    | 1 -
 .../ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java     | 1 -
 .../net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java     | 1 -
 .../ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java | 1 -
 .../imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java    | 1 -
 .../java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java   | 1 -
 .../java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java    | 1 -
 .../java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java   | 1 -
 .../java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java  | 1 -
 .../net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java     | 1 -
 .../net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java | 1 -
 .../java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java | 1 -
 .../java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java  | 1 -
 .../net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java    | 1 -
 .../java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java   | 1 -
 .../java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java  | 1 -
 .../java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java     | 1 -
 .../java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java    | 1 -
 .../ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java      | 1 -
 .../ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java    | 1 -
 .../net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java   | 1 -
 .../imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java    | 1 -
 .../java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java     | 1 -
 .../java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java | 1 -
 .../src/main/java/net/imagej/ops2/help/HelpForName.java         | 1 -
 .../src/main/java/net/imagej/ops2/identity/DefaultIdentity.java | 1 -
 .../src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java | 1 -
 .../ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java       | 1 -
 .../image/distancetransform/CalibratedDistanceTransformer.java  | 1 -
 .../distancetransform/DefaultDistanceTransformCalibration.java  | 1 -
 .../ops2/image/distancetransform/DistanceTransformer.java       | 1 -
 .../imagej/ops2/image/equation/DefaultCoordinatesEquation.java  | 1 -
 .../java/net/imagej/ops2/image/equation/DefaultEquation.java    | 1 -
 .../src/main/java/net/imagej/ops2/image/fill/DefaultFill.java   | 1 -
 .../src/main/java/net/imagej/ops2/image/fill/FillRAI.java       | 1 -
 .../java/net/imagej/ops2/image/histogram/HistogramCreate.java   | 1 -
 .../java/net/imagej/ops2/image/integral/DefaultIntegralImg.java | 1 -
 .../java/net/imagej/ops2/image/integral/SquareIntegralImg.java  | 1 -
 .../java/net/imagej/ops2/image/integral/WrappedIntegralImg.java | 1 -
 .../src/main/java/net/imagej/ops2/image/invert/InvertII.java    | 1 -
 .../main/java/net/imagej/ops2/image/invert/InvertIIInteger.java | 1 -
 .../net/imagej/ops2/image/normalize/NormalizeIIComputer.java    | 1 -
 .../net/imagej/ops2/image/normalize/NormalizeIIFunction.java    | 1 -
 .../java/net/imagej/ops2/image/normalize/NormalizeIILazy.java   | 1 -
 .../imagej/ops2/image/normalize/NormalizeIILazyFunction.java    | 1 -
 .../main/java/net/imagej/ops2/image/watershed/Watershed.java    | 1 -
 .../java/net/imagej/ops2/image/watershed/WatershedBinary.java   | 1 -
 .../imagej/ops2/image/watershed/WatershedBinarySingleSigma.java | 1 -
 .../java/net/imagej/ops2/image/watershed/WatershedSeeded.java   | 1 -
 .../imagemoments/centralmoments/DefaultCentralMoment00.java     | 1 -
 .../imagemoments/centralmoments/DefaultCentralMoment01.java     | 1 -
 .../imagemoments/centralmoments/DefaultCentralMoment02.java     | 1 -
 .../imagemoments/centralmoments/DefaultCentralMoment03.java     | 1 -
 .../imagemoments/centralmoments/DefaultCentralMoment10.java     | 1 -
 .../imagemoments/centralmoments/DefaultCentralMoment11.java     | 1 -
 .../imagemoments/centralmoments/DefaultCentralMoment12.java     | 1 -
 .../imagemoments/centralmoments/DefaultCentralMoment20.java     | 1 -
 .../imagemoments/centralmoments/DefaultCentralMoment21.java     | 1 -
 .../imagemoments/centralmoments/DefaultCentralMoment30.java     | 1 -
 .../imagemoments/centralmoments/IterableCentralMoment00.java    | 1 -
 .../imagemoments/centralmoments/IterableCentralMoment11.java    | 1 -
 .../java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java  | 1 -
 .../java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java  | 1 -
 .../java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java  | 1 -
 .../java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java  | 1 -
 .../java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java  | 1 -
 .../java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java  | 1 -
 .../java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java  | 1 -
 .../net/imagej/ops2/imagemoments/moments/DefaultMoment00.java   | 1 -
 .../net/imagej/ops2/imagemoments/moments/DefaultMoment01.java   | 1 -
 .../net/imagej/ops2/imagemoments/moments/DefaultMoment10.java   | 1 -
 .../net/imagej/ops2/imagemoments/moments/DefaultMoment11.java   | 1 -
 .../DefaultNormalizedCentralMoment02.java                       | 1 -
 .../DefaultNormalizedCentralMoment03.java                       | 1 -
 .../DefaultNormalizedCentralMoment11.java                       | 1 -
 .../DefaultNormalizedCentralMoment12.java                       | 1 -
 .../DefaultNormalizedCentralMoment20.java                       | 1 -
 .../DefaultNormalizedCentralMoment21.java                       | 1 -
 .../DefaultNormalizedCentralMoment30.java                       | 1 -
 .../src/main/java/net/imagej/ops2/labeling/MergeLabeling.java   | 1 -
 .../src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java  | 1 -
 .../src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java  | 1 -
 .../src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java   | 1 -
 .../src/main/java/net/imagej/ops2/logic/Default.java            | 1 -
 .../src/main/java/net/imagej/ops2/logic/Ternary.java            | 1 -
 .../imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java    | 1 -
 .../imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java | 1 -
 .../main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java   | 1 -
 .../src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java  | 1 -
 .../main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java  | 1 -
 .../imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java   | 1 -
 .../java/net/imagej/ops2/morphology/DistanceTransforms.java     | 1 -
 .../src/main/java/net/imagej/ops2/morphology/ExtractHoles.java  | 1 -
 .../src/main/java/net/imagej/ops2/morphology/FillHoles.java     | 1 -
 .../src/main/java/net/imagej/ops2/morphology/FloodFills.java    | 1 -
 .../src/main/java/net/imagej/ops2/morphology/Outline.java       | 1 -
 .../src/main/java/net/imagej/ops2/morphology/Table2Ds.java      | 1 -
 .../main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java  | 1 -
 .../main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java | 1 -
 .../java/net/imagej/ops2/morphology/thin/ThinMorphological.java | 1 -
 .../java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java     | 1 -
 .../java/net/imagej/ops2/project/DefaultProjectParallel.java    | 1 -
 .../net/imagej/ops2/project/ProjectRAIToIterableInterval.java   | 1 -
 .../ops2/segment/detectJunctions/DefaultDetectJunctions.java    | 1 -
 .../imagej/ops2/segment/detectRidges/DefaultDetectRidges.java   | 1 -
 .../src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java       | 1 -
 .../main/java/net/imagej/ops2/stats/DefaultGeometricMean.java   | 1 -
 .../main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java    | 1 -
 .../src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java    | 1 -
 .../src/main/java/net/imagej/ops2/stats/DefaultMax.java         | 1 -
 .../src/main/java/net/imagej/ops2/stats/DefaultMean.java        | 1 -
 .../src/main/java/net/imagej/ops2/stats/DefaultMedian.java      | 1 -
 .../src/main/java/net/imagej/ops2/stats/DefaultMin.java         | 1 -
 .../src/main/java/net/imagej/ops2/stats/DefaultMinMax.java      | 1 -
 .../java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java     | 1 -
 .../java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java     | 1 -
 .../java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java     | 1 -
 .../java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java     | 1 -
 .../java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java     | 1 -
 .../src/main/java/net/imagej/ops2/stats/DefaultPercentile.java  | 1 -
 .../src/main/java/net/imagej/ops2/stats/DefaultQuantile.java    | 1 -
 .../src/main/java/net/imagej/ops2/stats/DefaultSize.java        | 1 -
 .../src/main/java/net/imagej/ops2/stats/DefaultSkewness.java    | 1 -
 .../java/net/imagej/ops2/stats/DefaultStandardDeviation.java    | 1 -
 .../src/main/java/net/imagej/ops2/stats/DefaultSum.java         | 1 -
 .../main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java   | 1 -
 .../src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java   | 1 -
 .../main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java    | 1 -
 .../src/main/java/net/imagej/ops2/stats/DefaultVariance.java    | 1 -
 .../src/main/java/net/imagej/ops2/stats/IntegralMean.java       | 1 -
 .../src/main/java/net/imagej/ops2/stats/IntegralSum.java        | 1 -
 .../src/main/java/net/imagej/ops2/stats/IntegralVariance.java   | 1 -
 .../main/java/net/imagej/ops2/stats/IterableGeometricMean.java  | 1 -
 .../main/java/net/imagej/ops2/stats/IterableHarmonicMean.java   | 1 -
 .../src/main/java/net/imagej/ops2/stats/IterableMax.java        | 1 -
 .../src/main/java/net/imagej/ops2/stats/IterableMean.java       | 1 -
 .../src/main/java/net/imagej/ops2/stats/IterableMin.java        | 1 -
 .../src/main/java/net/imagej/ops2/stats/IterableMinMax.java     | 1 -
 .../java/net/imagej/ops2/stats/IterableMoment3AboutMean.java    | 1 -
 .../java/net/imagej/ops2/stats/IterableMoment4AboutMean.java    | 1 -
 .../src/main/java/net/imagej/ops2/stats/IterableSize.java       | 1 -
 .../java/net/imagej/ops2/stats/IterableStandardDeviation.java   | 1 -
 .../src/main/java/net/imagej/ops2/stats/IterableSum.java        | 1 -
 .../main/java/net/imagej/ops2/stats/IterableSumOfInverses.java  | 1 -
 .../src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java  | 1 -
 .../main/java/net/imagej/ops2/stats/IterableSumOfSquares.java   | 1 -
 .../src/main/java/net/imagej/ops2/stats/IterableVariance.java   | 1 -
 .../net/imagej/ops2/stats/regression/leastSquares/Quadric.java  | 1 -
 .../java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java | 1 -
 .../java/net/imagej/ops2/thread/chunker/DefaultChunker.java     | 1 -
 .../imagej/ops2/threshold/AbstractApplyThresholdIterable.java   | 2 --
 .../net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java    | 1 -
 .../net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java | 1 -
 .../imagej/ops2/threshold/apply/ApplyThresholdComparable.java   | 1 -
 .../imagej/ops2/threshold/apply/ApplyThresholdComparator.java   | 1 -
 .../net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java  | 1 -
 .../java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java | 1 -
 .../ops2/threshold/intermodes/ComputeIntermodesThreshold.java   | 1 -
 .../imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java  | 1 -
 .../java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java   | 1 -
 .../threshold/localBernsen/ComputeLocalBernsenThreshold.java    | 1 -
 .../ops2/threshold/localBernsen/LocalBernsenThreshold.java      | 1 -
 .../threshold/localContrast/ComputeLocalContrastThreshold.java  | 1 -
 .../ops2/threshold/localContrast/LocalContrastThreshold.java    | 1 -
 .../ops2/threshold/localMean/ComputeLocalMeanThreshold.java     | 1 -
 .../threshold/localMean/ComputeLocalMeanThresholdIntegral.java  | 1 -
 .../net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java | 1 -
 .../ops2/threshold/localMedian/ComputeLocalMedianThreshold.java | 1 -
 .../imagej/ops2/threshold/localMedian/LocalMedianThreshold.java | 1 -
 .../threshold/localMidGrey/ComputeLocalMidGreyThreshold.java    | 1 -
 .../ops2/threshold/localMidGrey/LocalMidGreyThreshold.java      | 1 -
 .../threshold/localNiblack/ComputeLocalNiblackThreshold.java    | 1 -
 .../localNiblack/ComputeLocalNiblackThresholdIntegral.java      | 1 -
 .../ops2/threshold/localNiblack/LocalNiblackThreshold.java      | 1 -
 .../localPhansalkar/ComputeLocalPhansalkarThreshold.java        | 1 -
 .../ComputeLocalPhansalkarThresholdIntegral.java                | 1 -
 .../threshold/localPhansalkar/LocalPhansalkarThreshold.java     | 1 -
 .../threshold/localSauvola/ComputeLocalSauvolaThreshold.java    | 1 -
 .../localSauvola/ComputeLocalSauvolaThresholdIntegral.java      | 1 -
 .../ops2/threshold/localSauvola/LocalSauvolaThreshold.java      | 1 -
 .../ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java   | 1 -
 .../threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java  | 1 -
 .../net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java    | 1 -
 .../ops2/threshold/minError/ComputeMinErrorThreshold.java       | 1 -
 .../imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java  | 1 -
 .../imagej/ops2/threshold/moments/ComputeMomentsThreshold.java  | 1 -
 .../net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java    | 1 -
 .../ops2/threshold/percentile/ComputePercentileThreshold.java   | 1 -
 .../threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java    | 1 -
 .../net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java  | 1 -
 .../ops2/threshold/shanbhag/ComputeShanbhagThreshold.java       | 1 -
 .../ops2/threshold/triangle/ComputeTriangleThreshold.java       | 1 -
 .../java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java | 1 -
 .../src/main/java/net/imagej/ops2/topology/BoxCount.java        | 1 -
 .../topology/eulerCharacteristic/EulerCharacteristic26N.java    | 1 -
 .../eulerCharacteristic/EulerCharacteristic26NFloating.java     | 1 -
 .../ops2/topology/eulerCharacteristic/EulerCorrection.java      | 1 -
 .../main/java/org/scijava/ops/create/CreateOpCollection.java    | 1 -
 .../src/main/java/org/scijava/ops/math/MathOpCollection.java    | 1 -
 .../src/main/java/org/scijava/ops/math/Normalize.java           | 1 -
 .../java/org/scijava/param/DefaultMutableParameterMember.java   | 1 +
 .../src/main/java/org/scijava/param/FunctionalMethodType.java   | 1 +
 .../src/test/java/org/scijava/ops/OpEnvironmentTest.java        | 1 -
 .../scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java | 1 -
 .../src/test/java/org/scijava/ops/OpMethodTestOps.java          | 1 -
 .../src/test/java/org/scijava/ops/OpPriorityTest.java           | 1 -
 scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java  | 1 -
 .../java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java    | 1 -
 .../src/test/java/org/scijava/ops/monitor/OpMonitorTest.java    | 1 -
 .../src/test/java/org/scijava/ops/util/OpsAsParametersTest.java | 1 -
 .../src/test/java/org/scijava/param/JavadocParameterTest.java   | 1 -
 343 files changed, 2 insertions(+), 342 deletions(-)

diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java
index ea414ce8e..77ba621b1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java
@@ -41,7 +41,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * This algorithm calculates Li et al.'s ICQ (intensity correlation quotient).
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java
index cb3fd0165..e4acb798b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java
@@ -40,7 +40,6 @@
 
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * This algorithm calculates Kendall's Tau-b rank correlation coefficient
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java
index a51bc5f5a..06610fad5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java
@@ -53,7 +53,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 import org.scijava.util.IntArray;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java
index 93481206c..e2d059afe 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java
@@ -52,7 +52,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * This algorithm repeatedly executes a colocalization algorithm, computing a
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java
index 95d1e3fbe..119249d3d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java
@@ -37,7 +37,6 @@
 
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * A class that represents the mean calculation of the two source images in the
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java
index aa5315bba..42ed0532f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java
@@ -56,7 +56,6 @@
 import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Converters for converting between Complex types
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java
index be0838cf0..0cfec5064 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java
@@ -10,7 +10,6 @@
 import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 @Plugin(type = OpCollection.class)
 public class Converters<I, O extends Type<O>> {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java
index 6d758be3e..12fd44582 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java
@@ -35,7 +35,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Copies the value of one {@link RealType} to another, and clips values which
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java
index b50fec211..25fbdef37 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java
@@ -35,7 +35,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Copies the value of one {@link RealType} into another using {@code double}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java
index 51fdeeeb4..e432081f6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java
@@ -43,7 +43,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Copying {@link ArrayImg} into another {@link ArrayImg}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java
index f27ac4817..98a7f9051 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.ops.util.Maps;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Copies an {@link IterableInterval} into another {@link IterableInterval}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java
index bbbf49310..cf5095a2b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Copying {@link Img} into another {@link Img}. Exists mainly for convenience
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java
index 776bcc748..0c2396ee7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java
@@ -42,7 +42,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Copying {@link ImgLabeling} into another {@link ImgLabeling}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java
index b03d11bf6..e222106e9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Copies a {@link LabelingMapping} into another {@link LabelingMapping}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java
index 8e6ee8a1b..cde9a0502 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Copies a {@link RandomAccessibleInterval} into another
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java
index b36534779..05091042a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java
@@ -35,7 +35,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Copy {@link Type} to another {@link Type}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java
index e92f27c8c..0284a33b9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java
@@ -23,7 +23,6 @@
 import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 @Plugin(type = OpCollection.class)
 public class CreateTypes {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java
index fb749d97c..61f4e6dbe 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java
@@ -46,7 +46,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Calculate non-circulant first guess. This is used as part of the Boundary
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java
index a0066200a..96b3a708c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java
@@ -54,7 +54,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Calculate non-circulant normalization factor. This is used as part of the
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java
index 33285ea51..dc38791cd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java
@@ -49,7 +49,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Richardson Lucy algorithm for (@link RandomAccessibleInterval) (Lucy, L. B.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java
index 6ff12742d..88a3c09e5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java
@@ -48,7 +48,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Computes Richardson Lucy correction factor for (@link
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java
index 580c4518a..675247b3d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java
@@ -51,7 +51,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Richardson Lucy function op that operates on (@link RandomAccessibleInterval)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java
index b18ecaaa4..84970386b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java
@@ -52,7 +52,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Richardson Lucy with total variation function op that operates on (@link
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java
index 085ca3849..6cfcd7e31 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java
@@ -49,7 +49,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Implements update step for Richardson-Lucy algorithm with total variation
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java
index dd05d356a..f935f3595 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Implements update step for Richardson-Lucy algorithm on
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java
index 175f4c73b..304bff97e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java
@@ -50,7 +50,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.ops.util.Adapt;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Vector Accelerator implements acceleration scheme described in Acceleration
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java
index 120f55e44..267ac66b8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java
@@ -36,7 +36,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Evaluates an expression.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java
index 38fa0e2d9..fac2492a4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java
@@ -35,7 +35,6 @@
 
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java
index f77f984d5..514beb672 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java
index 81da5e7d3..21acc51b1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Implementation of Cluster Shade Haralick Feature
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java
index 0e5cea21a..9cf3a7563 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java
index d66e84768..861f91bf7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java
index 3c44f14dd..a470cb1dc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java
index c50a010a9..5ddc6258e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java
index ebaece148..01549ac90 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java
@@ -35,7 +35,6 @@
 
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java
index efe37c373..b6dc94184 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java
@@ -41,7 +41,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Implementation of Information Measure of Correlation 1 Haralick Feature
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java
index 4e3a2b90a..7d90b1835 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java
@@ -41,7 +41,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Implementation of Information Measure of Correlation 2 Haralick Feature
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java
index 66ce43cff..964fba7c7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java
@@ -35,7 +35,6 @@
 
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Implementation of Inverse Difference Moment Haralick Feature based on
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java
index 27349b55c..cfa41f0c7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java
@@ -35,7 +35,6 @@
 
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Implementation of Maximum Probability Haralick Feature
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java
index 29bb1aa4c..2ce292067 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Implementation of Sum Average Haralick Feature
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java
index 250bbc365..4d4a17d21 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java
index 240b9f3e4..b74f2e3e8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java
@@ -41,7 +41,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Implementation of Sum Variance Haralick Feature according to
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java
index 89b40d484..9e16eac80 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java
@@ -36,7 +36,6 @@
 
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Implementation of Texture Homogeneity Haralick Feature
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java
index 9389956e5..6f5ae7a83 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java
@@ -36,7 +36,6 @@
 
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Implementation of Variance Haralick Feature based on
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java
index 8c3f7993d..b37c590e8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java
@@ -34,7 +34,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * NB: Helper class. Internal usage only.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java
index ecf5009d6..43a742f6c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java
@@ -35,7 +35,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * NB: Helper class. Internal usage only.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java
index df23eda06..a6ccb65c0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java
@@ -36,7 +36,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * NB: Helper class. Internal usage only.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java
index 9637dc891..b6a711f38 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java
@@ -32,7 +32,6 @@
 
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * NB: Helper class. Internal usage only.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java
index edbde81f1..b79869a27 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java
@@ -32,7 +32,6 @@
 
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * NB: Helper class. Internal usage only.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java
index b1ef25aca..97c9cccce 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java
@@ -32,7 +32,6 @@
 
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * NB: Helper class. Internal usage only.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java
index 0ad0e34d4..b84c82366 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java
@@ -32,7 +32,6 @@
 
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * NB: Helper class. Internal usage only.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java
index 0066a5eff..fc24e7851 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java
@@ -35,7 +35,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * NB: Helper class. Internal usage only.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java
index 9c22c8ed1..6c40c7b96 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java
@@ -36,7 +36,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * NB: Helper class. Internal usage only.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java
index 59055358b..d557fb9d6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java
@@ -63,7 +63,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Calculates a histogram of oriented gradients which is a feature descriptor.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java
index 33d25d0ef..f7f35a782 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java
@@ -47,7 +47,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Default implementation of 2d local binary patterns
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java
index bc7fc5dc8..335d7a3e0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java
@@ -52,7 +52,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java
index 2e51b720b..04b2c2bbc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Default implementation of tamura feature contrast.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java
index 0f530f475..202b29e58 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java
@@ -49,7 +49,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Implementation of Tamura's Directionality Feature
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java
index 7652c87b8..9252f17d4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java
index db584d0c3..4937afbb8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java
index 7ef4fabc2..f51bcf457 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java
@@ -37,7 +37,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java
index 738a2a2b3..0a07487c5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java
@@ -44,7 +44,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Convolve op for (@link RandomAccessibleInterval)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java
index 8d301483f..2b2970849 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java
@@ -41,7 +41,6 @@
 import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Contains Ops designed to add noise to populated images.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java
index eca555dbf..9945b4933 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java
@@ -44,7 +44,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Performs a bilateral filter on an image.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java
index 5f89f5738..6d1d1d78e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java
@@ -41,7 +41,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Convolve op for (@link RandomAccessibleInterval)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java
index d508fdedd..ad271293d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java
@@ -51,7 +51,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Convolve op for (@link Img)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java
index 8055e2969..afbc123ab 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java
@@ -42,7 +42,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Convolves an image naively.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java
index fe0345a0f..fd21790dd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java
@@ -49,7 +49,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Convolves an image naively (no FFTs).
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java
index 8c6285af5..638438f16 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Correlate op for (@link RandomAccessibleInterval)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java
index 4a25c9f2c..f29971d66 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java
@@ -48,7 +48,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Correlate op for (@link Img)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java
index c3a1f344a..89d7a3c35 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java
@@ -45,7 +45,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Calculates the derivative (with sobel kernel) of an image in a given
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java
index e29729cc9..41b4d9353 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java
@@ -43,7 +43,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Convenience op for partial derivatives. Calculates all partial derivatives
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java
index 2f9837dc3..923c89517 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java
@@ -46,7 +46,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Performs the 2-D partial derivative Gaussian kernel convolutions on an image,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java
index a61175399..2c64a2fdb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java
@@ -43,7 +43,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Low-level difference of Gaussians (DoG) implementation which leans on other
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java
index cd153af86..8b41dead8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java
@@ -41,7 +41,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Difference of Gaussians (DoG) implementation where sigmas can vary by
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java
index e2edafe91..019133f5c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Function that creates an output for FFTMethods FFT
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java
index a002677a1..2cddc479a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java
@@ -41,7 +41,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Forward FFT computer that operates on an RAI and wraps FFTMethods. The input
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java
index 61388c497..5f8df82a7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java
@@ -45,7 +45,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Function that uses FFTMethods to perform a forward FFT
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java
index d3c38b0d5..866e586fd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java
@@ -36,7 +36,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Op that calculates FFT sizes.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java
index 5e74db0b9..e6e1bb0fa 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Op that calculates FFT sizes.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java
index 546cdae59..39db46c80 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java
@@ -35,7 +35,6 @@
 
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Op that calculates FFT fast sizes according to the following logic.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java
index efda100d6..822952bc1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java
@@ -51,7 +51,6 @@
 import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link OpCollection} containing various wrappings of Gaussian operations.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java
index dbbd9d6f7..116719a50 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java
@@ -43,7 +43,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Hessian filter using the sobel filter with separated kernel.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java
index 2a652d3e1..0b3c11048 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java
@@ -42,7 +42,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Inverse FFT computer that operates on an RAI and wraps FFTMethods. The input
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java
index 67975ed26..04cb5f9b3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Inverse FFT inplace operator -- complex to complex only, output size must
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java
index 990e9593d..a83103e03 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Default implementation of {@link MaxFilterOp}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java
index 10ed9c8b0..3219a60fe 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Default implementation of {@link MeanFilterOp}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java
index 077bd7e0d..ce4bfa967 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Default implementation of {@link MedianFilterOp}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java
index fb51c4ca2..2301e5821 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Default implementation of {@link MinFilterOp}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java
index ac1c1f898..7feee4227 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java
@@ -41,7 +41,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.ops.util.Adapt;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Op used to pad the image using the default FFT padding scheme.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java
index db748f3cc..ec494e634 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java
@@ -41,7 +41,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.ops.util.Adapt;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Op used to pad the kernel using the default FFT padding scheme and shift the
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java
index 567be2eb9..25d12a71a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java
@@ -46,7 +46,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Op used to pad the image by extending the borders
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java
index a6391dae5..966f25fcd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java
@@ -41,7 +41,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.ops.util.Adapt;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Op used to pad the image to a size that is compatible with FFTMethods
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java
index 7df642163..c23d88450 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java
@@ -43,7 +43,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Op used to pad a kernel and shift the center of the kernel to the origin
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java
index 857d13748..926343b4c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java
@@ -41,7 +41,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.ops.util.Adapt;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Op used to pad a kernel to a size that is compatible with FFTMethods and
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java
index 11c2f4762..51c080c23 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java
@@ -41,7 +41,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Op used to calculate and return a centered padding interval given an input
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java
index 0c8f99d6f..4e5e883e3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java
@@ -39,7 +39,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Op used to translate the center of an interval the origin. This is needed for
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java
index 06b3a440f..34219be0e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java
@@ -42,7 +42,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Default implementation of {@link SigmaFilterOp}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java
index 7e264ce71..954aca598 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Sobel filter implementation using separated sobel kernel.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java
index b7bb1fbe6..3e7cd81ba 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java
@@ -54,7 +54,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * The Tubeness filter: enhance filamentous structures of a specified thickness.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java
index 38f1ddc28..fb0e1c031 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Default implementation of {@link VarianceFilterOp}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java
index 5396469a5..fc1db37c4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java
@@ -45,7 +45,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 import Jama.EigenvalueDecomposition;
 import Jama.Matrix;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java
index 71b8ee90c..79fb51871 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java
@@ -38,7 +38,6 @@
 
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * This {@link Op} computes the centroid of a {@link IterableRegion} (Label).
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java
index 55a0c0b54..2d972fab8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java
@@ -38,7 +38,6 @@
 
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * This {@link Op} computes the centroid of a {@link IterableRegion} (Label).
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java
index 0c4b5d64b..d01519873 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Generic implementation of {@code geom.centroid}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java
index 06c73eb1b..629a84a7d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Generic implementation of {@code geom.centroid}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java
index 9146de1c1..d6c5ce5fb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java
@@ -40,7 +40,6 @@
 
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * This {@link Op} computes the center of gravity of a {@link IterableRegion}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java
index 14f7a89f5..3d73db642 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java
@@ -37,7 +37,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Generic implementation of {@link net.imagej.ops2.Ops.Geometric.Size}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java
index 278dd0cb2..416764793 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java
@@ -35,7 +35,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * @author Tim-Oliver Buchholz (University of Konstanz)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java
index 160bc096b..bfdf6ab4d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java
@@ -41,7 +41,6 @@
 
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Generic implementation of {@code geom.boundingBox}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java
index 575998ed2..d4c6f3408 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java
@@ -35,7 +35,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * @author Tim-Oliver Buchholz (University of Konstanz)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java
index 805a39497..0030e60f7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Generic implementation of {@code geom.circularity}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java
index 088022220..d061e3b51 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java
@@ -46,7 +46,6 @@
 
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Generic implementation of {@code geom.contour}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java
index 5a977ae88..b6bef5532 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java
@@ -42,7 +42,6 @@
 
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Generic implementation of {@code geom.convexHull}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java
index e885e9d9c..4fef58a19 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java
@@ -34,7 +34,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * @author Tim-Oliver Buchholz (University of Konstanz)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java
index 5fc1b2545..75bde0bcf 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Generic implementation of {@code geom.eccentricity}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java
index 0854fb55b..070bdb662 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java
@@ -42,7 +42,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Generic implementation of {@code geom.mainElongation} based on
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java
index dad25f7c8..ee2e20dc1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java
@@ -37,7 +37,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Generic implementation of {@code geom.feretsAngle}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java
index 8d3f17d8e..6d0758a9a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java
@@ -37,7 +37,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Generic implementation of {@code geom.feretsDiameter}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java
index 6a672fd27..84cc30313 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java
@@ -42,7 +42,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Ferets Diameter for a certain angle.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java
index 681d9d0e7..a1fd149d3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Generic implementation of {@code geom.majorAxis}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java
index a5407f481..e46451bff 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java
@@ -41,7 +41,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Maximum Feret of a polygon.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java
index 97148e5fa..fd015c68a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 @Plugin(type = Op.class, name = "geom.maximumFeretsAngle")
 public class DefaultMaximumFeretAngle implements Computers.Arity1<Polygon2D, DoubleType> {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java
index 50dc0c48a..a8c547d76 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 @Plugin(type = Op.class, name = "geom.maximumFeretsDiameter")
 public class DefaultMaximumFeretDiameter implements Computers.Arity1<Polygon2D, DoubleType> {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java
index 64c94dbc7..7bec34a20 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java
@@ -44,7 +44,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Minimum Feret of a polygon.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java
index d06780dba..c65b92617 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 @Plugin(type = Op.class, name = "geom.minimumFeretsAngle")
 public class DefaultMinimumFeretAngle implements Computers.Arity1<Polygon2D, DoubleType> {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java
index 0d6ffce4d..e473611f3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 @Plugin(type = Op.class, name = "geom.minimumFeretsDiameter")
 public class DefaultMinimumFeretDiameter implements Computers.Arity1<Polygon2D, DoubleType> {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java
index 122b95a90..2b7a8be23 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Generic implementation of {@code geom.minorAxis}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java
index 706648198..6bd2096fd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java
@@ -44,7 +44,6 @@
 
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Generic implementation of {@code geom.secondMultiVariate}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java
index 30d3a4771..c556d79ce 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Generic implementation of {@code geom.boundarySize}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java
index 22a0ba094..4c15ebb1b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Generic implementation of {@code geom.roundness}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java
index ba99037f2..1d83cd341 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java
@@ -35,7 +35,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * @author Tim-Oliver Buchholz (University of Konstanz)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java
index 5280b2771..3ea7ec1b8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Specific implementation of {@link Area} for a Polygon2D.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java
index bce3748fc..e629b3e8d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java
@@ -43,7 +43,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Generic implementation of {@code geom.smallestBoundingBox}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java
index 42958f8d3..08edb1ea0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java
@@ -35,7 +35,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * @author Tim-Oliver Buchholz (University of Konstanz)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java
index 39fe3d872..8aeebbe8a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * @author Tim-Oliver Buchholz, University of Konstanz
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java
index d4ffe4ca7..847126045 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java
@@ -37,7 +37,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * @author Tim-Oliver Buchholz, University of Konstanz
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java
index 9df71d856..8890d89ec 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java
@@ -35,7 +35,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * @author Tim-Oliver Buchholz (University of Konstanz)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java
index 845297696..de62a5729 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Generic implementation of {@link net.imagej.ops2.Ops.Geometric.Compactness}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java
index bff3e801d..d9ffa2b1a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java
@@ -49,7 +49,6 @@
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * This quickhull implementation is based on the paper
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java
index 565ff9912..1892d94f0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java
@@ -35,7 +35,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * @author Tim-Oliver Buchholz (University of Konstanz)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java
index eb3cf3f11..5c84b1338 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java
@@ -41,7 +41,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * This {@link Op} computes the 2nd multi variate of a {@link IterableRegion}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java
index 986257a9a..80a2c394c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java
@@ -41,7 +41,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * This {@link Op} computes the 2nd multi variate of a {@link Mesh} (Label).
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java
index fd9ac6c3b..51c2042a9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java
@@ -42,7 +42,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Generic implementation of {@link net.imagej.ops2.Ops.Geometric.MainElongation}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java
index 512bc1b17..2bd07cf41 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java
@@ -49,7 +49,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * This is a marching cubes implementation. It is inspired by Paul Bourke's
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java
index 844a0ee2a..ada6ec30f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java
@@ -42,7 +42,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Generic implementation of
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java
index 79b126eff..b27ead05c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java
@@ -35,7 +35,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * @author Tim-Oliver Buchholz (University of Konstanz)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java
index a2d1524b0..c3f4f1406 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java
@@ -42,7 +42,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Generic implementation of {@link net.imagej.ops2.Ops.Geometric.Spareness}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java
index fc7927059..710cac142 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Generic implementation of {@link net.imagej.ops2.Ops.Geometric.Sphericity}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java
index 2385cd0eb..6d02b9449 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Generic implementation of {@link net.imagej.ops2.Ops.Geometric.BoundarySize}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java
index 3e7882afe..11f308f6e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java
@@ -35,7 +35,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * @author Tim-Oliver Buchholz (University of Konstanz)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java
index e0bd855b3..56e51ce8c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * @author Tim-Oliver Buchholz (University of Konstanz)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java
index 98bc6bee8..a26b86718 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java
@@ -37,7 +37,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Generic implementation of {@code geom.boundaryPixelCount}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java
index dd1180666..8eb4259ae 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java
@@ -35,7 +35,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * @author Tim-Oliver Buchholz (University of Konstanz)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java
index aedf70b46..37b689026 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java
@@ -38,7 +38,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Generic implementation of {@link net.imagej.ops2.Ops.Geometric.Size}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java
index 76c499d8f..650bbf40a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java
@@ -48,7 +48,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * <p>
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java
index bf8e40b70..c6a0a8649 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java
@@ -36,7 +36,6 @@
 import org.scijava.ops.OpService;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Gets documentation for the given name.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java
index 1a89e571c..1cb16e37b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java
@@ -33,7 +33,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Default implementation of the {@link IdentityOp} op.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java
index 434563103..a2baae844 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java
@@ -41,7 +41,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Generates an ASCII version of an image.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java
index a03ecdf4b..007c93cfa 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java
@@ -11,7 +11,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Handler Op delegating between {@link CooccurrenceMatrix2D} and
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java
index f44e80a31..fde760a76 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Passes an input image of any dimension off to the correct Distance Transform
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java
index 9c2621d74..0a4541e73 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java
@@ -45,7 +45,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java
index 111de63bb..5ec6e8997 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Passes an input image of any dimension off to the correct Distance Transform
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java
index 6fb758609..b2f2e8049 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * An equation operation which computes image values from coordinates using
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java
index 90f08d920..dcafa9136 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java
@@ -47,7 +47,6 @@
 import org.scijava.plugin.Plugin;
 import org.scijava.script.ScriptLanguage;
 import org.scijava.script.ScriptService;
-import org.scijava.struct.ItemIO;
 
 /**
  * Computes an image using an equation.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java
index 4530d4116..86b441d4a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Fill an {@link IterableInterval} with some constant value.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java
index 5a26d8619..017a9f5ed 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Fill a {@link RandomAccessibleInterval} with some constant value. Operates in
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java
index d28c5f67b..b8d99bea2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * @author Martin Horn (University of Konstanz)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java
index 926e3cb56..c869a9385 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * <p>
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java
index a0e1c9e22..7153f412e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * <p>
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java
index c9d465f86..87116dee4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java
@@ -40,7 +40,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Wrapper op for the creation of integral images with
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertII.java
index b5777815d..a12c19ee1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertII.java
@@ -43,7 +43,6 @@
 //import org.scijava.functions.Computers;
 //import org.scijava.param.Parameter;
 //import org.scijava.plugin.Plugin;
-//import org.scijava.struct.ItemIO;
 //
 ///**
 // * @author Martin Horn (University of Konstanz)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertIIInteger.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertIIInteger.java
index 40ad067f7..cab243163 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertIIInteger.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertIIInteger.java
@@ -46,7 +46,6 @@
 //import org.scijava.functions.Computers;
 //import org.scijava.param.Parameter;
 //import org.scijava.plugin.Plugin;
-//import org.scijava.struct.ItemIO;
 //
 ///**
 // * @author Gabe Selzer
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java
index 6fe2019f0..fd2f7039d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java
@@ -43,7 +43,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Normalizes an {@link RandomAccessibleInterval} given its minimum and maximum to
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java
index 3fda9fc3b..0e36656be 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java
@@ -41,7 +41,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Normalizes an {@link RandomAccessibleInterval} given its minimum and maximum to
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java
index 3b83a7fc2..1866fb7ae 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java
@@ -41,7 +41,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Normalizes an {@link RandomAccessibleInterval} given its minimum and maximum to
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java
index f2fe78e5b..eb4ead609 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Normalizes an {@link RandomAccessibleInterval} given its minimum and maximum to
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java
index e4ee6293b..68f1b4f19 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java
@@ -60,7 +60,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * <p>
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java
index 223e055ad..a84016dab 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java
@@ -47,7 +47,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * <p>
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java
index 7c7d0efe5..49d7457fb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java
@@ -48,7 +48,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * <p>
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java
index 659db0674..d0a25e0dc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java
@@ -70,7 +70,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * The Watershed algorithm segments and labels a grayscale image analogous to a
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java
index c27abb82a..48cad5858 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.centralMoment00}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment01.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment01.java
index e01a61f8a..454441834 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment01.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment01.java
@@ -36,7 +36,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.centralMoment01} directly.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java
index 97a10a481..ea10b10f4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java
@@ -43,7 +43,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.centralMoment02}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java
index 9505191e8..ba894c0d8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java
@@ -43,7 +43,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.centralMoment03} using
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment10.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment10.java
index a5869f2bc..d273b9368 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment10.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment10.java
@@ -36,7 +36,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.centralMoment10} directly.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java
index 24b131c48..b660dfdd5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.centralMoment11}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java
index be72739e9..c77454664 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java
@@ -43,7 +43,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.centralMoment12}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java
index be5527557..4c1fc580c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java
@@ -42,7 +42,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.centralMoment20}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java
index d3b2f5a4e..7d0559b99 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java
@@ -43,7 +43,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.centralMoment21}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java
index 9c23d909f..57b15443c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java
@@ -43,7 +43,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.centralMoment30}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java
index 5706552cc..657d1240e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.centralMoment00} directly.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java
index 44027fb64..83228c0c2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.centralMoment11} directly.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java
index f892f3c1b..928a036a0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.huMoment1}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java
index c2c8bff63..40fa04956 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.huMoment2}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java
index 4ae61268f..9fc923ed4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.huMoment3}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java
index 4690edcd4..7e2fb5da8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.huMoment4}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java
index d5a37b960..52c5fd0ad 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.huMoment5}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java
index f74767049..382ef3ab2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.huMoment6}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java
index c9da9854e..dd14aeb09 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.huMoment7}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment00.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment00.java
index ec359ab16..1b48082c2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment00.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment00.java
@@ -41,7 +41,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.moment00}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment01.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment01.java
index 468cece69..3cfebeb53 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment01.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment01.java
@@ -41,7 +41,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.moment01}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment10.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment10.java
index adc7e134a..23ac2e3e4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment10.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment10.java
@@ -41,7 +41,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.moment10}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment11.java
index a0540a311..41ff2a155 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment11.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment11.java
@@ -41,7 +41,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.moment11}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java
index 2956e4324..f725020d7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.normalizedCentralMoment02}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java
index 4b870cc54..9d87f64c4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.normalizedCentralMoment03}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java
index a28820c1c..20b817932 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.normalizedCentralMoment11}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java
index 0bde71a7e..bdd5be083 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.normalizedCentralMoment12}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java
index a6d375518..4e697c690 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.normalizedCentralMoment20}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java
index 8436930d6..357044e9c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.normalizedCentralMoment21}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java
index 85f7a0f0a..d255c56f8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code imageMoments.normalizedCentralMoment30}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java
index a0603f0ec..0ab083109 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java
@@ -51,7 +51,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Merges the labels of two {@link ImgLabeling} within a defined mask (if
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java
index 24c4ebc49..7d14e598b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java
@@ -46,7 +46,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Default Implementation wrapping {@link ConnectedComponents} of
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java
index bc29beff4..50eef28f0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java
@@ -41,7 +41,6 @@
 import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Rotates the vector by the quaternion.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java
index c57087503..8ff58a48d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java
@@ -36,7 +36,6 @@
 import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Logic operations with {@link BooleanType} as output.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java
index c640812b1..9de65c4ff 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java
@@ -36,7 +36,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * An Op that sets the output to the <code>defaultVal</code> iff the input is
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java
index 6b5ac45c1..a081ffb24 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java
@@ -36,7 +36,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * An Op that works the same way as the <code>?:</code> operator. It sets the
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java
index 3710ed107..91f1d762e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java
@@ -42,7 +42,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Evaluates a {@link UnaryComputerOp} for each {@link Neighborhood} on the
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java
index af1b0ebd5..db32240c4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java
@@ -44,7 +44,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Evaluates a {@link CenterAwareComputerOp} for each {@link Neighborhood} on
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java
index 24a64282c..65d4306f6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Binary Ops of the {@code math} namespace which operate on {@link RealType}s.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java
index 5bd20a28b..a0012071b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java
@@ -36,7 +36,6 @@
 import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Binary Ops of the {@code math} namespace which operate on {@link RealType}s.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java
index e9309030d..5618692a6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java
@@ -37,7 +37,6 @@
 import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Nullary Ops of the {@code math} namespace which operate on
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java
index dd66ef464..bc7c6b314 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java
@@ -36,7 +36,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 @Plugin(type = Op.class, name = "math.complexConjugateMultiply", priority = Priority.LOW)
 public class ComplexConjugateMultiplyOp<T extends ComplexType<T>> implements Computers.Arity2<T, T, T> {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java
index 96728b356..2320045a1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java
@@ -15,7 +15,6 @@
 import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 @Plugin(type = OpCollection.class)
 public class DistanceTransforms<T extends RealType<T>, U extends RealType<U>> {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java
index 41aa080fa..43c5e417b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java
@@ -42,7 +42,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Extracts the holes from a binary image.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java
index af1bfcd4f..7f59e3a07 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java
@@ -42,7 +42,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Fills the holes of a BooleanType image.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java
index d50da4b3e..518b84101 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java
@@ -18,7 +18,6 @@
 import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 @Plugin(type = OpCollection.class)
 public class FloodFills<T extends Type<T>, U extends Type<U>> {
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java
index bb6e36089..b8fb462aa 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java
@@ -48,7 +48,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * The Op creates an output interval where the objects are hollow versions from
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java
index 8c3a80681..e3ffded8a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java
@@ -25,7 +25,6 @@
 import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Wraps all of <a href=
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java
index 0d57bce19..2a1cbbd77 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java
@@ -34,7 +34,6 @@
 
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Thinning Operation
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java
index bff561920..fd6135f11 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java
@@ -34,7 +34,6 @@
 
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Thinning Operation
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java
index 9ee73c93c..a1947976c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java
@@ -34,7 +34,6 @@
 
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Thinning Operation
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java
index daf148ae7..dc1c016a6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java
@@ -34,7 +34,6 @@
 
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Thinning Operation
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java
index 35fc4a169..c8c143904 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java
@@ -41,7 +41,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 @Plugin(type = Op.class, name = "project",
 	priority = Priority.LOW + 1)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java
index 3556dd7f1..f5c8503f4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java
@@ -41,7 +41,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 @Plugin(type = Op.class, name = "project", priority = Priority.LOW)
 public class ProjectRAIToIterableInterval<T, V>
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java
index a3d986698..93ad55e8f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java
@@ -47,7 +47,6 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Finds the junctions between a {@link ArrayList} of {@link WritablePolyline},
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java
index 7d34781a1..a1aedaf8b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java
@@ -52,7 +52,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Performs the Ridge Detection algorithm on a 2-Dimensional, gray-scale image.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java
index fc0355bf2..5720cd114 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java
@@ -37,7 +37,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link SliceOp} implementation for {@link RandomAccessibleInterval} input and
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java
index 4c73dc5c9..0b33f523d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java
@@ -37,7 +37,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.geometricMean} using
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java
index ca5c4258e..ad5595f31 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java
@@ -37,7 +37,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.harmonicMean} using
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java
index 7d96f0b19..5a01ae663 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java
@@ -37,7 +37,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.kurtosis} using {@code stats.stdDev}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java
index b4331ed7d..28650f6f3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java
@@ -41,7 +41,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.max}. Leans on other Ops.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java
index 2a3a46ba9..d93209a77 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.max} using {@code stats.sum} and
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java
index bc3f2a8eb..e88389cbb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.median}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java
index e2d14e212..2aff0a2d1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java
@@ -41,7 +41,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.max}. Leans on other Ops.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java
index e8c467306..df8fc3053 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java
@@ -42,7 +42,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.minMax}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java
index 1658da3ef..93451520e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.moment1AboutMean}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java
index f135bd32d..ece6214f2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.moment2AboutMean} using
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java
index a2c6ca665..4199af8b9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.moment3AboutMean} using
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java
index 26d298132..44f113680 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.moment4AboutMean} using
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java
index 5b6c7920f..f964754c7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java
@@ -42,7 +42,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.momentNAboutMean} using
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java
index 379fe802e..dad171964 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java
@@ -36,7 +36,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the n-th {@code stats.percentile}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java
index 39eefc593..39492dde9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 import org.scijava.util.ArrayUtils;
 import org.scijava.util.DoubleArray;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java
index 68a78caf7..97b268bb5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java
@@ -36,7 +36,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.size} of an {@link Interval}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java
index a4a302d5d..5a012c8ce 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java
@@ -37,7 +37,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.skewness} using
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java
index 5af643a65..9e3997a63 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.stdDev} using
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java
index a6cccc247..32242e25c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.sum}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java
index e929543cf..8c0179599 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java
@@ -42,7 +42,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.sumOfInverses}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java
index f57802ad7..5c0358c20 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java
@@ -43,7 +43,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.sumOfLogs}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java
index a769398af..68e8e6114 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java
@@ -41,7 +41,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.sumOfSquares}. Leans on other Ops.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java
index 02fa76696..583ff142d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java
@@ -44,7 +44,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.variance} using the
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java
index 4d4457754..7dfeac133 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java
@@ -42,7 +42,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.mean} from an integral image using a
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java
index e77cd80b4..7291125b8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.sum} from an integral image using a
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java
index fa80d712e..583807604 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java
@@ -42,7 +42,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.variance} from an integral image
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java
index 80b50dbde..b29378a85 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java
@@ -36,7 +36,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.geometricMean} directly.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java
index 0a3622ae8..b2dd83b76 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java
@@ -36,7 +36,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.harmonicMean} directly.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java
index c06ff5b45..6b15a3cce 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java
@@ -36,7 +36,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.max}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java
index f862f0e70..24cddf2c1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java
@@ -36,7 +36,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.mean} directly.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java
index ddd7a1d18..230b48049 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java
@@ -36,7 +36,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.min}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java
index 333b5e6c6..5267eee1a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java
@@ -38,7 +38,6 @@
 
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.minMax}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java
index cb6453961..41ce223b6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java
@@ -36,7 +36,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.moment3AboutMean} using
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java
index 596a519da..d32189ebc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java
@@ -36,7 +36,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.moment4AboutMean} using
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java
index f3e4596fd..d98453016 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java
@@ -36,7 +36,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.size}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java
index a3ee8fc23..55cc3566f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java
@@ -36,7 +36,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.stdDev} directly.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java
index e2c399088..9aac30fb6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java
@@ -35,7 +35,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.sum}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java
index b02ed18ff..bdee0346a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java
@@ -35,7 +35,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.sumOfInverses}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java
index 4446b25fa..4a76ac047 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java
@@ -35,7 +35,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.sumOfLogs}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java
index e22cb76bd..7ee4918a9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java
@@ -35,7 +35,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.sumOfSquares}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java
index d4ef6a773..397549f45 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java
@@ -36,7 +36,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * {@link Op} to calculate the {@code stats.variance} using the online algorithm
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java
index ffa281b0a..8371e0a35 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java
@@ -40,7 +40,6 @@
 import org.ojalgo.random.Deterministic;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * An op that fits a quadratic surface (quadric) into a set of points.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java
index 0487ca683..4c23fd830 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Implementation of a {@link ChunkerOp} that interleaves the chunks. In a
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java
index a73b98ae1..87469b974 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Simple default implementation of a {@link ChunkerOp}. The list of
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/AbstractApplyThresholdIterable.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/AbstractApplyThresholdIterable.java
index 966b0aefa..8e0a5ea05 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/AbstractApplyThresholdIterable.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/AbstractApplyThresholdIterable.java
@@ -33,8 +33,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
-import org.scijava.struct.ItemIO;
 
 /**
  * @author Curtis Rueden
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java
index 5f23b1c88..26b2037f7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java
@@ -46,7 +46,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Ops which compute and apply a local threshold to an image.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java
index 86bcfb364..dedc603bd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.util.Adapt;
 import org.scijava.ops.util.Maps;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Applies the given threshold value to every element along the given
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java
index f72d50f63..c964f6c05 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java
@@ -35,7 +35,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Applies a threshold value (the second input) to the given comparable object,
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java
index 216cbd0d9..2c5563c79 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java
@@ -37,7 +37,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Applies a threshold value (the second input) to the given object using the
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java
index f01c4f070..e3f90b391 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java
@@ -35,7 +35,6 @@
 
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 //NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
 //plugin found in Fiji (version 1.14).
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java
index c60012f10..e404c539e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java
@@ -36,7 +36,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
 // plugin found in Fiji (version 1.14). The method was ported from IJ1 by
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java
index 96428f856..c2beb0527 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.OpExecutionException;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
 // plugin found in Fiji (version 1.14).
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java
index 2f6707d66..28a512059 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java
@@ -37,7 +37,6 @@
 import org.scijava.ops.OpExecutionException;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
 // plugin found in Fiji (version 1.14).
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java
index ba078a336..c5bdda399 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java
@@ -36,7 +36,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
 // plugin found in Fiji (version 1.14).
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java
index 6b934db57..2096baf89 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java
@@ -41,7 +41,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Local threshold method which is similar to
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java
index d1d87f27c..ab76e4a23 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java
@@ -42,7 +42,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * @author Jonathan Hale
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java
index b383b0b36..d7d0dae54 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Local threshold method which determines whether a pixel is closer to the
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java
index 0772b90fc..39b3c1f0e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java
@@ -42,7 +42,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * @author Jonathan Hale
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java
index 5223e52ed..b497a99d2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Local threshold method that uses the mean and operates directly of RAIs.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java
index f208ab1d4..835f0f689 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java
@@ -43,7 +43,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * <p>
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java
index 0a202e62e..52ea914f0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java
@@ -52,7 +52,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Implementation of the local mean threshold method for images. Makes use of
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java
index e0dc3e87c..559adf6ab 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java
@@ -38,7 +38,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Local threshold method using median.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java
index 014ec88eb..09df42dea 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java
@@ -42,7 +42,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * @author Jonathan Hale
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java
index ec1141a46..b52fd1d5c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java
@@ -41,7 +41,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Local threshold method which thresholds against the average of the maximum
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java
index 73a464b24..a5d4472b1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java
@@ -43,7 +43,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * @author Jonathan Hale
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java
index f04f06cd4..408c69e57 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * LocalThresholdMethod using Niblack's thresholding method.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java
index c9f217398..839e20d04 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java
@@ -44,7 +44,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * <p>
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java
index 0d8b9da90..2207cb076 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java
@@ -51,7 +51,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 @Plugin(type = Op.class, name = "threshold.localNiblack",
 	priority = Priority.LOW)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java
index 288f92aa2..eba2b1289 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * <p>
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java
index 53dc8dd11..b23fdcf0d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java
@@ -44,7 +44,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * <p>
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java
index 84156b3c3..178fa124e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java
@@ -51,7 +51,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 @Plugin(type = Op.class, name = "threshold.localPhansalkar",
 	priority = Priority.LOW)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java
index 02d3c03cd..160079dc1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * <p>
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java
index 720ee2bb3..51d391c13 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java
@@ -44,7 +44,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * <p>
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java
index 268879ef0..dbd982b53 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java
@@ -51,7 +51,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 @Plugin(type = Op.class, name = "threshold.localSauvola",
 	priority = Priority.LOW)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java
index 6b71356ca..105142e28 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java
@@ -36,7 +36,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
 // plugin found in Fiji (version 1.14).
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java
index 744469f59..0d56ed52f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java
@@ -37,7 +37,6 @@
 
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 // This plugin code ported from the original MatLab code of the max likelihood
 // threshold method (th_maxlik) as written in Antti Niemisto's 1.03 version of
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java
index 17bc402c3..d7d016fa0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java
@@ -35,7 +35,6 @@
 
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
 // plugin found in Fiji (version 1.14).
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java
index cb1cd8a17..50b01cad0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java
@@ -39,7 +39,6 @@
 import org.scijava.ops.OpExecutionException;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
 // plugin found in Fiji (version 1.14).
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java
index a7bf2e3cb..d814b4971 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java
@@ -37,7 +37,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
 // plugin found in Fiji (version 1.14).
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java
index 3e52dd801..0e48ff8d6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java
@@ -36,7 +36,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
 // plugin found in Fiji (version 1.14).
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java
index 4f9830001..f77a7381a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java
@@ -36,7 +36,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
 // plugin found in Fiji (version 1.14).
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/percentile/ComputePercentileThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/percentile/ComputePercentileThreshold.java
index df710bf1d..6d34013b7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/percentile/ComputePercentileThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/percentile/ComputePercentileThreshold.java
@@ -36,7 +36,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
 // plugin found in Fiji (version 1.14).
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java
index bedfab66e..389188f1d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java
@@ -36,7 +36,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
 // plugin found in Fiji (version 1.14).
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java
index 3a19d9e2b..9401e1074 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java
@@ -36,7 +36,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Implements Rosin's threshold method. From : Rosin, Paul L. "Unimodal
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java
index 93378a921..07831106a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java
@@ -36,7 +36,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
 // plugin found in Fiji (version 1.14).
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java
index 415f37ec6..1866271ac 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java
@@ -36,7 +36,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
 // plugin found in Fiji (version 1.14).
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java
index cff32acfb..4d83f6708 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java
@@ -36,7 +36,6 @@
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
 // plugin found in Fiji (version 1.14).
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java
index f8d81da9b..4e548c4e5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java
@@ -50,7 +50,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * An N-dimensional box counting that can be used to estimate the fractal
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java
index e0e6f95a6..d7ae08b84 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java
@@ -37,7 +37,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * An Op which calculates the euler characteristic (χ) of the given 3D binary image.<br>
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java
index f810acf71..3d207a1c4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java
@@ -36,7 +36,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * An Op which calculates the euler characteristic (χ) of the given binary image. The object in the image
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java
index 39e0af8f9..9cdd7a0b1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * An Op which calculates the correction needed to approximate the contribution of the image to the
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java
index b813111ce..4a3a63da2 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java
@@ -9,7 +9,6 @@
 import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Creation ops
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOpCollection.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOpCollection.java
index 32c5397a1..8496b50ca 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOpCollection.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOpCollection.java
@@ -7,7 +7,6 @@
 import org.scijava.ops.OpField;
 import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 @Plugin(type = OpCollection.class)
 public class MathOpCollection {
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java
index cf0938da8..6c06a225e 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java
@@ -6,7 +6,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 public class Normalize {
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/DefaultMutableParameterMember.java b/scijava/scijava-ops/src/main/java/org/scijava/param/DefaultMutableParameterMember.java
index 298b3ea75..311bf6600 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/DefaultMutableParameterMember.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/DefaultMutableParameterMember.java
@@ -40,6 +40,7 @@
 
 import org.scijava.struct.ItemIO;
 
+
 /**
  * Default {@link MutableParameterMember} implementation.
  * 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/FunctionalMethodType.java b/scijava/scijava-ops/src/main/java/org/scijava/param/FunctionalMethodType.java
index 75b325407..13926ca64 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/FunctionalMethodType.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/FunctionalMethodType.java
@@ -4,6 +4,7 @@
 
 import org.scijava.struct.ItemIO;
 
+
 /**
  * Wrapper to pair a type of a method signature with its {@link ItemIO}.
  * 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java
index 3e3f7a2dd..13888808f 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java
@@ -8,7 +8,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Producer;
 import org.scijava.ops.matcher.OpClassInfo;
-import org.scijava.struct.ItemIO;
 import org.scijava.types.GenericTyped;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java
index 8ce2e3195..92d6b6606 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java
@@ -45,7 +45,6 @@
 import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 import org.scijava.types.Nil;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
index 585b1f836..7407db8b8 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 @Plugin(type = OpCollection.class)
 public class OpMethodTestOps {
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java
index 644c51fb4..8a8ca26ba 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java
@@ -36,7 +36,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.types.Nil;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 public class OpPriorityTest extends AbstractTestEnvironment {
 	
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java
index 582d03f34..084fd1ecb 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java
@@ -8,7 +8,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * This class contains various ops used in various tests used to check framework
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java
index 166c39364..9f5d60ed0 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java
@@ -45,7 +45,6 @@
 import org.scijava.ops.core.builder.OpBuilder;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Ensures that higher-priority adapt Ops are used over lower-priority adapt
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java
index b67a07fa9..6961c8e56 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java
@@ -16,7 +16,6 @@
 import org.scijava.ops.util.FunctionUtils;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 import org.scijava.types.Nil;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
index 34a3eb2bb..aaa805886 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
@@ -14,7 +14,6 @@
 import org.scijava.ops.core.builder.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 @Plugin(type = OpCollection.class)
 public class OpsAsParametersTest extends AbstractTestEnvironment {
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
index f326b39d3..259816327 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
@@ -20,7 +20,6 @@
 import org.scijava.ops.core.Op;
 import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 /**
  * Tests the ability of a Javadoc parser to scrape an Op's parameters out of its

From 695636dc155bb623497db11b3aa1cf36eb8bb96a Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Tue, 23 Mar 2021 12:05:53 -0500
Subject: [PATCH 14/91] Add descriptions to OpString

---
 .../main/java/org/scijava/ops/OpUtils.java    |  8 ++++++++
 .../scijava/param/JavadocParameterTest.java   | 20 +++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
index 32df09bfa..18a501cef 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
@@ -414,6 +414,10 @@ public static String opString(final OpInfo info) {
 			sb.append(arg.getType().getTypeName());
 			sb.append(" ");
 			sb.append(arg.getKey());
+			if (!arg.getDescription().isEmpty()) {
+				sb.append(" -> ");
+				sb.append(arg.getDescription());
+			}
 			sb.append("\n");
 		}
 		sb.append("\t Outputs:\n");
@@ -422,6 +426,10 @@ public static String opString(final OpInfo info) {
 		sb.append(arg.getType().getTypeName());
 		sb.append(" ");
 		sb.append(arg.getKey());
+		if (!arg.getDescription().isEmpty()) {
+			sb.append(" -> ");
+			sb.append(arg.getDescription());
+		}
 		sb.append("\n");
 		sb.append(")\n");
 		return sb.toString();
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
index 259816327..1994abbcb 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
@@ -140,6 +140,26 @@ public void testJavadocClass() {
 		Assert.assertEquals("the output", outputDescription);
 	}
 
+	@Test
+	public void opStringRegressionTest() {
+		Iterator<OpInfo> infos = ops.env().infos("test.javadoc.method").iterator();
+
+		OpInfo info = infos.next();
+		if (infos.hasNext()) {
+			Assert.fail("Multiple OpInfos with name \"test.javadoc.method\"");
+		}
+		String expected =
+			"public static java.util.List<java.lang.Long> org.scijava.param.JavadocParameterTest." +
+				"OpMethodFoo(java.util.List<java.lang.String>,java.util.List<java.lang.String>)(\n" +
+				"	 Inputs:\n" +
+				"		java.util.List<java.lang.String> foo -> the first input\n" +
+				"		java.util.List<java.lang.String> bar -> the second input\n" +
+				"	 Outputs:\n" +
+				"		java.util.List<java.lang.Long> output1 -> foo + bar\n" + ")\n";
+		String actual = info.toString();
+		Assert.assertEquals(expected, actual);
+
+	}
 }
 
 /**

From b980b8fdfda8f68f26b01653f2a7034e4c0181fd Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Tue, 23 Mar 2021 14:07:16 -0500
Subject: [PATCH 15/91] Update paramString for Member descriptions

---
 .../src/main/java/org/scijava/ops/OpUtils.java       |  3 ++-
 .../java/org/scijava/param/JavadocParameterTest.java | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
index 18a501cef..c2983bc92 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
@@ -382,7 +382,7 @@ private static String paramString(final Iterable<Member<?>> items, final Member<
 
 	/**
 	 * As {@link #paramString(Iterable, Member, String)} with a toggle to
-	 * control if inputs are types only or include the names.
+	 * control if inputs are types only or include the names/descriptions.
 	 */
 	private static String paramString(final Iterable<Member<?>> items, final Member<?> special, final String delim,
 			final boolean typeOnly) {
@@ -401,6 +401,7 @@ private static String paramString(final Iterable<Member<?>> items, final Member<
 
 			if (!typeOnly) {
 				sb.append(" " + item.getKey());
+				sb.append(" -> " + item.getDescription());
 			}
 		}
 		return sb.toString();
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
index 1994abbcb..c2f74b495 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
@@ -17,6 +17,7 @@
 import org.scijava.ops.OpField;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpMethod;
+import org.scijava.ops.OpUtils;
 import org.scijava.ops.core.Op;
 import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
@@ -148,6 +149,8 @@ public void opStringRegressionTest() {
 		if (infos.hasNext()) {
 			Assert.fail("Multiple OpInfos with name \"test.javadoc.method\"");
 		}
+
+		// test standard op string
 		String expected =
 			"public static java.util.List<java.lang.Long> org.scijava.param.JavadocParameterTest." +
 				"OpMethodFoo(java.util.List<java.lang.String>,java.util.List<java.lang.String>)(\n" +
@@ -159,7 +162,16 @@ public void opStringRegressionTest() {
 		String actual = info.toString();
 		Assert.assertEquals(expected, actual);
 
+		// test special op string
+		expected = "(java.util.List<java.lang.Long> output1 -> foo + bar) =\n" +
+			"	public static java.util.List<java.lang.Long> org.scijava.param.JavadocParameterTest." +
+			"OpMethodFoo(java.util.List<java.lang.String>,java.util.List<java.lang.String>)(\n" +
+			"		java.util.List<java.lang.String> foo -> the first input,\n" +
+			"==>		java.util.List<java.lang.String> bar -> the second input)";
+		actual = OpUtils.opString(info, info.inputs().get(1));
+		Assert.assertEquals(expected, actual);
 	}
+
 }
 
 /**

From a9700b47142cda5dfd6177d138fc0d6063c358d0 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Tue, 23 Mar 2021 14:38:59 -0500
Subject: [PATCH 16/91] Clean TODOs, output names

---
 .../java/org/scijava/param/JavadocParameterData.java   |  9 ++-------
 .../java/org/scijava/param/JavadocParameterTest.java   | 10 +++++-----
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
index e24682351..9db8c1c12 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
@@ -91,8 +91,6 @@ public JavadocParameterData(Field f) {
 		}
 	}
 
-	// TODO: consider if we want to add more data to the {@link OpInfo}
-	// 
 	public JavadocParameterData(OpInfo info, Type newType) {
 		paramNames = new ArrayList<>();
 		paramDescriptions = new ArrayList<>();
@@ -119,10 +117,8 @@ else if (sam.getParameterCount() < inputs.size()) {
 		}
 		for(Member<?> m : inputs) {
 			paramNames.add(m.getKey());
-			// TODO: Add member support for descriptions
 			paramDescriptions.add(m.getDescription());
 		}
-		// TODO: Add member support for descriptions
 		returnDescription = output.getDescription();
 	}
 
@@ -183,7 +179,7 @@ private void parseMethod(Method m) {
 	public List<Parameter> synthesizeAnnotations(List<FunctionalMethodType> fmts) {
 		List<Parameter> params = new ArrayList<>();
 		int ins = 0;
-		int outs = 1;
+		int outs = 0;
 
 		Map<String, Object> paramValues = new HashMap<>();
 		for (FunctionalMethodType fmt : fmts) {
@@ -200,7 +196,7 @@ public List<Parameter> synthesizeAnnotations(List<FunctionalMethodType> fmts) {
 				break;
 			case OUTPUT:
 				// NB the @return tag does not provide a name, only a comment
-				key = "output" + outs; 
+				key = "output" + (outs == 0 ? "" : outs); 
 				description = returnDescription;
 				outs++;
 				break;
@@ -230,7 +226,6 @@ public List<Parameter> synthesizeAnnotations(List<FunctionalMethodType> fmts) {
 						+ "most likely an implementation error.", e);
 			}
 		}
-		// TODO: consider if some error should be thrown when there are 2+ outputs
 		return params;
 	}
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
index c2f74b495..eae511efa 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
@@ -65,7 +65,7 @@ public void testJavadocMethod() {
 
 		// assert output name
 		String outputName = info.output().getKey();
-		Assert.assertEquals("output1", outputName);
+		Assert.assertEquals("output", outputName);
 
 		// assert output description
 		String outputDescription = info.output().getDescription();
@@ -103,7 +103,7 @@ public void testJavadocField() {
 
 		// assert output name
 		String outputName = info.output().getKey();
-		Assert.assertEquals("output1", outputName);
+		Assert.assertEquals("output", outputName);
 
 		// assert output description
 		String outputDescription = info.output().getDescription();
@@ -134,7 +134,7 @@ public void testJavadocClass() {
 
 		// assert output name
 		String outputName = info.output().getKey();
-		Assert.assertEquals("output1", outputName);
+		Assert.assertEquals("output", outputName);
 
 		// assert output description
 		String outputDescription = info.output().getDescription();
@@ -158,12 +158,12 @@ public void opStringRegressionTest() {
 				"		java.util.List<java.lang.String> foo -> the first input\n" +
 				"		java.util.List<java.lang.String> bar -> the second input\n" +
 				"	 Outputs:\n" +
-				"		java.util.List<java.lang.Long> output1 -> foo + bar\n" + ")\n";
+				"		java.util.List<java.lang.Long> output -> foo + bar\n" + ")\n";
 		String actual = info.toString();
 		Assert.assertEquals(expected, actual);
 
 		// test special op string
-		expected = "(java.util.List<java.lang.Long> output1 -> foo + bar) =\n" +
+		expected = "(java.util.List<java.lang.Long> output -> foo + bar) =\n" +
 			"	public static java.util.List<java.lang.Long> org.scijava.param.JavadocParameterTest." +
 			"OpMethodFoo(java.util.List<java.lang.String>,java.util.List<java.lang.String>)(\n" +
 			"		java.util.List<java.lang.String> foo -> the first input,\n" +

From 908d4de559a5b7ba36502a34c5c37b4b0a2e1420 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Thu, 25 Mar 2021 10:16:10 -0500
Subject: [PATCH 17/91] Consolidate OpInfo printout methods

There were two different methods that wrote printouts for OpInfos, using
rather different syntaxes. We decided that one syntax was better, and
added member highlight support (which was only available using the other
    syntax).
---
 .../main/java/org/scijava/ops/OpUtils.java    | 90 ++++---------------
 .../scijava/param/JavadocParameterTest.java   | 13 +--
 2 files changed, 23 insertions(+), 80 deletions(-)

diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
index c2983bc92..42b4ea12d 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
@@ -344,86 +344,27 @@ public static String matchInfo(final MatchingResult res) {
 		return sb.toString();
 	}
 
-	/**
-	 * Gets a string describing the given op, highlighting the specific
-	 * parameter.
-	 * 
-	 * @param info
-	 *            The {@link OpInfo} metadata which describes the op.
-	 * @param special
-	 *            A parameter of particular interest when describing the op.
-	 * @return A string describing the op.
-	 */
-	public static String opString(final OpInfo info, final Member<?> special) {
-		final StringBuilder sb = new StringBuilder();
-		final String outputString = paramString(outputs(info.struct()), null).trim();
-		if (!outputString.isEmpty())
-			sb.append("(" + outputString + ") =\n\t");
-		sb.append(info.implementationName());
-		sb.append("(" + paramString(inputs(info.struct()), special) + ")");
-		return sb.toString();
-	}
-
-	/**
-	 * Helper method of {@link #opString(OpInfo, Member)} which parses a set of
-	 * items with a default delimiter of ","
-	 */
-	private static String paramString(final Iterable<Member<?>> items, final Member<?> special) {
-		return paramString(items, special, ",");
-	}
-
-	/**
-	 * As {@link #paramString(Iterable, Member, String)} with an optional
-	 * delimiter.
-	 */
-	private static String paramString(final Iterable<Member<?>> items, final Member<?> special, final String delim) {
-		return paramString(items, special, delim, false);
-	}
-
-	/**
-	 * As {@link #paramString(Iterable, Member, String)} with a toggle to
-	 * control if inputs are types only or include the names/descriptions.
-	 */
-	private static String paramString(final Iterable<Member<?>> items, final Member<?> special, final String delim,
-			final boolean typeOnly) {
-		final StringBuilder sb = new StringBuilder();
-		boolean first = true;
-		for (final Member<?> item : items) {
-			if (first)
-				first = false;
-			else
-				sb.append(delim);
-			sb.append("\n");
-			if (item == special)
-				sb.append("==>"); // highlight special item
-			sb.append("\t\t");
-			sb.append(item.getType().getTypeName());
-
-			if (!typeOnly) {
-				sb.append(" " + item.getKey());
-				sb.append(" -> " + item.getDescription());
-			}
-		}
-		return sb.toString();
+	public static String opString(final OpInfo info) {
+		return opString(info, null);
 	}
 
-	public static String opString(final OpInfo info) {
+	public static String opString(final OpInfo info, final Member<?> special) {
 		final StringBuilder sb = new StringBuilder();
 		sb.append(info.implementationName() + "(\n\t Inputs:\n");
 		for (final Member<?> arg : info.inputs()) {
-			sb.append("\t\t");
-			sb.append(arg.getType().getTypeName());
-			sb.append(" ");
-			sb.append(arg.getKey());
-			if (!arg.getDescription().isEmpty()) {
-				sb.append(" -> ");
-				sb.append(arg.getDescription());
-			}
-			sb.append("\n");
+			appendParam(sb, arg, special);
 		}
 		sb.append("\t Outputs:\n");
-		final Member<?> arg = info.output();
-		sb.append("\t\t");
+		appendParam(sb, info.output(), special);
+		sb.append(")\n");
+		return sb.toString();
+	}
+
+	private static void appendParam(final StringBuilder sb, final Member<?> arg,
+		final Member<?> special)
+	{
+		if (arg == special) sb.append("==> \t"); // highlight special item
+		else sb.append("\t\t");
 		sb.append(arg.getType().getTypeName());
 		sb.append(" ");
 		sb.append(arg.getKey());
@@ -432,8 +373,7 @@ public static String opString(final OpInfo info) {
 			sb.append(arg.getDescription());
 		}
 		sb.append("\n");
-		sb.append(")\n");
-		return sb.toString();
+		return;
 	}
 
 	public static Class<?> findFirstImplementedFunctionalInterface(final OpRef opRef) {
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
index eae511efa..d59844232 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
@@ -163,11 +163,14 @@ public void opStringRegressionTest() {
 		Assert.assertEquals(expected, actual);
 
 		// test special op string
-		expected = "(java.util.List<java.lang.Long> output -> foo + bar) =\n" +
-			"	public static java.util.List<java.lang.Long> org.scijava.param.JavadocParameterTest." +
-			"OpMethodFoo(java.util.List<java.lang.String>,java.util.List<java.lang.String>)(\n" +
-			"		java.util.List<java.lang.String> foo -> the first input,\n" +
-			"==>		java.util.List<java.lang.String> bar -> the second input)";
+		expected =
+			"public static java.util.List<java.lang.Long> org.scijava.param.JavadocParameterTest." +
+				"OpMethodFoo(java.util.List<java.lang.String>,java.util.List<java.lang.String>)(\n" +
+				"	 Inputs:\n" +
+				"		java.util.List<java.lang.String> foo -> the first input\n" +
+				"==> 	java.util.List<java.lang.String> bar -> the second input\n" +
+				"	 Outputs:\n" +
+				"		java.util.List<java.lang.Long> output -> foo + bar\n" + ")\n";
 		actual = OpUtils.opString(info, info.inputs().get(1));
 		Assert.assertEquals(expected, actual);
 	}

From c784892807cc41c11f188f15706fd2eca9539005 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Thu, 25 Mar 2021 10:17:45 -0500
Subject: [PATCH 18/91] Remove remove-params.sh script

It has outlived its usefulness to us. RIP
---
 remove-params.sh | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 remove-params.sh

diff --git a/remove-params.sh b/remove-params.sh
deleted file mode 100644
index c07cebcde..000000000
--- a/remove-params.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#perl -0777 -i -pe 's/(\@plugin[^\n]*\n)\@Parameter.key = "([^"]*)".\n/\1\/**\n * TODO\n *\n * \@param \2\n/igs' **/*.java
-#perl -0777 -i -pe 's/\@Parameter.key = "([^"]*)"[^\n]*.\n/ * \@param \1\n/igs' **/*.java
-#perl -0777 -i -pe 's/( \* \@param[^\n]*\n)([^ ])/\1 *\/\n\2/igs' **/*.java
-#perl -0777 -i -pe 's/ \*\/\n([\s]*[\*])/\1/igs' **/*.java
-#perl -0777 -i -pe 's/ \*\/\n([\s]*\@Parameter)/\1/igs' **/*.java
-#perl -0777 -i -pe 's/ \*\/\n([\s]*\/\/[\s]*\*)/\1/igs' **/*.java
-#perl -0777 -i -pe 's/ \* \@param output([^\n]*\n[\s]*\*\/\n[\s]*public[^\(]*apply\()/ \* \@return the output\1/igs' **/*.java
-perl -0777 -i -pe 's/(\s\@Override[^\n]*)\n([\s]*\/\*\*[^\/]*\/)/\2\n\1/igs' **/*.java
-

From c71f35ecbb2f123a4596f49e51f47abbd98ad928 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 26 Mar 2021 13:03:40 -0500
Subject: [PATCH 19/91] Update parent to pom-scijava 30.0.0

---
 pom.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index d88e52e8f..4f8f6baf0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>29.0.0</version>
+		<version>30.0.0</version>
 		<relativePath />
 	</parent>
 
@@ -74,7 +74,6 @@
 		<license.copyrightOwners>N/A</license.copyrightOwners>
 
 		<scijava.jvm.version>11</scijava.jvm.version>
-		<scijava.jvm.build.version>[11,11.9999]</scijava.jvm.build.version>
 		<scijava.javadoc.url.java>https://javadoc.scijava.org/Java11/</scijava.javadoc.url.java>
 		<scijava.javadoc.url.javafx>https://javadoc.scijava.org/JavaFX11/</scijava.javadoc.url.javafx>
 
@@ -114,9 +113,6 @@
 							<version>${project.version}</version>
 						</tagletArtifact>
 					</tagletArtifacts>
-					<links>
-						<link>https://javadoc.scijava.org/Java11</link>
-					</links>
 				</configuration>
 			</plugin>
 		</plugins>

From acd28cefaf95f78b4c2b4281d74cf2024d1abcc6 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Tue, 6 Apr 2021 11:05:01 -0500
Subject: [PATCH 20/91] Make @input and @param identical within Javadoc

This change applies only to method and class Ops, however it enables
@input synonymous with @param and @output synonymous with @return. This
also allows us to use @container and @mutable on Ops written as classes
and as methods. This then changes the paradigm to make the parsing of
@param and @return a bonus, but favors using @input and @output
respectively.
---
 .../scijava/param/JavadocParameterData.java   | 117 ++++++++----
 .../scijava/param/JavadocParameterTest.java   | 166 ++++++++++++++++--
 2 files changed, 234 insertions(+), 49 deletions(-)

diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
index 9db8c1c12..5ce14adf5 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
@@ -1,6 +1,7 @@
 
 package org.scijava.param;
 
+import com.github.therapi.runtimejavadoc.Comment;
 import com.github.therapi.runtimejavadoc.FieldJavadoc;
 import com.github.therapi.runtimejavadoc.MethodJavadoc;
 import com.github.therapi.runtimejavadoc.OtherJavadoc;
@@ -61,34 +62,12 @@ public JavadocParameterData(Class<?> c) {
 	 * @param f the field
 	 */
 	public JavadocParameterData(Field f) {
-		paramNames = new ArrayList<>();
-		paramDescriptions = new ArrayList<>();
-		FieldJavadoc doc = RuntimeJavadoc.getJavadoc(f);
-		for (OtherJavadoc other : doc.getOther()) {
-			switch (other.getName()) {
-				case "input":
-					String param = other.getComment().toString();
-					paramNames.add(param.substring(0, param.indexOf(" ")));
-					paramDescriptions.add(param.substring(param.indexOf(" ") + 1));
-					break;
-				case "output":
-					if (returnDescription != null) throw new IllegalArgumentException(
-						"Op cannot have multiple returns!");
-					returnDescription = other.getComment().toString();
-					break;
-			}
-		}
-
-		// ensure non-null description
-		if (returnDescription == null) returnDescription = "";
-
-		// ensure that f has enough @parameter annotations
 		Method sam = ParameterStructs.singularAbstractMethod(f.getType());
-		int numParams = sam.getParameterCount();
-		if (numParams != paramNames.size()) {
-			throw new IllegalArgumentException("Field " + f +
-				" does not have one @param annotation for each parameter of the Op!");
-		}
+		FieldJavadoc doc = RuntimeJavadoc.getJavadoc(f);
+		if (hasCustomJavadoc(doc.getOther(), sam)) populateViaCustomTaglets(doc
+			.getOther());
+		else throw new IllegalArgumentException("Field " + f +
+			" does not have enough taglets to generate OpInfo documentation!");
 	}
 
 	public JavadocParameterData(OpInfo info, Type newType) {
@@ -163,16 +142,80 @@ private Method getOpMethod(Class<?> c) throws NoSuchMethodException {
 	 */
 	private void parseMethod(Method m) {
 		MethodJavadoc doc = RuntimeJavadoc.getJavadoc(m);
-		List<ParamJavadoc> params = doc.getParams();
-		if (params.size() != m.getParameterCount())
-			throw new IllegalArgumentException("Method " + m +
-				" does not have valid @param tags for each of its inputs!");
-		paramNames = params.stream().map(param -> param.getName() != null ? param
-			.getName() : null).collect(Collectors.toList());
-		paramDescriptions = params.stream().map(param -> param.getComment()
-			.toString()).collect(Collectors.toList());
-		returnDescription = doc.getReturns().toString();
-		if (returnDescription == null) returnDescription = "";
+		if (hasVanillaJavadoc(doc, m))
+			populateViaParamAndReturn(doc.getParams(), doc.getReturns());
+		else if (hasCustomJavadoc(doc.getOther(), m))
+			populateViaCustomTaglets(doc.getOther());
+		else throw new IllegalArgumentException("Method " + m +
+			" has no suitable tag(lets) to scrape documentation from");
+	}
+
+	private boolean hasVanillaJavadoc(MethodJavadoc doc, Method m) {
+		// We require a @param tag for each of the method parameters
+		boolean sufficientParams = doc.getParams().size() == m.getParameterCount();
+		// We require a @return tag for the method return iff not null
+		boolean sufficientReturn = !((doc.getReturns() != null) ^ (m
+			.getReturnType() != void.class));
+		return sufficientParams && sufficientReturn;
+	}
+
+	private boolean hasCustomJavadoc(List<OtherJavadoc> doc, Method m) {
+		int ins = 0, outs = 0;
+		for (OtherJavadoc other : doc) {
+			switch (other.getName()) {
+				case "input":
+					ins++;
+					break;
+				case "container":
+				case "mutable":
+					ins++;
+					outs++;
+					break;
+				case "output":
+					outs++;
+					break;
+			}
+		}
+		// We require as many input/container/mutable taglets as there are parameters
+		boolean sufficientIns = ins == m.getParameterCount();
+		// We require one container/mutable/output taglet
+		boolean sufficientOuts = outs == 1;
+		return sufficientIns && sufficientOuts;
+	}
+
+	private void populateViaParamAndReturn(List<ParamJavadoc> params, Comment returnDoc) {
+		paramNames = params.stream().map(param -> param.getName()).collect(Collectors.toList());
+		paramDescriptions = params.stream().map(param -> param.getComment().toString()).collect(Collectors.toList());
+		returnDescription = returnDoc.toString();
+	}
+
+	private void populateViaCustomTaglets(List<OtherJavadoc> doc) {
+		paramNames = new ArrayList<>();
+		paramDescriptions = new ArrayList<>();
+		for (OtherJavadoc other : doc) {
+			String name = other.getName();
+			if (!validParameterTag(name)) continue;
+			// add to params if not a pure output
+			if (!name.equals("output")) {
+				String param = other.getComment().toString();
+				paramNames.add(param.substring(0, param.indexOf(" ")));
+				paramDescriptions.add(param.substring(param.indexOf(" ") + 1));
+			}
+			// add return description if an I/O 
+			if (!name.equals("input")) {
+				if (returnDescription != null) throw new IllegalArgumentException(
+					"Op cannot have multiple returns!");
+				returnDescription = other.getComment().toString();
+			}
+		}
+	}
+
+	private boolean validParameterTag(String tagType) {
+		if (tagType.equals("input")) return true;
+		if (tagType.equals("mutable")) return true;
+		if (tagType.equals("container")) return true;
+		if (tagType.equals("output")) return true;
+		return false;
 	}
 
 	@Override
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
index d59844232..c17c5095c 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
@@ -32,12 +32,44 @@
 public class JavadocParameterTest extends AbstractTestEnvironment {
 
 	/**
+	 * Tests javadoc scraping with param (P) and return (R)
+	 * 
 	 * @param foo the first input
 	 * @param bar the second input
 	 * @return foo + bar
 	 */
-	@OpMethod(names = "test.javadoc.method", type = BiFunction.class)
-	public static List<Long> OpMethodFoo(List<String> foo, List<String> bar) {
+	@OpMethod(names = "test.javadoc.methodPR", type = BiFunction.class)
+	public static List<Long> OpMethodPR(List<String> foo, List<String> bar) {
+		BiFunction<String, String, Long> func = (s1, s2) -> Long.parseLong(s1) +
+			Long.parseLong(s2);
+		return Streams.zip(foo.stream(), bar.stream(), func).collect(Collectors
+			.toList());
+	}
+
+	/**
+	 * Tests javadoc scraping with input (I) and output (O)
+	 * 
+	 * @input foo the first input
+	 * @input bar the second input
+	 * @output foo + bar
+	 */
+	@OpMethod(names = "test.javadoc.methodIO", type = BiFunction.class)
+	public static List<Long> OpMethodIO(List<String> foo, List<String> bar) {
+		BiFunction<String, String, Long> func = (s1, s2) -> Long.parseLong(s1) +
+			Long.parseLong(s2);
+		return Streams.zip(foo.stream(), bar.stream(), func).collect(Collectors
+			.toList());
+	}
+
+	/**
+	 * Tests javadoc scraping with input (I) and return (R)
+	 * 
+	 * @input foo the first input
+	 * @input bar the second input
+	 * @return foo + bar
+	 */
+	@OpMethod(names = "test.javadoc.methodIR", type = BiFunction.class)
+	public static List<Long> OpMethodIR(List<String> foo, List<String> bar) {
 		BiFunction<String, String, Long> func = (s1, s2) -> Long.parseLong(s1) +
 			Long.parseLong(s2);
 		return Streams.zip(foo.stream(), bar.stream(), func).collect(Collectors
@@ -45,14 +77,50 @@ public static List<Long> OpMethodFoo(List<String> foo, List<String> bar) {
 	}
 
 	@Test
-	public void testJavadocMethod() {
-		Iterator<OpInfo> infos = ops.env().infos("test.javadoc.method").iterator();
+	public void testJavadocMethodPR() {
+		Iterator<OpInfo> infos = ops.env().infos("test.javadoc.methodPR").iterator();
 
 		OpInfo info = infos.next();
 		if (infos.hasNext()) {
 			Assert.fail("Multiple OpInfos with name \"test.javadoc.method\"");
 		}
+		isSuitableScrapedOpMethodInfo(info);
+	}
+
+	@Test
+	public void testJavadocMethodIO() {
+		Iterator<OpInfo> infos = ops.env().infos("test.javadoc.methodIO").iterator();
 
+		OpInfo info = infos.next();
+		if (infos.hasNext()) {
+			Assert.fail("Multiple OpInfos with name \"test.javadoc.method\"");
+		}
+		isSuitableScrapedOpMethodInfo(info);
+	}
+
+	@Test
+	public void testJavadocMethodIR() {
+		Iterator<OpInfo> infos = ops.env().infos("test.javadoc.methodIR").iterator();
+
+		OpInfo info = infos.next();
+		if (infos.hasNext()) {
+			Assert.fail("Multiple OpInfos with name \"test.javadoc.method\"");
+		}
+		isSuitableGenericOpMethodInfo(info);
+	}
+	
+	/**
+	 * Asserts that the {@link OpInfo} has as inputs:
+	 * <ul>
+	 * <li> foo - the first input
+	 * <li> bar - the second input
+	 * </ul>
+	 * and as output:
+	 * <ul>
+	 * <li> output - foo + bar
+	 * </ul>
+	 */
+	private void isSuitableScrapedOpMethodInfo(OpInfo info) {
 		// assert input names
 		String[] inputNames = info.inputs().stream().map(m -> m.getKey()).toArray(
 			String[]::new);
@@ -72,23 +140,66 @@ public void testJavadocMethod() {
 		Assert.assertEquals("foo + bar", outputDescription);
 	}
 
+	/**
+	 * Asserts that the {@link OpInfo} has as inputs:
+	 * <ul>
+	 * <li> input1
+	 * <li> input2
+	 * </ul>
+	 * and as output:
+	 * <ul>
+	 * <li> output1
+	 * </ul>
+	 */
+	private void isSuitableGenericOpMethodInfo(OpInfo info) {
+		// assert input names
+		String[] inputNames = info.inputs().stream().map(m -> m.getKey()).toArray(
+			String[]::new);
+		Assert.assertArrayEquals(inputNames, new String[] { "input1", "input2" });
+
+		// assert input descriptions
+		String[] inputDescriptions = info.inputs().stream().map(m -> m.getDescription()).toArray(
+			String[]::new);
+		Assert.assertArrayEquals(inputDescriptions, new String[] { "", "" });
+
+		// assert output name
+		String outputName = info.output().getKey();
+		Assert.assertEquals("output1", outputName);
+
+		// assert output description
+		String outputDescription = info.output().getDescription();
+		Assert.assertEquals("", outputDescription);
+	}
+
 	/**
 	 * @input in the input
 	 * @output the output
 	 */
-	@OpField(names = "test.javadoc.field")
+	@OpField(names = "test.javadoc.fieldF")
 	public final Function<Double, Double> javadocFieldOp = (in) -> in + 1;
 
+	/**
+	 * @input inList the input
+	 * @container outList the preallocated output
+	 */
+	@OpField(names = "test.javadoc.fieldC")
+	public final Computers.Arity1<List<Double>, List<Double>> javadocFieldOpComputer = (in, out) -> {
+		out.clear();
+		for(Double d :in) {
+			out.add(d + 1);
+		}
+	};
+
 	@Test
-	public void testJavadocField() {
-		Iterator<OpInfo> infos = ops.env().infos("test.javadoc.field").iterator();
+	public void testJavadocFieldF() {
+		Iterator<OpInfo> infos = ops.env().infos("test.javadoc.fieldF").iterator();
 
 		if (!infos.hasNext()) {
-			Assert.fail("No OpInfos with name \"test.javadoc.field\"");
+			Assert.fail("No OpInfos with name \"test.javadoc.fieldF\"");
 		}
 		OpInfo info = infos.next();
 		if (infos.hasNext()) {
-			Assert.fail("Multiple OpInfos with name \"test.javadoc.field\"");
+			Assert.fail("Multiple OpInfos with name \"test.javadoc.fieldF\"");
 		}
 
 		// assert input names
@@ -109,6 +220,37 @@ public void testJavadocField() {
 		String outputDescription = info.output().getDescription();
 		assertEquals("the output", outputDescription);
 	}
+	
+	@Test
+	public void testJavadocFieldC() {
+		Iterator<OpInfo> infos = ops.env().infos("test.javadoc.fieldC").iterator();
+
+		if (!infos.hasNext()) {
+			Assert.fail("No OpInfos with name \"test.javadoc.fieldC\"");
+		}
+		OpInfo info = infos.next();
+		if (infos.hasNext()) {
+			Assert.fail("Multiple OpInfos with name \"test.javadoc.fieldC\"");
+		}
+
+		// assert input names
+		String[] inputNames = info.inputs().stream().map(m -> m.getKey()).toArray(
+			String[]::new);
+		Assert.assertArrayEquals(new String[] { "inList", "outList" }, inputNames);
+
+		// assert input descriptions
+		String[] inputDescriptions = info.inputs().stream().map(m -> m.getDescription()).toArray(
+			String[]::new);
+		Assert.assertArrayEquals(new String[] { "the input", "the preallocated output" }, inputDescriptions);
+
+		// assert output name
+		String outputName = info.output().getKey();
+		Assert.assertEquals("outList", outputName);
+
+		// assert output description
+		String outputDescription = info.output().getDescription();
+		assertEquals("the preallocated output", outputDescription);
+	}
 
 	@Test
 	public void testJavadocClass() {
@@ -143,7 +285,7 @@ public void testJavadocClass() {
 
 	@Test
 	public void opStringRegressionTest() {
-		Iterator<OpInfo> infos = ops.env().infos("test.javadoc.method").iterator();
+		Iterator<OpInfo> infos = ops.env().infos("test.javadoc.methodPR").iterator();
 
 		OpInfo info = infos.next();
 		if (infos.hasNext()) {
@@ -153,7 +295,7 @@ public void opStringRegressionTest() {
 		// test standard op string
 		String expected =
 			"public static java.util.List<java.lang.Long> org.scijava.param.JavadocParameterTest." +
-				"OpMethodFoo(java.util.List<java.lang.String>,java.util.List<java.lang.String>)(\n" +
+				"OpMethodPR(java.util.List<java.lang.String>,java.util.List<java.lang.String>)(\n" +
 				"	 Inputs:\n" +
 				"		java.util.List<java.lang.String> foo -> the first input\n" +
 				"		java.util.List<java.lang.String> bar -> the second input\n" +
@@ -165,7 +307,7 @@ public void opStringRegressionTest() {
 		// test special op string
 		expected =
 			"public static java.util.List<java.lang.Long> org.scijava.param.JavadocParameterTest." +
-				"OpMethodFoo(java.util.List<java.lang.String>,java.util.List<java.lang.String>)(\n" +
+				"OpMethodPR(java.util.List<java.lang.String>,java.util.List<java.lang.String>)(\n" +
 				"	 Inputs:\n" +
 				"		java.util.List<java.lang.String> foo -> the first input\n" +
 				"==> 	java.util.List<java.lang.String> bar -> the second input\n" +

From 36d262c0320a77ffd7b2009c93ddeba663b9c959 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Thu, 8 Apr 2021 14:07:03 -0500
Subject: [PATCH 21/91] Prevent NSEExceptions when OpMethod type incorrect

Suppose that an Inplace OpMethod is annotated with the functional
interface BiFunction. We must catch these situations quickly and fail
before the struct is generated, as it is not the job of ParameterStructs
to deal with incorrectly annotated methods
---
 .../org/scijava/ops/matcher/OpMethodInfo.java     | 15 +++++++--------
 .../org/scijava/param/JavadocParameterTest.java   |  1 +
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java
index f58dafd4d..35f1c392e 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java
@@ -97,16 +97,15 @@ public OpMethodInfo(final Method method) {
 		}
 		this.method = method;
 		this.hints = formHints(method.getAnnotation(OpHints.class));
+		// determine the functional interface this Op should implement
+		final OpMethod methodAnnotation = method.getAnnotation(OpMethod.class);
 		try {
+			opType = ParameterStructs.getOpMethodType(methodAnnotation.type(),
+				method);
 			struct = ParameterStructs.structOf(method.getDeclaringClass(), method);
-			final OpMethod methodAnnotation = method.getAnnotation(OpMethod.class);
-			try {
-				opType = ParameterStructs.getOpMethodType(methodAnnotation.type(),
-					method);
-			}
-			catch (IllegalArgumentException e) {
-				opType = Types.parameterizeRaw(methodAnnotation.type());
-			}
+		}
+		catch (IllegalArgumentException e) {
+			problems.add(new ValidityProblem(e));
 		}
 		catch (final ValidityException e) {
 			problems.addAll(e.problems());
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
index c17c5095c..02dab7ff1 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
@@ -13,6 +13,7 @@
 
 import org.junit.Assert;
 import org.junit.Test;
+import org.scijava.function.Computers;
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.OpField;
 import org.scijava.ops.OpInfo;

From 82a9d14bd0b418f3a9bcf46b8cfcec83669cd376 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 9 Apr 2021 12:34:37 -0500
Subject: [PATCH 22/91] Make javadoc parsing robust against OpDependency

---
 .../scijava/param/JavadocParameterData.java   | 32 +++++++++++++------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
index 5ce14adf5..d89e0a55d 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
@@ -22,6 +22,7 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import org.scijava.ops.OpDependency;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.simplify.SimplificationUtils;
 import org.scijava.struct.Member;
@@ -64,7 +65,9 @@ public JavadocParameterData(Class<?> c) {
 	public JavadocParameterData(Field f) {
 		Method sam = ParameterStructs.singularAbstractMethod(f.getType());
 		FieldJavadoc doc = RuntimeJavadoc.getJavadoc(f);
-		if (hasCustomJavadoc(doc.getOther(), sam)) populateViaCustomTaglets(doc
+		long numIns = sam.getParameterCount();
+		long numOuts = 1; // There is always one output
+		if (hasCustomJavadoc(doc.getOther(), numIns, numOuts)) populateViaCustomTaglets(doc
 			.getOther());
 		else throw new IllegalArgumentException("Field " + f +
 			" does not have enough taglets to generate OpInfo documentation!");
@@ -142,24 +145,33 @@ private Method getOpMethod(Class<?> c) throws NoSuchMethodException {
 	 */
 	private void parseMethod(Method m) {
 		MethodJavadoc doc = RuntimeJavadoc.getJavadoc(m);
-		if (hasVanillaJavadoc(doc, m))
+		long numOpParams = getOpParams(m);
+		long numReturns = m.getReturnType() == void.class ? 0 : 1;
+		if (hasVanillaJavadoc(doc, numOpParams, numReturns))
 			populateViaParamAndReturn(doc.getParams(), doc.getReturns());
-		else if (hasCustomJavadoc(doc.getOther(), m))
+		else if (hasCustomJavadoc(doc.getOther(), numOpParams, 1))
 			populateViaCustomTaglets(doc.getOther());
 		else throw new IllegalArgumentException("Method " + m +
 			" has no suitable tag(lets) to scrape documentation from");
 	}
 
-	private boolean hasVanillaJavadoc(MethodJavadoc doc, Method m) {
+	private long getOpParams(Method m) {
+		return Arrays //
+			.stream(m.getParameters()) //
+			.filter(param -> param.getAnnotation(OpDependency.class) == null).count();
+	}
+
+	private boolean hasVanillaJavadoc(MethodJavadoc doc, long numParams, long numReturns) {
 		// We require a @param tag for each of the method parameters
-		boolean sufficientParams = doc.getParams().size() == m.getParameterCount();
+		boolean sufficientParams = doc.getParams().size() == numParams;
 		// We require a @return tag for the method return iff not null
-		boolean sufficientReturn = !((doc.getReturns() != null) ^ (m
-			.getReturnType() != void.class));
+		boolean javadocReturn = doc.getReturns() != null;
+		boolean methodReturn = numReturns == 1;
+		boolean sufficientReturn = javadocReturn == methodReturn;
 		return sufficientParams && sufficientReturn;
 	}
 
-	private boolean hasCustomJavadoc(List<OtherJavadoc> doc, Method m) {
+	private boolean hasCustomJavadoc(List<OtherJavadoc> doc, long numIns, long numOuts) {
 		int ins = 0, outs = 0;
 		for (OtherJavadoc other : doc) {
 			switch (other.getName()) {
@@ -177,9 +189,9 @@ private boolean hasCustomJavadoc(List<OtherJavadoc> doc, Method m) {
 			}
 		}
 		// We require as many input/container/mutable taglets as there are parameters
-		boolean sufficientIns = ins == m.getParameterCount();
+		boolean sufficientIns = ins == numIns;
 		// We require one container/mutable/output taglet
-		boolean sufficientOuts = outs == 1;
+		boolean sufficientOuts = outs == numOuts;
 		return sufficientIns && sufficientOuts;
 	}
 

From 40c4027b10cddcb5aa70735858c9e8ba901c9274 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 9 Apr 2021 14:46:14 -0500
Subject: [PATCH 23/91] Comment method

---
 .../src/main/java/org/scijava/param/JavadocParameterData.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
index d89e0a55d..d8343544a 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
@@ -144,13 +144,17 @@ private Method getOpMethod(Class<?> c) throws NoSuchMethodException {
 	 * @param m the method whose javadoc has tags we want to parse
 	 */
 	private void parseMethod(Method m) {
+		// determine the Op inputs/outputs
 		MethodJavadoc doc = RuntimeJavadoc.getJavadoc(m);
 		long numOpParams = getOpParams(m);
 		long numReturns = m.getReturnType() == void.class ? 0 : 1;
+		// scrape the conventional javadoc tags iff present
 		if (hasVanillaJavadoc(doc, numOpParams, numReturns))
 			populateViaParamAndReturn(doc.getParams(), doc.getReturns());
+		// scrape our custom javadoc taglets iff present
 		else if (hasCustomJavadoc(doc.getOther(), numOpParams, 1))
 			populateViaCustomTaglets(doc.getOther());
+		// give up if neither is fully present
 		else throw new IllegalArgumentException("Method " + m +
 			" has no suitable tag(lets) to scrape documentation from");
 	}

From c3ba23f3bb973d8681a6a1e0c0ba516c63fcdc12 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 9 Apr 2021 14:46:47 -0500
Subject: [PATCH 24/91] Track OpDependencies with a taglet

Used so that we maintain one tag per input for Ops written as methods.
This taglet should not appear on Ops written as Fields or as Classes
(although it will not break anything if they do, the javadoc parser just
 ignores these lines)
---
 .../scijava/taglets/OpDependencyTaglet.java   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 scijava/scijava-taglets/src/main/java/org/scijava/taglets/OpDependencyTaglet.java

diff --git a/scijava/scijava-taglets/src/main/java/org/scijava/taglets/OpDependencyTaglet.java b/scijava/scijava-taglets/src/main/java/org/scijava/taglets/OpDependencyTaglet.java
new file mode 100644
index 000000000..9e9ce025b
--- /dev/null
+++ b/scijava/scijava-taglets/src/main/java/org/scijava/taglets/OpDependencyTaglet.java
@@ -0,0 +1,21 @@
+package org.scijava.taglets;
+
+import java.util.Map;
+
+import jdk.javadoc.doclet.Taglet;
+
+/**
+ * A taglet handling {@code @dependency} tags.
+ * 
+ * @author Gabriel Selzer
+ */
+public class OpDependencyTaglet extends ParamTaglet {
+
+	public static void register(Map<String, Taglet> tagletMap) {
+		new OpDependencyTaglet().registerMe(tagletMap);
+	}
+
+	public OpDependencyTaglet() {
+		super("Dependency");
+	}
+}
\ No newline at end of file

From 7caa8221bd29214331cd3861ecedae40f45cd160 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 9 Apr 2021 14:51:59 -0500
Subject: [PATCH 25/91] Add javadoc scraping tests

---
 .../scijava/param/JavadocParameterTest.java   | 111 ++++++++++++++++++
 1 file changed, 111 insertions(+)

diff --git a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
index 02dab7ff1..ba18dc7d2 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
@@ -14,7 +14,9 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.scijava.function.Computers;
+import org.scijava.function.Inplaces;
 import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.OpDependency;
 import org.scijava.ops.OpField;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpMethod;
@@ -77,6 +79,20 @@ public static List<Long> OpMethodIR(List<String> foo, List<String> bar) {
 			.toList());
 	}
 
+	/**
+	 * Tests javadoc scraping with input (I) ONLY
+	 * 
+	 * @input foo the first input
+	 * @input bar the second input
+	 */
+	@OpMethod(names = "test.javadoc.methodI", type = BiFunction.class)
+	public static List<Long> OpMethodI(List<String> foo, List<String> bar) {
+		BiFunction<String, String, Long> func = (s1, s2) -> Long.parseLong(s1) +
+			Long.parseLong(s2);
+		return Streams.zip(foo.stream(), bar.stream(), func).collect(Collectors
+			.toList());
+	}
+
 	@Test
 	public void testJavadocMethodPR() {
 		Iterator<OpInfo> infos = ops.env().infos("test.javadoc.methodPR").iterator();
@@ -110,6 +126,101 @@ public void testJavadocMethodIR() {
 		isSuitableGenericOpMethodInfo(info);
 	}
 	
+	@Test
+	public void testJavadocMethodI() {
+		Iterator<OpInfo> infos = ops.env().infos("test.javadoc.methodI").iterator();
+
+		OpInfo info = infos.next();
+		if (infos.hasNext()) {
+			Assert.fail("Multiple OpInfos with name \"test.javadoc.method\"");
+		}
+		isSuitableGenericOpMethodInfo(info);
+	}
+
+	/**
+	 * Tests javadoc scraping of mutable taglet
+	 * 
+	 * @mutable foo the i/o argument
+	 */
+	@OpMethod(names = "test.javadoc.methodInplaceI", type = Inplaces.Arity1.class)
+	public static void OpMethodInplaceI(List<String> foo) {
+		for (int i = 0; i < foo.size(); i++) {
+			foo.set(i, foo.get(i) + " foo");
+		}
+	}
+
+	/**
+	 * Tests javadoc scraping of mutable taglet
+	 * 
+	 * @dependency inplace the Op being wrapped
+	 * @mutable foo the i/o argument
+	 */
+	@OpMethod(names = "test.javadoc.methodDependency", type = Inplaces.Arity1.class)
+	public static void OpMethodInplaceI(@OpDependency(
+		name = "test.javadoc.methodInplaceI") Inplaces.Arity1<List<String>> inplace,
+		List<String> foo)
+	{
+		inplace.mutate(foo);
+	}
+
+	@Test
+	public void testJavadocMethodInplaceI() {
+		Iterator<OpInfo> infos = ops.env().infos("test.javadoc.methodInplaceI").iterator();
+
+		OpInfo info = infos.next();
+		if (infos.hasNext()) {
+			Assert.fail("Multiple OpInfos with name \"test.javadoc.method\"");
+		}
+
+		// assert input names
+		String[] inputNames = info.inputs().stream().map(m -> m.getKey()).toArray(
+			String[]::new);
+		Assert.assertArrayEquals(inputNames, new String[] { "foo" });
+
+		// assert input descriptions
+		String[] inputDescriptions = info.inputs().stream().map(m -> m
+			.getDescription()).toArray(String[]::new);
+		Assert.assertArrayEquals(inputDescriptions, new String[] {
+			"the i/o argument"});
+
+		// assert output name
+		String outputName = info.output().getKey();
+		Assert.assertEquals("foo", outputName);
+
+		// assert output description
+		String outputDescription = info.output().getDescription();
+		Assert.assertEquals("the i/o argument", outputDescription);
+	}
+	
+	@Test
+	public void testJavadocMethodInplaceWithDepedency() {
+		Iterator<OpInfo> infos = ops.env().infos("test.javadoc.methodDependency").iterator();
+
+		OpInfo info = infos.next();
+		if (infos.hasNext()) {
+			Assert.fail("Multiple OpInfos with name \"test.javadoc.methodDependency\"");
+		}
+
+		// assert input names
+		String[] inputNames = info.inputs().stream().map(m -> m.getKey()).toArray(
+			String[]::new);
+		Assert.assertArrayEquals(inputNames, new String[] { "foo" });
+
+		// assert input descriptions
+		String[] inputDescriptions = info.inputs().stream().map(m -> m
+			.getDescription()).toArray(String[]::new);
+		Assert.assertArrayEquals(inputDescriptions, new String[] {
+			"the i/o argument"});
+
+		// assert output name
+		String outputName = info.output().getKey();
+		Assert.assertEquals("foo", outputName);
+
+		// assert output description
+		String outputDescription = info.output().getDescription();
+		Assert.assertEquals("the i/o argument", outputDescription);
+	}
+
 	/**
 	 * Asserts that the {@link OpInfo} has as inputs:
 	 * <ul>

From aa2d8af1577643dcb3b8075740d6d216ee2448c2 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 9 Apr 2021 15:04:27 -0500
Subject: [PATCH 26/91] Comment JavadocParameterData

---
 .../scijava/param/JavadocParameterData.java   | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
index d8343544a..2e0276f4b 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
@@ -165,6 +165,18 @@ private long getOpParams(Method m) {
 			.filter(param -> param.getAnnotation(OpDependency.class) == null).count();
 	}
 
+	/**
+	 * Determines whether {@code doc} has enough {@code @param} tags to satisfy
+	 * the number of inputs to the Op ({@code numParams}), as well as enough
+	 * {@code @return} taglets to satisfy the number of Op outputs
+	 * ({@code numReturns}).
+	 * 
+	 * @param doc the {@link OtherJavadoc}s found by the javadoc parser.
+	 * @param numParams the desired number of inputs
+	 * @param numReturns the desired number of outputs
+	 * @return true iff there are {@code numParams} inputs and {@code numReturns}
+	 *         outputs
+	 */
 	private boolean hasVanillaJavadoc(MethodJavadoc doc, long numParams, long numReturns) {
 		// We require a @param tag for each of the method parameters
 		boolean sufficientParams = doc.getParams().size() == numParams;
@@ -175,6 +187,19 @@ private boolean hasVanillaJavadoc(MethodJavadoc doc, long numParams, long numRet
 		return sufficientParams && sufficientReturn;
 	}
 
+	/**
+	 * Determines whether {@code doc} has enough
+	 * {@code @input/@container/@mutable} tags to satisfy the number of inputs to
+	 * the Op ({@code numIns}), as well as enough
+	 * {@code @container/@mutable/@output} taglets to satisfy the number of Op
+	 * outputs ({@code numOuts}).
+	 * 
+	 * @param doc the {@link OtherJavadoc}s found by the javadoc parser.
+	 * @param numIns the desired number of inputs
+	 * @param numOuts the desired number of outputs
+	 * @return true iff there are {@code numIns} inputs and {@code numOuts}
+	 *         outputs
+	 */
 	private boolean hasCustomJavadoc(List<OtherJavadoc> doc, long numIns, long numOuts) {
 		int ins = 0, outs = 0;
 		for (OtherJavadoc other : doc) {
@@ -199,12 +224,29 @@ private boolean hasCustomJavadoc(List<OtherJavadoc> doc, long numIns, long numOu
 		return sufficientIns && sufficientOuts;
 	}
 
+	/**
+	 * Populates {@link JavadocParameterData#paramNames} and
+	 * {@link JavadocParameterData#paramDescriptions} using {@code params}, and
+	 * {@link JavadocParameterData#returnDescription} using {@code returnDoc}.
+	 * 
+	 * @param params the {@code @param} tags on the method of interest
+	 * @param returnDoc the string following {@code @return}
+	 */
 	private void populateViaParamAndReturn(List<ParamJavadoc> params, Comment returnDoc) {
 		paramNames = params.stream().map(param -> param.getName()).collect(Collectors.toList());
 		paramDescriptions = params.stream().map(param -> param.getComment().toString()).collect(Collectors.toList());
 		returnDescription = returnDoc.toString();
 	}
 
+	/**
+	 * Populates {@link JavadocParameterData#paramNames},
+	 * {@link JavadocParameterData#paramDescriptions}, and, and
+	 * {@link JavadocParameterData#returnDescription} using
+	 * {@code @input/@output/@container/@mutable} taglets.
+	 * 
+	 * @param doc the {@link List} of {@link OtherJavadoc}s containing all of the
+	 *          taglets we need to parse
+	 */
 	private void populateViaCustomTaglets(List<OtherJavadoc> doc) {
 		paramNames = new ArrayList<>();
 		paramDescriptions = new ArrayList<>();
@@ -226,6 +268,13 @@ private void populateViaCustomTaglets(List<OtherJavadoc> doc) {
 		}
 	}
 
+	/**
+	 * Determines if {@code tagType} is one of the tags that we are interested in
+	 * scraping.
+	 * 
+	 * @param tagType the tag we might need to scrape
+	 * @return true iff it is interesting to us
+	 */
 	private boolean validParameterTag(String tagType) {
 		if (tagType.equals("input")) return true;
 		if (tagType.equals("mutable")) return true;
@@ -234,6 +283,12 @@ private boolean validParameterTag(String tagType) {
 		return false;
 	}
 
+	/**
+	 * Synthesizes a set of {@link Parameter}s using the data present in the
+	 * javadoc, as well as {@code fmts}.
+	 * 
+	 * @param fmts the list of inputs, outputs, and other types required by the Op
+	 */
 	@Override
 	public List<Parameter> synthesizeAnnotations(List<FunctionalMethodType> fmts) {
 		List<Parameter> params = new ArrayList<>();

From dd09256b6b3baf82753ec41db7ec38cdff7ecef6 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Thu, 22 Apr 2021 12:08:58 -0500
Subject: [PATCH 27/91] Delete javax.annotation.processing.Processor file

Unnecessary - maven handles this for us
---
 .../META-INF/services/javax.annotation.processing.Processor     | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 scijava/scijava-ops/src/main/resources/META-INF/services/javax.annotation.processing.Processor

diff --git a/scijava/scijava-ops/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/scijava/scijava-ops/src/main/resources/META-INF/services/javax.annotation.processing.Processor
deleted file mode 100644
index 2b8a1fdb0..000000000
--- a/scijava/scijava-ops/src/main/resources/META-INF/services/javax.annotation.processing.Processor
+++ /dev/null
@@ -1,2 +0,0 @@
-org.scijava.annotations.AnnotationProcessor
-com.github.therapi.runtimejavadoc.internal.JavadocAnnotationProcessor

From 91b4f91f8dc3d45e80a9a9f23642bd483189efbd Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 23 Apr 2021 14:26:56 -0500
Subject: [PATCH 28/91] generate module-info via Apache Velocity

---
 .../src/main/java/module-info.java            | 44 +++++++++--
 .../test/java/org/scijava/ops/ModuleTest.java | 77 +++++++++++++++++++
 .../java/org/scijava/ops/OpMethodTest.java    |  1 +
 .../java/org/scijava/ops/OpMethodTestOps.java |  1 +
 .../templates/main/java/module-info.list      | 45 +++++++++++
 .../templates/main/java/module-info.vm        | 45 +++++++++++
 6 files changed, 205 insertions(+), 8 deletions(-)
 create mode 100644 scijava/scijava-ops/src/test/java/org/scijava/ops/ModuleTest.java
 create mode 100644 scijava/scijava-ops/templates/main/java/module-info.list
 create mode 100644 scijava/scijava-ops/templates/main/java/module-info.vm

diff --git a/scijava/scijava-ops/src/main/java/module-info.java b/scijava/scijava-ops/src/main/java/module-info.java
index 072093843..a8eeeda22 100644
--- a/scijava/scijava-ops/src/main/java/module-info.java
+++ b/scijava/scijava-ops/src/main/java/module-info.java
@@ -1,29 +1,57 @@
-open module org.scijava.ops {
-	
+module org.scijava.ops {
+
+/*
+ * This is autogenerated source code -- DO NOT EDIT. Instead, edit the
+ * corresponding template in templates/ and rerun bin/generate.groovy.
+ */
+
 	//TODO: rearrange packages to export only needed classes
 	exports org.scijava.ops; //contains OpDependency interface
 	exports org.scijava.ops.core; // contains OpCollection, Op interfaces
 	exports org.scijava.ops.core.builder; // contains OpBuilder classes
-	exports org.scijava.ops.hints;
 	exports org.scijava.ops.matcher;
-	exports org.scijava.ops.provenance;
 	exports org.scijava.ops.math;
 	exports org.scijava.ops.simplify;
 	exports org.scijava.ops.conversionLoss;
+	exports org.scijava.ops.provenance;
 	// TODO: move OpWrapper to its own package (org.scijava.ops.wrap??)
 	exports org.scijava.ops.util; // contains OpWrapper interface
 	exports org.scijava.struct;
 	exports org.scijava.param;
 
-  // FIXME: This is a file name and is thus unstable
-  requires geantyref;
+	opens org.scijava.ops.conversionLoss to therapi.runtime.javadoc;
+	opens org.scijava.ops.log to therapi.runtime.javadoc;
+	opens org.scijava.ops.core.builder to therapi.runtime.javadoc;
+	opens org.scijava.ops.copy to therapi.runtime.javadoc;
+	opens org.scijava.ops.hints to therapi.runtime.javadoc;
+	opens org.scijava.ops.adapt.complexLift to therapi.runtime.javadoc;
+	opens org.scijava.ops.math to therapi.runtime.javadoc;
+	opens org.scijava.ops.adapt.lift to therapi.runtime.javadoc;
+	opens org.scijava.ops.create to therapi.runtime.javadoc;
+	opens org.scijava.ops.impl to therapi.runtime.javadoc, org.scijava;
+	opens org.scijava.ops.monitor to therapi.runtime.javadoc;
+	opens org.scijava.ops.provenance to therapi.runtime.javadoc;
+	opens org.scijava.ops.hints.impl to therapi.runtime.javadoc;
+	opens org.scijava.ops.adapt.functional to therapi.runtime.javadoc;
+	opens org.scijava.ops to therapi.runtime.javadoc, org.scijava;
+	opens org.scijava.ops.util to therapi.runtime.javadoc;
+	opens org.scijava.struct to therapi.runtime.javadoc;
+	opens org.scijava.ops.matcher to therapi.runtime.javadoc;
+	opens org.scijava.ops.simplify to therapi.runtime.javadoc;
+	opens org.scijava.ops.stats to therapi.runtime.javadoc;
+	opens org.scijava.ops.core to therapi.runtime.javadoc;
+	opens org.scijava.ops.provenance.impl to therapi.runtime.javadoc, org.scijava;
+	opens org.scijava.param to therapi.runtime.javadoc;
 
-  requires java.desktop;
+	// FIXME: This is a file name and is thus unstable
+	requires geantyref;
+
+	requires java.desktop;
 
 	requires org.scijava;
+	requires org.scijava.function;
 	requires org.scijava.types;
 	requires javassist;
-	requires org.scijava.function;
 	requires java.compiler;
 	requires therapi.runtime.javadoc;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/ModuleTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/ModuleTest.java
new file mode 100644
index 000000000..788e20708
--- /dev/null
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/ModuleTest.java
@@ -0,0 +1,77 @@
+
+package org.scijava.ops;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.junit.Test;
+
+public class ModuleTest extends AbstractTestEnvironment {
+
+	String moduleBaseDirectory = "src/main/java/org/scijava";
+
+	/**
+	 * Recursively finds the name of each package within the module
+	 * org.scijava.ops
+	 * 
+	 * @param set the set that will be populated with the module names
+	 * @param dirName the starting directory
+	 */
+	private void findPackageNames(Set<String> set, String dirName) {
+		File directory = new File(dirName);
+		// get all the files from a directory
+		File[] fList = directory.listFiles();
+		for (File file : fList) {
+			if (file.isFile()) {
+				String path = file.getPath();
+				String packName = path.substring(path.indexOf("org"), path.lastIndexOf(File.separatorChar));
+				set.add(packName.replace(File.separatorChar, '.'));
+			}
+			else if (file.isDirectory()) {
+				findPackageNames(set, file.getAbsolutePath());
+			}
+		}
+	}
+
+	private Set<String> getPackagesExported(String path) {
+		try {
+			Stream<String> stream = Files.lines(Paths.get(path));
+			// remove outside whitespace
+			Set<String> exportedPackages = stream.map(str -> str.trim())
+				// consider only opens
+				.filter(str -> str.startsWith("opens"))
+				// consider only opens to therapi
+				.filter(str -> str.contains("therapi.runtime.javadoc"))
+				// get the package from the opens
+				.map(str -> str.split(" ")[1]).collect(Collectors.toSet());
+			return exportedPackages;
+		}
+		catch (IOException e) {
+			throw new RuntimeException();
+		}
+	}
+
+	@Test
+	public void testTherapiExports() {
+		Set<String> packages = new HashSet<>();
+		findPackageNames(packages, moduleBaseDirectory);
+
+		Set<String> exportedPackages = getPackagesExported(
+			"src/main/java/module-info.java");
+
+		assertTrue(
+			"module-info.java does not export all packages to therapi.runtime.javadoc," +
+				" use bin/generate-groovy.sh to update the list!", packages.equals(
+					exportedPackages));
+	}
+
+}
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java
index 92d6b6606..8ce2e3195 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java
@@ -45,6 +45,7 @@
 import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
+import org.scijava.struct.ItemIO;
 import org.scijava.types.Nil;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
index 7407db8b8..585b1f836 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
@@ -40,6 +40,7 @@
 import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
+import org.scijava.struct.ItemIO;
 
 @Plugin(type = OpCollection.class)
 public class OpMethodTestOps {
diff --git a/scijava/scijava-ops/templates/main/java/module-info.list b/scijava/scijava-ops/templates/main/java/module-info.list
new file mode 100644
index 000000000..d6066d4b0
--- /dev/null
+++ b/scijava/scijava-ops/templates/main/java/module-info.list
@@ -0,0 +1,45 @@
+[module-info.java]
+findPackageNames = ```
+import java.io.File;
+import java.util.Set;
+{ set, dirName ->
+
+	File directory = new File(dirName);
+	// get all the files from a directory
+	File[] fList = directory.listFiles();
+	for (File file : fList) {
+		if (file.isFile()) {
+			String path = file.getPath();
+			int begin = path.indexOf("org");
+			int end = path.lastIndexOf('/');
+			String packName = path.substring(begin, end);
+			set.add(packName.replace('/', '.'));
+		}
+		else if (file.isDirectory()) {
+			findPackageNames(set, file.getAbsolutePath());
+		}
+	}
+}
+```
+
+modulePackages = ```
+import java.util.HashSet;
+{ path ->
+  set = new HashSet<>();
+  findPackageNames(set, path);
+  return set;
+}
+```
+
+opensToString = ```
+import java.util.HashSet;
+{ p, scijavaPackages, therapiPackages ->
+	set = new HashSet<>();
+	if (scijavaPackages.contains(p))
+		set.add("org.scijava");
+	if (therapiPackages.contains(p))
+		set.add("therapi.runtime.javadoc");
+	String packageString = set.toArray().toString();
+	return packageString.substring(1, packageString.length() - 1);
+}
+```
\ No newline at end of file
diff --git a/scijava/scijava-ops/templates/main/java/module-info.vm b/scijava/scijava-ops/templates/main/java/module-info.vm
new file mode 100644
index 000000000..eabbd4dd8
--- /dev/null
+++ b/scijava/scijava-ops/templates/main/java/module-info.vm
@@ -0,0 +1,45 @@
+module org.scijava.ops {
+
+/*
+ * This is autogenerated source code -- DO NOT EDIT. Instead, edit the
+ * corresponding template in templates/ and rerun bin/generate.groovy.
+ */
+
+## Determines all packages in the module
+#set($packages = $modulePackages.call("src/main/java/org/scijava"))
+## Defines the packages that should be exported to org.scijava
+#set($scijavaPackages = ["org.scijava.ops", "org.scijava.ops.impl", "org.scijava.ops.provenance.impl"])
+## Defines the packages that should be exported to therapi.runtime.javadoc
+#set($therapiPackages = $modulePackages.call("src/main/java/org/scijava"))
+	//TODO: rearrange packages to export only needed classes
+	exports org.scijava.ops; //contains OpDependency interface
+	exports org.scijava.ops.core; // contains OpCollection, Op interfaces
+	exports org.scijava.ops.core.builder; // contains OpBuilder classes
+	exports org.scijava.ops.matcher;
+	exports org.scijava.ops.math;
+	exports org.scijava.ops.simplify;
+	exports org.scijava.ops.conversionLoss;
+	exports org.scijava.ops.provenance;
+	// TODO: move OpWrapper to its own package (org.scijava.ops.wrap??)
+	exports org.scijava.ops.util; // contains OpWrapper interface
+	exports org.scijava.struct;
+	exports org.scijava.param;
+
+#foreach($package in $packages)
+	opens $package to $opensToString.call($package, $scijavaPackages, $therapiPackages);
+#end
+
+	// FIXME: This is a file name and is thus unstable
+	requires geantyref;
+
+	requires java.desktop;
+
+	requires org.scijava;
+	requires org.scijava.function;
+	requires org.scijava.types;
+	requires javassist;
+	requires java.compiler;
+	requires therapi.runtime.javadoc;
+
+	uses javax.annotation.processing.Processor;
+}

From 92e86d9be9fabd60072ad83cbb25552990d44d9f Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 14 May 2021 11:15:33 -0500
Subject: [PATCH 29/91] Remove Parameter/ItemIO imports from .vm files

Not sure how these escaped the purge
---
 imagej/imagej-ops2/src/main/java/module-info.java          | 1 +
 .../org/scijava/ops/adapt/lift/FunctionToIterables.java    | 1 -
 .../src/test/java/org/scijava/ops/OpMethodTest.java        | 6 ------
 .../src/test/java/org/scijava/ops/OpMethodTestOps.java     | 1 -
 .../adapt/functional/ComputerToFunctionAdaptTestOps.java   | 1 -
 .../adapt/functional/FunctionToComputerAdaptTestOps.java   | 1 -
 .../java/org/scijava/ops/adapt/lift/FunctionToIterables.vm | 1 -
 .../templates/test/java/org/scijava/ops/OpMethodTest.vm    | 7 -------
 .../templates/test/java/org/scijava/ops/OpMethodTestOps.vm | 2 --
 .../ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm | 1 -
 .../ops/adapt/functional/FunctionToComputerAdaptTestOps.vm | 1 -
 11 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/imagej/imagej-ops2/src/main/java/module-info.java b/imagej/imagej-ops2/src/main/java/module-info.java
index 421aaf29c..be89169af 100644
--- a/imagej/imagej-ops2/src/main/java/module-info.java
+++ b/imagej/imagej-ops2/src/main/java/module-info.java
@@ -1,4 +1,5 @@
 module net.imagej.ops2 {
+	exports net.imagej.ops2;
 	
 	// -- Open plugins to scijava-common
 	opens net.imagej.ops2.coloc to org.scijava, org.scijava.ops;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java
index 927d1abe3..692299db2 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java
@@ -41,7 +41,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.OpField;
 import org.scijava.ops.core.OpCollection;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java
index 8ce2e3195..1677c2599 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java
@@ -43,7 +43,6 @@
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
 import org.scijava.ops.core.OpCollection;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 import org.scijava.types.Nil;
@@ -88,17 +87,12 @@ public class OpMethodTest extends AbstractTestEnvironment {
 //	@OpMethod(names = "test.parseInteger", type = Function.class)
 //	// Refers to the input parameter of the function that's returned by this
 //	// factory method.
-//	@Parameter(key = "numericString")
 //	// Refers to the output parameter of the function.
-//	@Parameter(key = "parsedInteger")
 //	public static Integer createParseIntegerOp(String in) {
 //		return Integer.parseInt(in);
 //	}
 //
 //	@OpMethod(names = "test.multiplyNumericStrings", type = BiFunction.class)
-//	@Parameter(key = "numericString1")
-//	@Parameter(key = "numericString2")
-//	@Parameter(key = "multipliedNumericStrings")
 //	public static Integer createMultiplyNumericStringsOp(final String in1,
 //		final String in2, @OpDependency(
 //			name = "test.parseInteger") Function<String, Integer> parseIntegerOp)
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
index 585b1f836..f7743923c 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
@@ -38,7 +38,6 @@
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
 import org.scijava.ops.core.OpCollection;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java
index 579bf3d34..722eee90f 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java
@@ -37,7 +37,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.OpField;
 import org.scijava.ops.core.OpCollection;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java
index 1de4500de..cf9ea9d4b 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java
@@ -40,7 +40,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.OpField;
 import org.scijava.ops.core.OpCollection;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.vm
index bb3889fa0..1bff435b9 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.vm
@@ -41,7 +41,6 @@ import java.util.function.Function;
 import org.scijava.function.Functions;
 import org.scijava.ops.OpField;
 import org.scijava.ops.core.OpCollection;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTest.vm
index cbfb18ca0..f614927f6 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTest.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTest.vm
@@ -43,9 +43,7 @@ import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
 import org.scijava.ops.core.OpCollection;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 import org.scijava.types.Nil;
 
 /**
@@ -88,17 +86,12 @@ public class OpMethodTest extends AbstractTestEnvironment {
 //	@OpMethod(names = "test.parseInteger", type = Function.class)
 //	// Refers to the input parameter of the function that's returned by this
 //	// factory method.
-//	@Parameter(key = "numericString")
 //	// Refers to the output parameter of the function.
-//	@Parameter(key = "parsedInteger")
 //	public static Integer createParseIntegerOp(String in) {
 //		return Integer.parseInt(in);
 //	}
 //
 //	@OpMethod(names = "test.multiplyNumericStrings", type = BiFunction.class)
-//	@Parameter(key = "numericString1")
-//	@Parameter(key = "numericString2")
-//	@Parameter(key = "multipliedNumericStrings")
 //	public static Integer createMultiplyNumericStringsOp(final String in1,
 //		final String in2, @OpDependency(
 //			name = "test.parseInteger") Function<String, Integer> parseIntegerOp)
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTestOps.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTestOps.vm
index 2db2868e7..c022cc5d1 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTestOps.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTestOps.vm
@@ -38,9 +38,7 @@ import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
 import org.scijava.ops.core.OpCollection;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 @Plugin(type = OpCollection.class)
 public class OpMethodTestOps {
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm
index d0f04a48c..64acd53c6 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm
@@ -37,7 +37,6 @@ package org.scijava.ops.adapt.functional;
 import org.scijava.function.Computers;
 import org.scijava.ops.OpField;
 import org.scijava.ops.core.OpCollection;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.vm
index 7ee4547e3..723e9503e 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.vm
@@ -40,7 +40,6 @@ import java.util.function.Function;
 import org.scijava.function.Functions;
 import org.scijava.ops.OpField;
 import org.scijava.ops.core.OpCollection;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)

From fdc1556955f3a6ce363cc807cc4a5c700a02832d Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 14 May 2021 11:34:11 -0500
Subject: [PATCH 30/91] Establish platform independence in Module testing

---
 .../scijava-ops/src/test/java/org/scijava/ops/ModuleTest.java | 4 ++--
 scijava/scijava-ops/templates/main/java/module-info.list      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/ModuleTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/ModuleTest.java
index 788e20708..c4221a800 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/ModuleTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/ModuleTest.java
@@ -33,8 +33,8 @@ private void findPackageNames(Set<String> set, String dirName) {
 		for (File file : fList) {
 			if (file.isFile()) {
 				String path = file.getPath();
-				String packName = path.substring(path.indexOf("org"), path.lastIndexOf(File.separatorChar));
-				set.add(packName.replace(File.separatorChar, '.'));
+				String packName = path.substring(path.indexOf("org"), path.lastIndexOf(File.separator));
+				set.add(packName.replace(File.separator, "."));
 			}
 			else if (file.isDirectory()) {
 				findPackageNames(set, file.getAbsolutePath());
diff --git a/scijava/scijava-ops/templates/main/java/module-info.list b/scijava/scijava-ops/templates/main/java/module-info.list
index d6066d4b0..f78128f81 100644
--- a/scijava/scijava-ops/templates/main/java/module-info.list
+++ b/scijava/scijava-ops/templates/main/java/module-info.list
@@ -11,9 +11,9 @@ import java.util.Set;
 		if (file.isFile()) {
 			String path = file.getPath();
 			int begin = path.indexOf("org");
-			int end = path.lastIndexOf('/');
+			int end = path.lastIndexOf(File.separator);
 			String packName = path.substring(begin, end);
-			set.add(packName.replace('/', '.'));
+			set.add(packName.replace(File.separator, '.'));
 		}
 		else if (file.isDirectory()) {
 			findPackageNames(set, file.getAbsolutePath());

From 655fd723fa49101c17cc10b2f31a92af1a6f0a12 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 14 May 2021 14:46:20 -0500
Subject: [PATCH 31/91] pom: remove dependency on
 therapi-runtime-javadoc-scribe

The annotation processor side of therapi should not be transitively
passed to projects depending on scijava ops - we only need the side of
therapi that looks up the javadoc
---
 scijava/scijava-ops/pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/scijava/scijava-ops/pom.xml b/scijava/scijava-ops/pom.xml
index 630bd9756..aad23ef1c 100644
--- a/scijava/scijava-ops/pom.xml
+++ b/scijava/scijava-ops/pom.xml
@@ -190,11 +190,6 @@
 			<artifactId>javax.annotation-api</artifactId>
 			<version>1.3.1</version>
 		</dependency>
-		<dependency>
-			<groupId>com.github.therapi</groupId>
-			<artifactId>therapi-runtime-javadoc-scribe</artifactId>
-			<version>0.12.0</version>
-		</dependency>
 		<dependency>
 			<groupId>com.github.therapi</groupId>
 			<artifactId>therapi-runtime-javadoc</artifactId>

From 18c747e8ab29123558d37a6024867ac6621c0183 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 14 May 2021 16:05:06 -0500
Subject: [PATCH 32/91] Disable custom javadoc taglets for methods/classes

This ensures that everyone will be writing proper javadoc whenever
proper javadoc will be sufficient for our purposes
---
 .../org/scijava/param/JavadocParameterData.java | 17 +++++++----------
 .../org/scijava/param/JavadocParameterTest.java |  6 +++---
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
index 2e0276f4b..e9a5c87cb 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
@@ -148,15 +148,12 @@ private void parseMethod(Method m) {
 		MethodJavadoc doc = RuntimeJavadoc.getJavadoc(m);
 		long numOpParams = getOpParams(m);
 		long numReturns = m.getReturnType() == void.class ? 0 : 1;
-		// scrape the conventional javadoc tags iff present
-		if (hasVanillaJavadoc(doc, numOpParams, numReturns))
-			populateViaParamAndReturn(doc.getParams(), doc.getReturns());
-		// scrape our custom javadoc taglets iff present
-		else if (hasCustomJavadoc(doc.getOther(), numOpParams, 1))
-			populateViaCustomTaglets(doc.getOther());
-		// give up if neither is fully present
-		else throw new IllegalArgumentException("Method " + m +
-			" has no suitable tag(lets) to scrape documentation from");
+		// ensure the method declares a complete set of tags
+		if (!hasVanillaJavadoc(doc, numOpParams, numReturns))
+			throw new IllegalArgumentException("Method " + m +
+				" has no suitable tag(lets) to scrape documentation from");
+		// scrape the conventional javadoc tags
+		populateViaParamAndReturn(doc.getParams(), doc.getReturns());
 	}
 
 	private long getOpParams(Method m) {
@@ -181,7 +178,7 @@ private boolean hasVanillaJavadoc(MethodJavadoc doc, long numParams, long numRet
 		// We require a @param tag for each of the method parameters
 		boolean sufficientParams = doc.getParams().size() == numParams;
 		// We require a @return tag for the method return iff not null
-		boolean javadocReturn = doc.getReturns() != null;
+		boolean javadocReturn = !doc.getReturns().toString().isEmpty();
 		boolean methodReturn = numReturns == 1;
 		boolean sufficientReturn = javadocReturn == methodReturn;
 		return sufficientParams && sufficientReturn;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
index ba18dc7d2..1a6a416dc 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
@@ -112,7 +112,7 @@ public void testJavadocMethodIO() {
 		if (infos.hasNext()) {
 			Assert.fail("Multiple OpInfos with name \"test.javadoc.method\"");
 		}
-		isSuitableScrapedOpMethodInfo(info);
+		isSuitableGenericOpMethodInfo(info);
 	}
 
 	@Test
@@ -140,7 +140,7 @@ public void testJavadocMethodI() {
 	/**
 	 * Tests javadoc scraping of mutable taglet
 	 * 
-	 * @mutable foo the i/o argument
+	 * @param foo the i/o argument
 	 */
 	@OpMethod(names = "test.javadoc.methodInplaceI", type = Inplaces.Arity1.class)
 	public static void OpMethodInplaceI(List<String> foo) {
@@ -153,7 +153,7 @@ public static void OpMethodInplaceI(List<String> foo) {
 	 * Tests javadoc scraping of mutable taglet
 	 * 
 	 * @dependency inplace the Op being wrapped
-	 * @mutable foo the i/o argument
+	 * @param foo the i/o argument
 	 */
 	@OpMethod(names = "test.javadoc.methodDependency", type = Inplaces.Arity1.class)
 	public static void OpMethodInplaceI(@OpDependency(

From c229192d71ba513f548f5d6360b161ad534f6ad6 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Wed, 19 May 2021 13:49:43 -0500
Subject: [PATCH 33/91] Remove explicit notation of annotation processors

---
 scijava/scijava-ops/pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scijava/scijava-ops/pom.xml b/scijava/scijava-ops/pom.xml
index aad23ef1c..b998e4b17 100644
--- a/scijava/scijava-ops/pom.xml
+++ b/scijava/scijava-ops/pom.xml
@@ -118,10 +118,6 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.8.1</version>
 				<configuration>
-					<annotationProcessors>
-						<annotationProcessor>com.github.therapi.runtimejavadoc.internal.JavadocAnnotationProcessor</annotationProcessor>
-						<annotationProcessor>org.scijava.annotations.AnnotationProcessor</annotationProcessor>
-					</annotationProcessors>
 					<debug>true</debug>
 					<optimize>true</optimize>
 					<compilerArguments>

From 0f2d944559cfb70fbc7e2a8c92a5c3cd6ff4ce7b Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Wed, 19 May 2021 14:18:37 -0500
Subject: [PATCH 34/91] scijava/scijava-ops/pom.xml: Remove versioning

Rely on pom-scijava for this
---
 scijava/scijava-ops/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scijava/scijava-ops/pom.xml b/scijava/scijava-ops/pom.xml
index b998e4b17..da77476f9 100644
--- a/scijava/scijava-ops/pom.xml
+++ b/scijava/scijava-ops/pom.xml
@@ -116,7 +116,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.1</version>
 				<configuration>
 					<debug>true</debug>
 					<optimize>true</optimize>

From c6561c24003f609e04e1ed3add406ab744ded808 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Wed, 19 May 2021 14:50:34 -0500
Subject: [PATCH 35/91] Remove annotation processor options

They are not being used by our annotation processors, so there is no
reason to keep them.
---
 scijava/scijava-ops/pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scijava/scijava-ops/pom.xml b/scijava/scijava-ops/pom.xml
index da77476f9..89f3b8694 100644
--- a/scijava/scijava-ops/pom.xml
+++ b/scijava/scijava-ops/pom.xml
@@ -119,10 +119,6 @@
 				<configuration>
 					<debug>true</debug>
 					<optimize>true</optimize>
-					<compilerArguments>
-						<AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
-						<Adebug>true</Adebug>
-					</compilerArguments>
 					<annotationProcessorPaths>
 						<path>
 							<groupId>com.github.therapi</groupId>

From f99bc5eb8e6855aca6f74a75cd2c26353acc5355 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Wed, 19 May 2021 15:22:16 -0500
Subject: [PATCH 36/91] Move therapi annotation processor upstream

Doing this allows us to remove the maven compiler plugin conifguration
from scijava-ops' POM
---
 pom.xml                     |  7 +++++++
 scijava/scijava-ops/pom.xml | 20 --------------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4f8f6baf0..5a3324dc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,14 @@
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
+					<debug>true</debug>
+					<optimize>true</optimize>
 					<annotationProcessorPaths>
+						<path>
+							<groupId>com.github.therapi</groupId>
+							<artifactId>therapi-runtime-javadoc-scribe</artifactId>
+							<version>0.12.0</version>
+						</path>
 						<path>
 							<groupId>org.scijava</groupId>
 							<artifactId>scijava-common</artifactId>
diff --git a/scijava/scijava-ops/pom.xml b/scijava/scijava-ops/pom.xml
index 89f3b8694..b8349eae0 100644
--- a/scijava/scijava-ops/pom.xml
+++ b/scijava/scijava-ops/pom.xml
@@ -113,26 +113,6 @@
 				<groupId>com.alexecollins.maven.plugin</groupId>
 				<artifactId>script-maven-plugin</artifactId>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<debug>true</debug>
-					<optimize>true</optimize>
-					<annotationProcessorPaths>
-						<path>
-							<groupId>com.github.therapi</groupId>
-							<artifactId>therapi-runtime-javadoc-scribe</artifactId>
-							<version>0.12.0</version>
-						</path>
-						<path>
-							<groupId>org.scijava</groupId>
-							<artifactId>scijava-common</artifactId>
-							<version>2.83.3</version>
-						</path>
-					</annotationProcessorPaths>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>

From 52229913e64cc18ef5b7e0892cbc922fc125c0bc Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Wed, 19 May 2021 15:41:49 -0500
Subject: [PATCH 37/91] scijava-ops/pom.xml: Delete jar-plugin config

This is not needed; pom-scijava-base does this for us
---
 scijava/scijava-ops/pom.xml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/scijava/scijava-ops/pom.xml b/scijava/scijava-ops/pom.xml
index b8349eae0..54544d20b 100644
--- a/scijava/scijava-ops/pom.xml
+++ b/scijava/scijava-ops/pom.xml
@@ -113,17 +113,6 @@
 				<groupId>com.alexecollins.maven.plugin</groupId>
 				<artifactId>script-maven-plugin</artifactId>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestEntries>
-							<Automatic-Module-Name>org.scijava.ops</Automatic-Module-Name>
-						</manifestEntries>
-					</archive>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 	<dependencies>

From a654a04a74768ad88da33e4321182ca13ab77474 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Thu, 20 May 2021 09:13:31 -0500
Subject: [PATCH 38/91] Remove compiler config

When we move the module-path annotation processors upstream, we want to
make as few changes as possible. These options are not necessary, thus
we'll remove them
---
 pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5a3324dc6..d703e6565 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,8 +94,6 @@
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<debug>true</debug>
-					<optimize>true</optimize>
 					<annotationProcessorPaths>
 						<path>
 							<groupId>com.github.therapi</groupId>

From 2334b8611edbc4348e10bdc89b1d5729ec6d9bca Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Thu, 20 May 2021 16:52:41 -0500
Subject: [PATCH 39/91] Initialize scijava-struct module

---
 pom.xml                                       |   1 +
 scijava/scijava-struct/pom.xml                | 120 ++++++++++++++++++
 .../src/main/java/module-info.java            |   6 +
 .../scijava/struct/DefaultStructInstance.java |  43 +++++++
 .../main/java/org/scijava/struct/ItemIO.java  |  80 ++++++++++++
 .../main/java/org/scijava/struct/Member.java  |  66 ++++++++++
 .../org/scijava/struct/MemberInstance.java    |  39 ++++++
 .../main/java/org/scijava/struct/Struct.java  |  24 ++++
 .../org/scijava/struct/StructInstance.java    |  32 +++++
 .../main/java/org/scijava/struct/Structs.java |  23 ++++
 .../org/scijava/struct/ValueAccessible.java   |  10 ++
 .../struct/ValueAccessibleMemberInstance.java |  51 ++++++++
 12 files changed, 495 insertions(+)
 create mode 100644 scijava/scijava-struct/pom.xml
 create mode 100644 scijava/scijava-struct/src/main/java/module-info.java
 create mode 100644 scijava/scijava-struct/src/main/java/org/scijava/struct/DefaultStructInstance.java
 create mode 100644 scijava/scijava-struct/src/main/java/org/scijava/struct/ItemIO.java
 create mode 100644 scijava/scijava-struct/src/main/java/org/scijava/struct/Member.java
 create mode 100644 scijava/scijava-struct/src/main/java/org/scijava/struct/MemberInstance.java
 create mode 100644 scijava/scijava-struct/src/main/java/org/scijava/struct/Struct.java
 create mode 100644 scijava/scijava-struct/src/main/java/org/scijava/struct/StructInstance.java
 create mode 100644 scijava/scijava-struct/src/main/java/org/scijava/struct/Structs.java
 create mode 100644 scijava/scijava-struct/src/main/java/org/scijava/struct/ValueAccessible.java
 create mode 100644 scijava/scijava-struct/src/main/java/org/scijava/struct/ValueAccessibleMemberInstance.java

diff --git a/pom.xml b/pom.xml
index d703e6565..11d82d0e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,6 +50,7 @@
 		<module>scijava/scijava-persist</module>
 		<module>scijava/scijava-function</module>
 		<module>scijava/scijava-ops</module>
+		<module>scijava/scijava-struct</module>
 		<module>scijava/scijava-taglets</module>
 		<module>scijava/scijava-testutil</module>
 		<module>scijava/scijava-types</module>
diff --git a/scijava/scijava-struct/pom.xml b/scijava/scijava-struct/pom.xml
new file mode 100644
index 000000000..48ccc2e29
--- /dev/null
+++ b/scijava/scijava-struct/pom.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.scijava</groupId>
+		<artifactId>scijava-incubator</artifactId>
+		<version>0-SNAPSHOT</version>
+		<relativePath>../..</relativePath>
+	</parent>
+
+	<artifactId>scijava-struct</artifactId>
+
+	<name>SciJava Struct</name>
+	<description>A lightweight framework for collecting Members</description>
+	<url>https://github.com/scijava/incubator</url>
+	<inceptionYear>2021</inceptionYear>
+	<organization>
+		<name>SciJava</name>
+		<url>https://scijava.org/</url>
+	</organization>
+	<licenses>
+		<license>
+			<name>Simplified BSD License</name>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+
+	<developers>
+		<developer>
+			<id>ctrueden</id>
+			<name>Curtis Rueden</name>
+			<url>https://imagej.net/User:Rueden</url>
+			<roles>
+				<role>founder</role>
+				<role>lead</role>
+				<role>reviewer</role>
+				<role>support</role>
+				<role>maintainer</role>
+			</roles>
+		</developer>
+		<developer>
+			<id>gselzer</id>
+			<name>Gabriel Selzer</name>
+			<roles>
+				<role>founder</role>
+				<role>developer</role>
+				<role>debugger</role>
+				<role>reviewer</role>
+				<role>support</role>
+			</roles>
+		</developer>
+	</developers>
+	<contributors>
+		<!--
+		NB: Need at least one element to override the parent.
+		See: https://issues.apache.org/jira/browse/MNG-5220
+		-->
+		<contributor>
+			<name>None</name>
+		</contributor>
+	</contributors>
+
+	<mailingLists>
+		<mailingList>
+			<name>Image.sc Forum</name>
+			<archive>https://forum.image.sc/tags/scijava-struct</archive>
+		</mailingList>
+	</mailingLists>
+
+	<scm>
+		<connection>scm:git:git://github.com/scijava/incubator</connection>
+		<developerConnection>scm:git:git@github.com:scijava/incubator</developerConnection>
+		<tag>HEAD</tag>
+		<url>https://github.com/scijava/incubator</url>
+	</scm>
+	<issueManagement>
+		<system>GitHub Issues</system>
+		<url>https://github.com/scijava/scijava-struct/issues</url>
+	</issueManagement>
+	<ciManagement>
+		<system>Travis CI</system>
+		<url>https://travis-ci.com/scijava/incubator</url>
+	</ciManagement>
+
+	<properties>
+		<package-name>org.scijava.struct</package-name>
+
+		<license.licenseName>bsd_2</license.licenseName>
+		<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
+	</properties>
+
+	<dependencies>
+		<!-- SciJava dependencies -->
+		<dependency>
+			<groupId>org.scijava</groupId>
+			<artifactId>scijava-types</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<!-- Third-party dependencies -->
+
+		<!-- Test scope dependencies -->
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.vintage</groupId>
+			<artifactId>junit-vintage-engine</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/scijava/scijava-struct/src/main/java/module-info.java b/scijava/scijava-struct/src/main/java/module-info.java
new file mode 100644
index 000000000..6eec255f9
--- /dev/null
+++ b/scijava/scijava-struct/src/main/java/module-info.java
@@ -0,0 +1,6 @@
+module org.scijava.struct {
+
+	exports org.scijava.struct;
+
+	requires org.scijava.types;
+}
diff --git a/scijava/scijava-struct/src/main/java/org/scijava/struct/DefaultStructInstance.java b/scijava/scijava-struct/src/main/java/org/scijava/struct/DefaultStructInstance.java
new file mode 100644
index 000000000..c06a495a1
--- /dev/null
+++ b/scijava/scijava-struct/src/main/java/org/scijava/struct/DefaultStructInstance.java
@@ -0,0 +1,43 @@
+
+package org.scijava.struct;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class DefaultStructInstance<C> implements StructInstance<C> {
+
+	private final Struct struct;
+	private final C object;
+
+	private final LinkedHashMap<String, MemberInstance<?>> memberMap;
+
+	public DefaultStructInstance(final Struct struct, final C object) {
+		this.struct = struct;
+		this.object = object;
+		memberMap = new LinkedHashMap<>();
+		for (final Member<?> member : struct.members()) {
+			memberMap.put(member.getKey(), member.createInstance(object));
+		}
+	}
+	
+	@Override
+	public List<MemberInstance<?>> members() {
+		return memberMap.values().stream().collect(Collectors.toList());
+	}
+
+	@Override
+	public Struct struct() {
+		return struct;
+	}
+
+	@Override
+	public C object() {
+		return object;
+	}
+
+	@Override
+	public MemberInstance<?> member(final String key) {
+		return memberMap.get(key);
+	}
+}
diff --git a/scijava/scijava-struct/src/main/java/org/scijava/struct/ItemIO.java b/scijava/scijava-struct/src/main/java/org/scijava/struct/ItemIO.java
new file mode 100644
index 000000000..1192970d0
--- /dev/null
+++ b/scijava/scijava-struct/src/main/java/org/scijava/struct/ItemIO.java
@@ -0,0 +1,80 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.struct;
+
+/**
+ * Defines the input/output type of a struct {@link Member}.
+ *
+ * @author Curtis Rueden
+ * @author David Kolb
+ */
+public enum ItemIO {
+	/**
+	 * The item is an input for the operation.
+	 */
+	INPUT, 
+	/**
+	 * The item is an output for the operation.
+	 */
+	OUTPUT,
+	/**
+	 * The item is a hybrid input/output for the operation, whose structure is fixed
+	 * but whose content will be populated during execution of the operation.
+	 * 
+	 * @see org.scijava.param.Container
+	 * @see org.scijava.ops.function.Computers
+	 */
+	CONTAINER,
+	/**
+	 * The item is a hybrid input/output for the operation, whose current value will
+	 * be used as input to the computation, but subsequently overwritten with a
+	 * result.
+	 * 
+	 * @see org.scijava.param.Mutable
+	 * @see org.scijava.ops.function.Inplaces
+	 */
+	MUTABLE,
+	/**
+	 * The type of the item should be inferred automatically during structification.
+	 * For instance, for methods of functional interfaces, the types can be inferred
+	 * as follows: the return type (if not {@code void}) is {@code ItemIO.OUTPUT}
+	 * and method parameters are typically {@code ItemIO.INPUT}, although method
+	 * parameters could be annotated to indicate they should be treated as
+	 * {@code ItemIO.CONTAINER} or {@code ItemIO.MUTABLE} type instead.
+	 */
+	AUTO,
+	/**
+	 * The type of the item is none of the above.
+	 */
+	NONE
+}
diff --git a/scijava/scijava-struct/src/main/java/org/scijava/struct/Member.java b/scijava/scijava-struct/src/main/java/org/scijava/struct/Member.java
new file mode 100644
index 000000000..ccdc6af85
--- /dev/null
+++ b/scijava/scijava-struct/src/main/java/org/scijava/struct/Member.java
@@ -0,0 +1,66 @@
+package org.scijava.struct;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Type;
+
+import org.scijava.types.Types;
+
+/**
+ * One element (i.e. item/field/member) of a {@link Struct}.
+ * 
+ * @author Curtis Rueden
+ * @author Christian Dietz
+ */
+public interface Member<T> {
+
+	/** Unique name of the member. */
+	String getKey();
+
+	/** Description of the member. */
+	String getDescription();
+
+	/**
+	 * Gets the type of the member, including Java generic parameters.
+	 * 
+	 * @see Field#getGenericType()
+	 */
+	// TODO: Use Type<T> or Nil<T> from new scijava-types.
+	Type getType();
+	
+	/**
+	 * Gets the {@link Class} of the member's type, or null if {@link #getType()}
+	 * does not return a raw class.
+	 */
+	@SuppressWarnings("unchecked")
+	default Class<T> getRawType() {
+		return (Class<T>) Types.raw(getType());
+	}
+
+	/** Gets the input/output type of the member. */
+	// TODO: fork ItemIO and rename to MemberIO (?)
+	ItemIO getIOType();
+
+	/** Gets whether the member is an input. */
+	default boolean isInput() {
+		return getIOType() == ItemIO.INPUT || getIOType() == ItemIO.CONTAINER || getIOType() == ItemIO.MUTABLE;
+	}
+
+	/** Gets whether the member is an output. */
+	default boolean isOutput() {
+		return getIOType() == ItemIO.OUTPUT || getIOType() == ItemIO.CONTAINER || getIOType() == ItemIO.MUTABLE;
+	}
+
+	default boolean isStruct() {
+		return false;
+	}
+
+	default Struct childStruct() {
+		return null;
+	}
+
+	default MemberInstance<T> createInstance(
+		@SuppressWarnings("unused") Object o)
+	{
+		return () -> Member.this;
+	}
+}
diff --git a/scijava/scijava-struct/src/main/java/org/scijava/struct/MemberInstance.java b/scijava/scijava-struct/src/main/java/org/scijava/struct/MemberInstance.java
new file mode 100644
index 000000000..856c5cd10
--- /dev/null
+++ b/scijava/scijava-struct/src/main/java/org/scijava/struct/MemberInstance.java
@@ -0,0 +1,39 @@
+package org.scijava.struct;
+
+import java.util.function.Supplier;
+
+public interface MemberInstance<T> extends Supplier<T> {
+
+	Member<T> member();
+
+	default boolean isReadable() {
+		return false;
+	}
+	default boolean isWritable() {
+		return false;
+	}
+
+	/**
+	 * Get's the value of the member.
+	 * 
+	 * @return The value of the {@link Member} with the given key.
+	 * @throws UnsupportedOperationException if the member is not readable (see
+	 *           {@link #isReadable()}).
+	 */
+	@Override
+	default T get() {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * Sets the value of the member.
+	 * 
+	 * @param value The value to set.
+	 * @throws UnsupportedOperationException if the member is not writable (see
+	 *           {@link #isWritable()}).
+	 */
+	default void set(Object value) {
+		throw new UnsupportedOperationException();
+	}
+
+}
diff --git a/scijava/scijava-struct/src/main/java/org/scijava/struct/Struct.java b/scijava/scijava-struct/src/main/java/org/scijava/struct/Struct.java
new file mode 100644
index 000000000..a407a98bd
--- /dev/null
+++ b/scijava/scijava-struct/src/main/java/org/scijava/struct/Struct.java
@@ -0,0 +1,24 @@
+package org.scijava.struct;
+
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * A structure consisting of typed fields called {@link Member}s.
+ * 
+ * @author Curtis Rueden
+ * @author Christian Dietz
+ */
+public interface Struct extends Iterable<Member<?>> {
+
+	List<Member<?>> members();
+	
+	@Override
+	default Iterator<Member<?>> iterator() {
+		return members().iterator();
+	}
+
+	default <C> StructInstance<C> createInstance(final C object) {
+		return new DefaultStructInstance<>(this, object);
+	}
+}
diff --git a/scijava/scijava-struct/src/main/java/org/scijava/struct/StructInstance.java b/scijava/scijava-struct/src/main/java/org/scijava/struct/StructInstance.java
new file mode 100644
index 000000000..71606eca4
--- /dev/null
+++ b/scijava/scijava-struct/src/main/java/org/scijava/struct/StructInstance.java
@@ -0,0 +1,32 @@
+package org.scijava.struct;
+
+import java.util.Iterator;
+import java.util.List;
+
+/** An instance of a {@link Struct}. */
+public interface StructInstance<C> extends Iterable<MemberInstance<?>>
+{
+
+	List<MemberInstance<?>> members();
+
+	/**
+	 * @return the {@link Struct} that describes this instance
+	 */
+	Struct struct();
+
+	/**
+	 * @return the object backing this instance of the struct
+	 */
+	C object();
+
+	/**
+	 * @param key
+	 * @return the {@link Member} for the given key
+	 */
+	MemberInstance<?> member(String key);
+
+	@Override
+	default Iterator<MemberInstance<?>> iterator() {
+		return members().iterator();
+	}
+}
diff --git a/scijava/scijava-struct/src/main/java/org/scijava/struct/Structs.java b/scijava/scijava-struct/src/main/java/org/scijava/struct/Structs.java
new file mode 100644
index 000000000..ce65d4171
--- /dev/null
+++ b/scijava/scijava-struct/src/main/java/org/scijava/struct/Structs.java
@@ -0,0 +1,23 @@
+
+package org.scijava.struct;
+
+public final class Structs {
+
+	private Structs() {
+		// NB: Prevent instantiation of utility class.
+	}
+
+	public static StructInstance<?> expand(final StructInstance<?> parent,
+		final String key)
+	{
+		return expand(parent.member(key));
+	}
+
+	public static <T> StructInstance<T> expand(
+		final MemberInstance<T> memberInstance)
+	{
+		if (!memberInstance.member().isStruct()) return null;
+		return memberInstance.member().childStruct().createInstance(//
+			memberInstance.get());
+	}
+}
diff --git a/scijava/scijava-struct/src/main/java/org/scijava/struct/ValueAccessible.java b/scijava/scijava-struct/src/main/java/org/scijava/struct/ValueAccessible.java
new file mode 100644
index 000000000..d2ca779bf
--- /dev/null
+++ b/scijava/scijava-struct/src/main/java/org/scijava/struct/ValueAccessible.java
@@ -0,0 +1,10 @@
+package org.scijava.struct;
+
+
+public interface ValueAccessible<T> {
+
+	T get(Object o);
+
+	void set(T value, Object o);
+
+}
diff --git a/scijava/scijava-struct/src/main/java/org/scijava/struct/ValueAccessibleMemberInstance.java b/scijava/scijava-struct/src/main/java/org/scijava/struct/ValueAccessibleMemberInstance.java
new file mode 100644
index 000000000..20ae2731d
--- /dev/null
+++ b/scijava/scijava-struct/src/main/java/org/scijava/struct/ValueAccessibleMemberInstance.java
@@ -0,0 +1,51 @@
+package org.scijava.struct;
+
+import org.scijava.types.Types;
+
+public class ValueAccessibleMemberInstance<T> implements MemberInstance<T> {
+
+	private Member<T> member;
+	private ValueAccessible<T> access;
+	private Object object;
+
+	public <M extends Member<T> & ValueAccessible<T>> ValueAccessibleMemberInstance(
+		final M member, final Object object)
+	{
+		this.member = member;
+		this.access = member;
+		this.object = object;
+	}
+
+	@Override
+	public Member<T> member() {
+		return member;
+	}
+
+	@Override
+	public boolean isReadable() {
+		return true;
+	}
+
+	@Override
+	public boolean isWritable() {
+		return true;
+	}
+
+	@Override
+	public T get() {
+		return access.get(object);
+	}
+
+	@Override
+	public void set(Object value) {
+		final Class<?> type = member().getRawType();
+		if (!Types.isAssignable(value != null ? value.getClass() : null, type)) {
+			throw new IllegalArgumentException("value of type " + //
+				Types.name(value.getClass()) + " is not assignable to " + //
+				Types.name(type));
+		}
+		@SuppressWarnings("unchecked")
+		final T tValue = (T) value;
+		access.set(tValue, object);
+	}
+}

From 021c441e268f811ade4d7c61ca97be485b603cd1 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Thu, 20 May 2021 17:01:24 -0500
Subject: [PATCH 40/91] scijava-ops: depend on scijava-struct

This commit removes the org.scijava.struct package, since it was moved
to its own module. scijava-ops now depends on scijava-struct
---
 scijava/scijava-ops/pom.xml                   |  5 ++
 .../src/main/java/module-info.java            |  3 +-
 .../scijava/struct/DefaultStructInstance.java | 43 ----------
 .../main/java/org/scijava/struct/ItemIO.java  | 80 -------------------
 .../main/java/org/scijava/struct/Member.java  | 66 ---------------
 .../org/scijava/struct/MemberInstance.java    | 39 ---------
 .../main/java/org/scijava/struct/Struct.java  | 24 ------
 .../org/scijava/struct/StructInstance.java    | 32 --------
 .../main/java/org/scijava/struct/Structs.java | 23 ------
 .../org/scijava/struct/ValueAccessible.java   | 10 ---
 .../struct/ValueAccessibleMemberInstance.java | 51 ------------
 .../templates/main/java/module-info.vm        |  2 +-
 12 files changed, 7 insertions(+), 371 deletions(-)
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/struct/DefaultStructInstance.java
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/struct/ItemIO.java
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/struct/Member.java
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/struct/MemberInstance.java
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/struct/Struct.java
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/struct/StructInstance.java
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/struct/Structs.java
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/struct/ValueAccessible.java
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/struct/ValueAccessibleMemberInstance.java

diff --git a/scijava/scijava-ops/pom.xml b/scijava/scijava-ops/pom.xml
index 54544d20b..16494dfa9 100644
--- a/scijava/scijava-ops/pom.xml
+++ b/scijava/scijava-ops/pom.xml
@@ -121,6 +121,11 @@
 			<groupId>org.scijava</groupId>
 			<artifactId>scijava-common</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.scijava</groupId>
+			<artifactId>scijava-struct</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.scijava</groupId>
 			<artifactId>scijava-types</artifactId>
diff --git a/scijava/scijava-ops/src/main/java/module-info.java b/scijava/scijava-ops/src/main/java/module-info.java
index a8eeeda22..92d5debcc 100644
--- a/scijava/scijava-ops/src/main/java/module-info.java
+++ b/scijava/scijava-ops/src/main/java/module-info.java
@@ -16,7 +16,6 @@
 	exports org.scijava.ops.provenance;
 	// TODO: move OpWrapper to its own package (org.scijava.ops.wrap??)
 	exports org.scijava.ops.util; // contains OpWrapper interface
-	exports org.scijava.struct;
 	exports org.scijava.param;
 
 	opens org.scijava.ops.conversionLoss to therapi.runtime.javadoc;
@@ -35,7 +34,6 @@
 	opens org.scijava.ops.adapt.functional to therapi.runtime.javadoc;
 	opens org.scijava.ops to therapi.runtime.javadoc, org.scijava;
 	opens org.scijava.ops.util to therapi.runtime.javadoc;
-	opens org.scijava.struct to therapi.runtime.javadoc;
 	opens org.scijava.ops.matcher to therapi.runtime.javadoc;
 	opens org.scijava.ops.simplify to therapi.runtime.javadoc;
 	opens org.scijava.ops.stats to therapi.runtime.javadoc;
@@ -50,6 +48,7 @@
 
 	requires org.scijava;
 	requires org.scijava.function;
+	requires org.scijava.struct;
 	requires org.scijava.types;
 	requires javassist;
 	requires java.compiler;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/struct/DefaultStructInstance.java b/scijava/scijava-ops/src/main/java/org/scijava/struct/DefaultStructInstance.java
deleted file mode 100644
index c06a495a1..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/struct/DefaultStructInstance.java
+++ /dev/null
@@ -1,43 +0,0 @@
-
-package org.scijava.struct;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class DefaultStructInstance<C> implements StructInstance<C> {
-
-	private final Struct struct;
-	private final C object;
-
-	private final LinkedHashMap<String, MemberInstance<?>> memberMap;
-
-	public DefaultStructInstance(final Struct struct, final C object) {
-		this.struct = struct;
-		this.object = object;
-		memberMap = new LinkedHashMap<>();
-		for (final Member<?> member : struct.members()) {
-			memberMap.put(member.getKey(), member.createInstance(object));
-		}
-	}
-	
-	@Override
-	public List<MemberInstance<?>> members() {
-		return memberMap.values().stream().collect(Collectors.toList());
-	}
-
-	@Override
-	public Struct struct() {
-		return struct;
-	}
-
-	@Override
-	public C object() {
-		return object;
-	}
-
-	@Override
-	public MemberInstance<?> member(final String key) {
-		return memberMap.get(key);
-	}
-}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/struct/ItemIO.java b/scijava/scijava-ops/src/main/java/org/scijava/struct/ItemIO.java
deleted file mode 100644
index 1192970d0..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/struct/ItemIO.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * #%L
- * SciJava Common shared library for SciJava software.
- * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
- * %%
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * #L%
- */
-
-package org.scijava.struct;
-
-/**
- * Defines the input/output type of a struct {@link Member}.
- *
- * @author Curtis Rueden
- * @author David Kolb
- */
-public enum ItemIO {
-	/**
-	 * The item is an input for the operation.
-	 */
-	INPUT, 
-	/**
-	 * The item is an output for the operation.
-	 */
-	OUTPUT,
-	/**
-	 * The item is a hybrid input/output for the operation, whose structure is fixed
-	 * but whose content will be populated during execution of the operation.
-	 * 
-	 * @see org.scijava.param.Container
-	 * @see org.scijava.ops.function.Computers
-	 */
-	CONTAINER,
-	/**
-	 * The item is a hybrid input/output for the operation, whose current value will
-	 * be used as input to the computation, but subsequently overwritten with a
-	 * result.
-	 * 
-	 * @see org.scijava.param.Mutable
-	 * @see org.scijava.ops.function.Inplaces
-	 */
-	MUTABLE,
-	/**
-	 * The type of the item should be inferred automatically during structification.
-	 * For instance, for methods of functional interfaces, the types can be inferred
-	 * as follows: the return type (if not {@code void}) is {@code ItemIO.OUTPUT}
-	 * and method parameters are typically {@code ItemIO.INPUT}, although method
-	 * parameters could be annotated to indicate they should be treated as
-	 * {@code ItemIO.CONTAINER} or {@code ItemIO.MUTABLE} type instead.
-	 */
-	AUTO,
-	/**
-	 * The type of the item is none of the above.
-	 */
-	NONE
-}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/struct/Member.java b/scijava/scijava-ops/src/main/java/org/scijava/struct/Member.java
deleted file mode 100644
index ccdc6af85..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/struct/Member.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.scijava.struct;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Type;
-
-import org.scijava.types.Types;
-
-/**
- * One element (i.e. item/field/member) of a {@link Struct}.
- * 
- * @author Curtis Rueden
- * @author Christian Dietz
- */
-public interface Member<T> {
-
-	/** Unique name of the member. */
-	String getKey();
-
-	/** Description of the member. */
-	String getDescription();
-
-	/**
-	 * Gets the type of the member, including Java generic parameters.
-	 * 
-	 * @see Field#getGenericType()
-	 */
-	// TODO: Use Type<T> or Nil<T> from new scijava-types.
-	Type getType();
-	
-	/**
-	 * Gets the {@link Class} of the member's type, or null if {@link #getType()}
-	 * does not return a raw class.
-	 */
-	@SuppressWarnings("unchecked")
-	default Class<T> getRawType() {
-		return (Class<T>) Types.raw(getType());
-	}
-
-	/** Gets the input/output type of the member. */
-	// TODO: fork ItemIO and rename to MemberIO (?)
-	ItemIO getIOType();
-
-	/** Gets whether the member is an input. */
-	default boolean isInput() {
-		return getIOType() == ItemIO.INPUT || getIOType() == ItemIO.CONTAINER || getIOType() == ItemIO.MUTABLE;
-	}
-
-	/** Gets whether the member is an output. */
-	default boolean isOutput() {
-		return getIOType() == ItemIO.OUTPUT || getIOType() == ItemIO.CONTAINER || getIOType() == ItemIO.MUTABLE;
-	}
-
-	default boolean isStruct() {
-		return false;
-	}
-
-	default Struct childStruct() {
-		return null;
-	}
-
-	default MemberInstance<T> createInstance(
-		@SuppressWarnings("unused") Object o)
-	{
-		return () -> Member.this;
-	}
-}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/struct/MemberInstance.java b/scijava/scijava-ops/src/main/java/org/scijava/struct/MemberInstance.java
deleted file mode 100644
index 856c5cd10..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/struct/MemberInstance.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.scijava.struct;
-
-import java.util.function.Supplier;
-
-public interface MemberInstance<T> extends Supplier<T> {
-
-	Member<T> member();
-
-	default boolean isReadable() {
-		return false;
-	}
-	default boolean isWritable() {
-		return false;
-	}
-
-	/**
-	 * Get's the value of the member.
-	 * 
-	 * @return The value of the {@link Member} with the given key.
-	 * @throws UnsupportedOperationException if the member is not readable (see
-	 *           {@link #isReadable()}).
-	 */
-	@Override
-	default T get() {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Sets the value of the member.
-	 * 
-	 * @param value The value to set.
-	 * @throws UnsupportedOperationException if the member is not writable (see
-	 *           {@link #isWritable()}).
-	 */
-	default void set(Object value) {
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/struct/Struct.java b/scijava/scijava-ops/src/main/java/org/scijava/struct/Struct.java
deleted file mode 100644
index a407a98bd..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/struct/Struct.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.scijava.struct;
-
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * A structure consisting of typed fields called {@link Member}s.
- * 
- * @author Curtis Rueden
- * @author Christian Dietz
- */
-public interface Struct extends Iterable<Member<?>> {
-
-	List<Member<?>> members();
-	
-	@Override
-	default Iterator<Member<?>> iterator() {
-		return members().iterator();
-	}
-
-	default <C> StructInstance<C> createInstance(final C object) {
-		return new DefaultStructInstance<>(this, object);
-	}
-}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/struct/StructInstance.java b/scijava/scijava-ops/src/main/java/org/scijava/struct/StructInstance.java
deleted file mode 100644
index 71606eca4..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/struct/StructInstance.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.scijava.struct;
-
-import java.util.Iterator;
-import java.util.List;
-
-/** An instance of a {@link Struct}. */
-public interface StructInstance<C> extends Iterable<MemberInstance<?>>
-{
-
-	List<MemberInstance<?>> members();
-
-	/**
-	 * @return the {@link Struct} that describes this instance
-	 */
-	Struct struct();
-
-	/**
-	 * @return the object backing this instance of the struct
-	 */
-	C object();
-
-	/**
-	 * @param key
-	 * @return the {@link Member} for the given key
-	 */
-	MemberInstance<?> member(String key);
-
-	@Override
-	default Iterator<MemberInstance<?>> iterator() {
-		return members().iterator();
-	}
-}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/struct/Structs.java b/scijava/scijava-ops/src/main/java/org/scijava/struct/Structs.java
deleted file mode 100644
index ce65d4171..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/struct/Structs.java
+++ /dev/null
@@ -1,23 +0,0 @@
-
-package org.scijava.struct;
-
-public final class Structs {
-
-	private Structs() {
-		// NB: Prevent instantiation of utility class.
-	}
-
-	public static StructInstance<?> expand(final StructInstance<?> parent,
-		final String key)
-	{
-		return expand(parent.member(key));
-	}
-
-	public static <T> StructInstance<T> expand(
-		final MemberInstance<T> memberInstance)
-	{
-		if (!memberInstance.member().isStruct()) return null;
-		return memberInstance.member().childStruct().createInstance(//
-			memberInstance.get());
-	}
-}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/struct/ValueAccessible.java b/scijava/scijava-ops/src/main/java/org/scijava/struct/ValueAccessible.java
deleted file mode 100644
index d2ca779bf..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/struct/ValueAccessible.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.scijava.struct;
-
-
-public interface ValueAccessible<T> {
-
-	T get(Object o);
-
-	void set(T value, Object o);
-
-}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/struct/ValueAccessibleMemberInstance.java b/scijava/scijava-ops/src/main/java/org/scijava/struct/ValueAccessibleMemberInstance.java
deleted file mode 100644
index 20ae2731d..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/struct/ValueAccessibleMemberInstance.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.scijava.struct;
-
-import org.scijava.types.Types;
-
-public class ValueAccessibleMemberInstance<T> implements MemberInstance<T> {
-
-	private Member<T> member;
-	private ValueAccessible<T> access;
-	private Object object;
-
-	public <M extends Member<T> & ValueAccessible<T>> ValueAccessibleMemberInstance(
-		final M member, final Object object)
-	{
-		this.member = member;
-		this.access = member;
-		this.object = object;
-	}
-
-	@Override
-	public Member<T> member() {
-		return member;
-	}
-
-	@Override
-	public boolean isReadable() {
-		return true;
-	}
-
-	@Override
-	public boolean isWritable() {
-		return true;
-	}
-
-	@Override
-	public T get() {
-		return access.get(object);
-	}
-
-	@Override
-	public void set(Object value) {
-		final Class<?> type = member().getRawType();
-		if (!Types.isAssignable(value != null ? value.getClass() : null, type)) {
-			throw new IllegalArgumentException("value of type " + //
-				Types.name(value.getClass()) + " is not assignable to " + //
-				Types.name(type));
-		}
-		@SuppressWarnings("unchecked")
-		final T tValue = (T) value;
-		access.set(tValue, object);
-	}
-}
diff --git a/scijava/scijava-ops/templates/main/java/module-info.vm b/scijava/scijava-ops/templates/main/java/module-info.vm
index eabbd4dd8..d42f7c123 100644
--- a/scijava/scijava-ops/templates/main/java/module-info.vm
+++ b/scijava/scijava-ops/templates/main/java/module-info.vm
@@ -22,7 +22,6 @@ module org.scijava.ops {
 	exports org.scijava.ops.provenance;
 	// TODO: move OpWrapper to its own package (org.scijava.ops.wrap??)
 	exports org.scijava.ops.util; // contains OpWrapper interface
-	exports org.scijava.struct;
 	exports org.scijava.param;
 
 #foreach($package in $packages)
@@ -36,6 +35,7 @@ module org.scijava.ops {
 
 	requires org.scijava;
 	requires org.scijava.function;
+	requires org.scijava.struct;
 	requires org.scijava.types;
 	requires javassist;
 	requires java.compiler;

From d090c1cc63f633e88bb468e999640ea36538a9ac Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 20 May 2021 19:58:35 -0500
Subject: [PATCH 41/91] Install scijava-taglets before the reactor build

It's a dependency of the maven-javadoc-plugin, which means it needs
to be installed before generating javadocs for any of the modules.
---
 .travis/build.sh | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .travis/build.sh

diff --git a/.travis/build.sh b/.travis/build.sh
new file mode 100644
index 000000000..d20bbdea7
--- /dev/null
+++ b/.travis/build.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+(cd scijava/scijava-taglets && mvn install)
+curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/travis-build.sh
+sh travis-build.sh $encrypted_844f7d2110b9_key $encrypted_844f7d2110b9_iv

From b8f3d93aa59dbdfd4c624dccd11ceeebd87d461b Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Mon, 28 Jun 2021 14:58:51 -0500
Subject: [PATCH 42/91] WIPPY: add package cycle enforcer to incubator

---
 pom.xml                     | 25 +++++++++++++++++++++++++
 scijava/scijava-ops/pom.xml |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 11d82d0e3..86e1fbcd9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,6 +121,31 @@
 					</tagletArtifacts>
 				</configuration>
 			</plugin>
+			<plugin>
+				<artifactId>maven-enforcer-plugin</artifactId>
+				<dependencies>
+					<dependency>
+						<groupId>de.andrena.tools.nopackagecycles</groupId>
+						<artifactId>no-package-cycles-enforcer-rule</artifactId>
+						<version>1.0.9</version>
+					</dependency>
+				</dependencies>
+				<executions>
+					<execution>
+						<id>enforce-no-package-cycles</id>
+						<goals>
+							<goal>enforce</goal>
+						</goals>
+						<phase>test</phase>
+						<configuration>
+							<rules>
+								<NoPackageCyclesRule
+									implementation="de.andrena.tools.nopackagecycles.NoPackageCyclesRule" />
+							</rules>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 		<pluginManagement>
 			<plugins>
diff --git a/scijava/scijava-ops/pom.xml b/scijava/scijava-ops/pom.xml
index 16494dfa9..892246bcf 100644
--- a/scijava/scijava-ops/pom.xml
+++ b/scijava/scijava-ops/pom.xml
@@ -103,7 +103,7 @@
 
 		<license.licenseName>bsd_2</license.licenseName>
 		<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
-		<enforcer.skip>true</enforcer.skip>
+		<!--  <enforcer.skip>true</enforcer.skip>-->
 		<scijava-ops.allowedDuplicateClasses>${scijava.allowedDuplicateClasses},com.github.therapi.runtimejavadoc.repack.com.eclipsesource.json.*</scijava-ops.allowedDuplicateClasses>
 		<allowedDuplicateClasses>${scijava-ops.allowedDuplicateClasses}</allowedDuplicateClasses>
 	</properties>

From 119f9d1ed1747a9acb623923554e5f36499621a2 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Mon, 28 Jun 2021 15:12:15 -0500
Subject: [PATCH 43/91] Move Op to org.scijava.ops

---
 .../src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java          | 2 +-
 .../java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java  | 2 +-
 .../main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java    | 2 +-
 .../main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java   | 2 +-
 .../java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java    | 2 +-
 .../main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java   | 2 +-
 .../main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java   | 2 +-
 .../src/main/java/net/imagej/ops2/copy/CopyArrayImg.java        | 2 +-
 .../imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java  | 2 +-
 .../imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java | 2 +-
 .../src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java     | 2 +-
 .../src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java | 2 +-
 .../imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java | 2 +-
 .../src/main/java/net/imagej/ops2/copy/CopyType.java            | 2 +-
 .../java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java | 2 +-
 .../imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java | 2 +-
 .../main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java   | 2 +-
 .../net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java    | 2 +-
 .../main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java   | 2 +-
 .../main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java | 2 +-
 .../java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java | 2 +-
 .../java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java   | 2 +-
 .../imagej/ops2/deconvolve/accelerate/VectorAccelerator.java    | 2 +-
 .../src/main/java/net/imagej/ops2/eval/DefaultEval.java         | 2 +-
 .../main/java/net/imagej/ops2/features/haralick/DefaultASM.java | 2 +-
 .../imagej/ops2/features/haralick/DefaultClusterPromenence.java | 2 +-
 .../net/imagej/ops2/features/haralick/DefaultClusterShade.java  | 2 +-
 .../java/net/imagej/ops2/features/haralick/DefaultContrast.java | 2 +-
 .../net/imagej/ops2/features/haralick/DefaultCorrelation.java   | 2 +-
 .../imagej/ops2/features/haralick/DefaultDifferenceEntropy.java | 2 +-
 .../ops2/features/haralick/DefaultDifferenceVariance.java       | 2 +-
 .../java/net/imagej/ops2/features/haralick/DefaultEntropy.java  | 2 +-
 .../java/net/imagej/ops2/features/haralick/DefaultICM1.java     | 2 +-
 .../java/net/imagej/ops2/features/haralick/DefaultICM2.java     | 2 +-
 .../java/net/imagej/ops2/features/haralick/DefaultIFDM.java     | 2 +-
 .../imagej/ops2/features/haralick/DefaultMaxProbability.java    | 2 +-
 .../net/imagej/ops2/features/haralick/DefaultSumAverage.java    | 2 +-
 .../net/imagej/ops2/features/haralick/DefaultSumEntropy.java    | 2 +-
 .../net/imagej/ops2/features/haralick/DefaultSumVariance.java   | 2 +-
 .../ops2/features/haralick/DefaultTextureHomogeneity.java       | 2 +-
 .../java/net/imagej/ops2/features/haralick/DefaultVariance.java | 2 +-
 .../java/net/imagej/ops2/features/haralick/helper/CoocHXY.java  | 2 +-
 .../net/imagej/ops2/features/haralick/helper/CoocMeanX.java     | 2 +-
 .../net/imagej/ops2/features/haralick/helper/CoocMeanY.java     | 2 +-
 .../java/net/imagej/ops2/features/haralick/helper/CoocPX.java   | 2 +-
 .../net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java  | 2 +-
 .../net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java   | 2 +-
 .../java/net/imagej/ops2/features/haralick/helper/CoocPY.java   | 2 +-
 .../java/net/imagej/ops2/features/haralick/helper/CoocStdX.java | 2 +-
 .../java/net/imagej/ops2/features/haralick/helper/CoocStdY.java | 2 +-
 .../ops2/features/hog/HistogramOfOrientedGradients2D.java       | 2 +-
 .../main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java  | 2 +-
 .../imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java | 2 +-
 .../imagej/ops2/features/tamura2d/DefaultContrastFeature.java   | 2 +-
 .../ops2/features/tamura2d/DefaultDirectionalityFeature.java    | 2 +-
 .../imagej/ops2/features/zernike/DefaultMagnitudeFeature.java   | 2 +-
 .../net/imagej/ops2/features/zernike/DefaultPhaseFeature.java   | 2 +-
 .../imagej/ops2/features/zernike/helper/ZernikeComputer.java    | 2 +-
 .../java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java | 2 +-
 .../java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java | 2 +-
 .../main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java | 2 +-
 .../main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java | 2 +-
 .../java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java    | 2 +-
 .../java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java    | 2 +-
 .../java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java    | 2 +-
 .../java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java    | 2 +-
 .../net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java | 2 +-
 .../imagej/ops2/filter/derivative/PartialDerivativesRAI.java    | 2 +-
 .../ops2/filter/derivativeGauss/DefaultDerivativeGauss.java     | 2 +-
 .../src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java    | 2 +-
 .../main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java  | 2 +-
 .../java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java | 2 +-
 .../src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java | 2 +-
 .../src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java | 2 +-
 .../net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java   | 2 +-
 .../java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java     | 2 +-
 .../net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java   | 2 +-
 .../main/java/net/imagej/ops2/filter/hessian/HessianRAI.java    | 2 +-
 .../main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java   | 2 +-
 .../main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java   | 2 +-
 .../main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java  | 2 +-
 .../java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java     | 2 +-
 .../java/net/imagej/ops2/filter/median/DefaultMedianFilter.java | 2 +-
 .../main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java  | 2 +-
 .../java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java     | 2 +-
 .../net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java    | 2 +-
 .../src/main/java/net/imagej/ops2/filter/pad/PadInput.java      | 2 +-
 .../java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java     | 2 +-
 .../main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java    | 2 +-
 .../net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java    | 2 +-
 .../net/imagej/ops2/filter/pad/PaddingIntervalCentered.java     | 2 +-
 .../java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java  | 2 +-
 .../java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java   | 2 +-
 .../src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java    | 2 +-
 .../java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java   | 2 +-
 .../net/imagej/ops2/filter/variance/DefaultVarianceFilter.java  | 2 +-
 .../java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java   | 2 +-
 .../src/main/java/net/imagej/ops2/geom/CentroidII.java          | 2 +-
 .../src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java | 2 +-
 .../src/main/java/net/imagej/ops2/geom/CentroidMesh.java        | 2 +-
 .../src/main/java/net/imagej/ops2/geom/CentroidPolygon.java     | 2 +-
 .../main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java  | 2 +-
 .../imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java  | 2 +-
 .../ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java  | 2 +-
 .../java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java    | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java     | 2 +-
 .../java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java    | 2 +-
 .../main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java   | 2 +-
 .../java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java   | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java    | 2 +-
 .../java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java   | 2 +-
 .../java/net/imagej/ops2/geom/geom2d/DefaultElongation.java     | 2 +-
 .../java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java    | 2 +-
 .../java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java | 2 +-
 .../imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java  | 2 +-
 .../main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java | 2 +-
 .../java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java   | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java   | 2 +-
 .../imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java    | 2 +-
 .../java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java   | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java   | 2 +-
 .../imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java    | 2 +-
 .../main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java | 2 +-
 .../java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java     | 2 +-
 .../main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java | 2 +-
 .../imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java   | 2 +-
 .../java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java    | 2 +-
 .../ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java     | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java     | 2 +-
 .../ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java | 2 +-
 .../imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java    | 2 +-
 .../java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java   | 2 +-
 .../java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java    | 2 +-
 .../java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java   | 2 +-
 .../java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java  | 2 +-
 .../net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java     | 2 +-
 .../net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java | 2 +-
 .../java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java | 2 +-
 .../java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java  | 2 +-
 .../net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java    | 2 +-
 .../java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java   | 2 +-
 .../java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java  | 2 +-
 .../java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java     | 2 +-
 .../java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java    | 2 +-
 .../ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java      | 2 +-
 .../ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java    | 2 +-
 .../net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java   | 2 +-
 .../imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java    | 2 +-
 .../java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java     | 2 +-
 .../java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java | 2 +-
 .../src/main/java/net/imagej/ops2/help/HelpForName.java         | 2 +-
 .../src/main/java/net/imagej/ops2/identity/DefaultIdentity.java | 2 +-
 .../src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java | 2 +-
 .../ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java       | 2 +-
 .../image/distancetransform/CalibratedDistanceTransformer.java  | 2 +-
 .../distancetransform/DefaultDistanceTransformCalibration.java  | 2 +-
 .../ops2/image/distancetransform/DistanceTransformer.java       | 2 +-
 .../imagej/ops2/image/equation/DefaultCoordinatesEquation.java  | 2 +-
 .../java/net/imagej/ops2/image/equation/DefaultEquation.java    | 2 +-
 .../src/main/java/net/imagej/ops2/image/fill/DefaultFill.java   | 2 +-
 .../src/main/java/net/imagej/ops2/image/fill/FillRAI.java       | 2 +-
 .../java/net/imagej/ops2/image/histogram/HistogramCreate.java   | 2 +-
 .../java/net/imagej/ops2/image/integral/DefaultIntegralImg.java | 2 +-
 .../java/net/imagej/ops2/image/integral/SquareIntegralImg.java  | 2 +-
 .../java/net/imagej/ops2/image/integral/WrappedIntegralImg.java | 2 +-
 .../net/imagej/ops2/image/normalize/NormalizeIIComputer.java    | 2 +-
 .../net/imagej/ops2/image/normalize/NormalizeIIFunction.java    | 2 +-
 .../java/net/imagej/ops2/image/normalize/NormalizeIILazy.java   | 2 +-
 .../imagej/ops2/image/normalize/NormalizeIILazyFunction.java    | 2 +-
 .../main/java/net/imagej/ops2/image/watershed/Watershed.java    | 2 +-
 .../java/net/imagej/ops2/image/watershed/WatershedBinary.java   | 2 +-
 .../imagej/ops2/image/watershed/WatershedBinarySingleSigma.java | 2 +-
 .../java/net/imagej/ops2/image/watershed/WatershedSeeded.java   | 2 +-
 .../imagemoments/centralmoments/DefaultCentralMoment00.java     | 2 +-
 .../imagemoments/centralmoments/DefaultCentralMoment01.java     | 2 +-
 .../imagemoments/centralmoments/DefaultCentralMoment02.java     | 2 +-
 .../imagemoments/centralmoments/DefaultCentralMoment03.java     | 2 +-
 .../imagemoments/centralmoments/DefaultCentralMoment10.java     | 2 +-
 .../imagemoments/centralmoments/DefaultCentralMoment11.java     | 2 +-
 .../imagemoments/centralmoments/DefaultCentralMoment12.java     | 2 +-
 .../imagemoments/centralmoments/DefaultCentralMoment20.java     | 2 +-
 .../imagemoments/centralmoments/DefaultCentralMoment21.java     | 2 +-
 .../imagemoments/centralmoments/DefaultCentralMoment30.java     | 2 +-
 .../imagemoments/centralmoments/IterableCentralMoment00.java    | 2 +-
 .../imagemoments/centralmoments/IterableCentralMoment11.java    | 2 +-
 .../java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java  | 2 +-
 .../java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java  | 2 +-
 .../java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java  | 2 +-
 .../java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java  | 2 +-
 .../java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java  | 2 +-
 .../java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java  | 2 +-
 .../java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java  | 2 +-
 .../net/imagej/ops2/imagemoments/moments/DefaultMoment00.java   | 2 +-
 .../net/imagej/ops2/imagemoments/moments/DefaultMoment01.java   | 2 +-
 .../net/imagej/ops2/imagemoments/moments/DefaultMoment10.java   | 2 +-
 .../net/imagej/ops2/imagemoments/moments/DefaultMoment11.java   | 2 +-
 .../DefaultNormalizedCentralMoment02.java                       | 2 +-
 .../DefaultNormalizedCentralMoment03.java                       | 2 +-
 .../DefaultNormalizedCentralMoment11.java                       | 2 +-
 .../DefaultNormalizedCentralMoment12.java                       | 2 +-
 .../DefaultNormalizedCentralMoment20.java                       | 2 +-
 .../DefaultNormalizedCentralMoment21.java                       | 2 +-
 .../DefaultNormalizedCentralMoment30.java                       | 2 +-
 .../src/main/java/net/imagej/ops2/labeling/MergeLabeling.java   | 2 +-
 .../src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java  | 2 +-
 .../src/main/java/net/imagej/ops2/logic/Default.java            | 2 +-
 .../src/main/java/net/imagej/ops2/logic/Ternary.java            | 2 +-
 .../imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java    | 2 +-
 .../imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java | 2 +-
 .../imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java   | 2 +-
 .../src/main/java/net/imagej/ops2/morphology/ExtractHoles.java  | 2 +-
 .../src/main/java/net/imagej/ops2/morphology/FillHoles.java     | 2 +-
 .../src/main/java/net/imagej/ops2/morphology/Outline.java       | 2 +-
 .../main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java  | 2 +-
 .../main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java | 2 +-
 .../java/net/imagej/ops2/morphology/thin/ThinMorphological.java | 2 +-
 .../java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java     | 2 +-
 .../java/net/imagej/ops2/project/DefaultProjectParallel.java    | 2 +-
 .../net/imagej/ops2/project/ProjectRAIToIterableInterval.java   | 2 +-
 .../ops2/segment/detectJunctions/DefaultDetectJunctions.java    | 2 +-
 .../imagej/ops2/segment/detectRidges/DefaultDetectRidges.java   | 2 +-
 .../src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java       | 2 +-
 .../main/java/net/imagej/ops2/stats/DefaultGeometricMean.java   | 2 +-
 .../main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java    | 2 +-
 .../src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java    | 2 +-
 .../src/main/java/net/imagej/ops2/stats/DefaultMax.java         | 2 +-
 .../src/main/java/net/imagej/ops2/stats/DefaultMean.java        | 2 +-
 .../src/main/java/net/imagej/ops2/stats/DefaultMedian.java      | 2 +-
 .../src/main/java/net/imagej/ops2/stats/DefaultMin.java         | 2 +-
 .../src/main/java/net/imagej/ops2/stats/DefaultMinMax.java      | 2 +-
 .../java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java     | 2 +-
 .../java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java     | 2 +-
 .../java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java     | 2 +-
 .../java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java     | 2 +-
 .../java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java     | 2 +-
 .../src/main/java/net/imagej/ops2/stats/DefaultPercentile.java  | 2 +-
 .../src/main/java/net/imagej/ops2/stats/DefaultQuantile.java    | 2 +-
 .../src/main/java/net/imagej/ops2/stats/DefaultSize.java        | 2 +-
 .../src/main/java/net/imagej/ops2/stats/DefaultSkewness.java    | 2 +-
 .../java/net/imagej/ops2/stats/DefaultStandardDeviation.java    | 2 +-
 .../src/main/java/net/imagej/ops2/stats/DefaultSum.java         | 2 +-
 .../main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java   | 2 +-
 .../src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java   | 2 +-
 .../main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java    | 2 +-
 .../src/main/java/net/imagej/ops2/stats/DefaultVariance.java    | 2 +-
 .../src/main/java/net/imagej/ops2/stats/IntegralMean.java       | 2 +-
 .../src/main/java/net/imagej/ops2/stats/IntegralSum.java        | 2 +-
 .../src/main/java/net/imagej/ops2/stats/IntegralVariance.java   | 2 +-
 .../main/java/net/imagej/ops2/stats/IterableGeometricMean.java  | 2 +-
 .../main/java/net/imagej/ops2/stats/IterableHarmonicMean.java   | 2 +-
 .../src/main/java/net/imagej/ops2/stats/IterableMax.java        | 2 +-
 .../src/main/java/net/imagej/ops2/stats/IterableMean.java       | 2 +-
 .../src/main/java/net/imagej/ops2/stats/IterableMin.java        | 2 +-
 .../src/main/java/net/imagej/ops2/stats/IterableMinMax.java     | 2 +-
 .../java/net/imagej/ops2/stats/IterableMoment3AboutMean.java    | 2 +-
 .../java/net/imagej/ops2/stats/IterableMoment4AboutMean.java    | 2 +-
 .../src/main/java/net/imagej/ops2/stats/IterableSize.java       | 2 +-
 .../java/net/imagej/ops2/stats/IterableStandardDeviation.java   | 2 +-
 .../src/main/java/net/imagej/ops2/stats/IterableSum.java        | 2 +-
 .../main/java/net/imagej/ops2/stats/IterableSumOfInverses.java  | 2 +-
 .../src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java  | 2 +-
 .../main/java/net/imagej/ops2/stats/IterableSumOfSquares.java   | 2 +-
 .../src/main/java/net/imagej/ops2/stats/IterableVariance.java   | 2 +-
 .../net/imagej/ops2/stats/regression/leastSquares/Quadric.java  | 2 +-
 .../java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java | 2 +-
 .../java/net/imagej/ops2/thread/chunker/DefaultChunker.java     | 2 +-
 .../java/net/imagej/ops2/threshold/ApplyThresholdMethod.java    | 2 +-
 .../net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java    | 2 +-
 .../net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java | 2 +-
 .../imagej/ops2/threshold/apply/ApplyThresholdComparable.java   | 2 +-
 .../imagej/ops2/threshold/apply/ApplyThresholdComparator.java   | 2 +-
 .../net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java  | 2 +-
 .../java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java | 2 +-
 .../ops2/threshold/intermodes/ComputeIntermodesThreshold.java   | 2 +-
 .../imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java  | 2 +-
 .../java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java   | 2 +-
 .../threshold/localBernsen/ComputeLocalBernsenThreshold.java    | 2 +-
 .../ops2/threshold/localBernsen/LocalBernsenThreshold.java      | 2 +-
 .../threshold/localContrast/ComputeLocalContrastThreshold.java  | 2 +-
 .../ops2/threshold/localContrast/LocalContrastThreshold.java    | 2 +-
 .../ops2/threshold/localMean/ComputeLocalMeanThreshold.java     | 2 +-
 .../threshold/localMean/ComputeLocalMeanThresholdIntegral.java  | 2 +-
 .../net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java | 2 +-
 .../ops2/threshold/localMedian/ComputeLocalMedianThreshold.java | 2 +-
 .../imagej/ops2/threshold/localMedian/LocalMedianThreshold.java | 2 +-
 .../threshold/localMidGrey/ComputeLocalMidGreyThreshold.java    | 2 +-
 .../ops2/threshold/localMidGrey/LocalMidGreyThreshold.java      | 2 +-
 .../threshold/localNiblack/ComputeLocalNiblackThreshold.java    | 2 +-
 .../localNiblack/ComputeLocalNiblackThresholdIntegral.java      | 2 +-
 .../ops2/threshold/localNiblack/LocalNiblackThreshold.java      | 2 +-
 .../localPhansalkar/ComputeLocalPhansalkarThreshold.java        | 2 +-
 .../ComputeLocalPhansalkarThresholdIntegral.java                | 2 +-
 .../threshold/localPhansalkar/LocalPhansalkarThreshold.java     | 2 +-
 .../threshold/localSauvola/ComputeLocalSauvolaThreshold.java    | 2 +-
 .../localSauvola/ComputeLocalSauvolaThresholdIntegral.java      | 2 +-
 .../ops2/threshold/localSauvola/LocalSauvolaThreshold.java      | 2 +-
 .../ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java   | 2 +-
 .../threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java  | 2 +-
 .../net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java    | 2 +-
 .../ops2/threshold/minError/ComputeMinErrorThreshold.java       | 2 +-
 .../imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java  | 2 +-
 .../imagej/ops2/threshold/moments/ComputeMomentsThreshold.java  | 2 +-
 .../net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java    | 2 +-
 .../ops2/threshold/percentile/ComputePercentileThreshold.java   | 2 +-
 .../threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java    | 2 +-
 .../net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java  | 2 +-
 .../ops2/threshold/shanbhag/ComputeShanbhagThreshold.java       | 2 +-
 .../ops2/threshold/triangle/ComputeTriangleThreshold.java       | 2 +-
 .../java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java | 2 +-
 .../src/main/java/net/imagej/ops2/topology/BoxCount.java        | 2 +-
 .../topology/eulerCharacteristic/EulerCharacteristic26N.java    | 2 +-
 .../eulerCharacteristic/EulerCharacteristic26NFloating.java     | 2 +-
 .../ops2/topology/eulerCharacteristic/EulerCorrection.java      | 2 +-
 .../src/main/java/net/imagej/ops2/transform/Transforms.java     | 2 +-
 .../src/test/java/net/imagej/ops2/AbstractOpTest.java           | 2 +-
 .../src/main/java/org/scijava/ops/{core => }/Op.java            | 2 +-
 .../ops/adapt/complexLift/ComputersToFunctionsAndLift.java      | 2 +-
 .../ops/adapt/complexLift/FunctionsToComputersAndLift.java      | 2 +-
 .../ops/adapt/functional/ComputersToFunctionsViaFunction.java   | 2 +-
 .../ops/adapt/functional/ComputersToFunctionsViaSource.java     | 2 +-
 .../org/scijava/ops/adapt/functional/FunctionsToComputers.java  | 2 +-
 .../org/scijava/ops/adapt/functional/InplacesToFunctions.java   | 2 +-
 .../org/scijava/ops/conversionLoss/IdentityLossReporter.java    | 2 +-
 .../main/java/org/scijava/ops/impl/DefaultOpEnvironment.java    | 2 +-
 .../src/main/java/org/scijava/ops/matcher/OpRef.java            | 2 +-
 .../src/main/java/org/scijava/ops/math/Normalize.java           | 2 +-
 .../src/main/java/org/scijava/ops/simplify/Identity.java        | 2 +-
 .../java/org/scijava/ops/simplify/PrimitiveListSimplifier.java  | 2 +-
 .../main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java    | 2 +-
 .../scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java   | 2 +-
 .../scijava-ops/src/main/java/org/scijava/ops/stats/Size.java   | 2 +-
 .../scijava-ops/src/main/java/org/scijava/ops/util/Adapt.java   | 2 +-
 .../src/test/java/org/scijava/ops/OpCachingTest.java            | 1 -
 .../src/test/java/org/scijava/ops/OpPriorityTest.java           | 1 -
 scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java  | 1 -
 .../java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java  | 2 +-
 .../test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java  | 2 +-
 .../src/test/java/org/scijava/ops/monitor/OpMonitorTest.java    | 2 +-
 .../src/test/java/org/scijava/ops/util/OpsAsParametersTest.java | 2 +-
 .../src/test/java/org/scijava/param/JavadocParameterTest.java   | 2 +-
 341 files changed, 338 insertions(+), 341 deletions(-)
 rename scijava/scijava-ops/src/main/java/org/scijava/ops/{core => }/Op.java (78%)

diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java
index 77ba621b1..e0703369b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java
@@ -38,8 +38,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java
index e4acb798b..e2ce3e89f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java
@@ -38,7 +38,7 @@
 import net.imglib2.util.IterablePair;
 import net.imglib2.util.Pair;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java
index 06610fad5..e0ad20bf4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java
@@ -49,8 +49,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.util.IntArray;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java
index e2d059afe..58f305dde 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java
@@ -48,8 +48,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java
index 119249d3d..40385a7ac 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java
@@ -35,7 +35,7 @@
 import net.imglib2.util.IterablePair;
 import net.imglib2.util.Pair;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java
index 12fd44582..34515e1d5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java
@@ -32,7 +32,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java
index 25fbdef37..18b4c638f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java
@@ -32,7 +32,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java
index e432081f6..814923429 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java
@@ -39,8 +39,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java
index 98a7f9051..9edc5dc11 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java
@@ -36,8 +36,8 @@
 import net.imglib2.IterableInterval;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.ops.util.Maps;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java
index cf5095a2b..0cb0dfcef 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java
@@ -35,8 +35,8 @@
 import net.imglib2.type.NativeType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java
index 0c2396ee7..dddee6cfa 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java
@@ -38,8 +38,8 @@
 import net.imglib2.util.Util;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java
index e222106e9..39dc59340 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java
@@ -37,7 +37,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java
index cde9a0502..d0bebd24d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java
@@ -35,8 +35,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java
index 05091042a..ddcb0417e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java
@@ -32,7 +32,7 @@
 import net.imglib2.type.Type;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java
index 61f4e6dbe..ad3eb4d89 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java
@@ -42,8 +42,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java
index 96b3a708c..6fbb947a0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java
@@ -50,8 +50,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java
index dc38791cd..15e690fed 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java
@@ -45,8 +45,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java
index 88a3c09e5..e207f9a30 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java
@@ -44,8 +44,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java
index 675247b3d..2855491ea 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java
@@ -47,8 +47,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java
index 84970386b..3f4bd0762 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java
@@ -48,8 +48,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java
index 6cfcd7e31..3958377eb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java
@@ -45,8 +45,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java
index f935f3595..a103f71f7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java
@@ -34,8 +34,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java
index 304bff97e..4bb65d8d7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java
@@ -46,8 +46,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.ops.util.Adapt;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java
index 267ac66b8..d9c454e1b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java
@@ -32,8 +32,8 @@
 import java.util.Map;
 
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpService;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java
index fac2492a4..e2ea01efd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java
index 514beb672..2ef4f3d8c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java
@@ -35,8 +35,8 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java
index 21acc51b1..6226c6927 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java
@@ -35,8 +35,8 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java
index 9cf3a7563..40c537e7a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java
@@ -35,8 +35,8 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java
index 861f91bf7..ea36119b4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java
@@ -35,8 +35,8 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java
index a470cb1dc..1602ec07a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java
@@ -35,8 +35,8 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java
index 5ddc6258e..0375c9fc8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java
@@ -35,8 +35,8 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java
index 01549ac90..1b13d68fd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java
index b6dc94184..4f6c21052 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java
@@ -37,8 +37,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java
index 7d90b1835..732e8758e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java
@@ -37,8 +37,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java
index 964fba7c7..c2c314a23 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java
index cfa41f0c7..61efd7f59 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java
index 2ce292067..2a96f1f8d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java
@@ -36,8 +36,8 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java
index 4d4a17d21..aa0abcbd0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java
@@ -35,8 +35,8 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java
index b74f2e3e8..b13d2f940 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java
@@ -37,8 +37,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java
index 9e16eac80..e48830613 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java
index 6f5ae7a83..f05cbb29b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java
index b37c590e8..c044a10f6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java
@@ -31,8 +31,8 @@
 
 import java.util.function.Function;
 
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java
index 43a742f6c..f25e0865f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java
@@ -32,8 +32,8 @@
 
 import net.imglib2.type.numeric.real.DoubleType;
 
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java
index a6ccb65c0..59f22517d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java
@@ -33,8 +33,8 @@
 
 import net.imglib2.type.numeric.real.DoubleType;
 
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java
index b6a711f38..399fad6a6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java
@@ -30,7 +30,7 @@
 
 import java.util.function.Function;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java
index b79869a27..a4e3662c3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java
@@ -30,7 +30,7 @@
 
 import java.util.function.Function;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java
index 97c9cccce..ca9153c64 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java
@@ -30,7 +30,7 @@
 
 import java.util.function.Function;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java
index b84c82366..9513243e6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java
@@ -30,7 +30,7 @@
 
 import java.util.function.Function;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java
index fc24e7851..5a2c851d7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java
@@ -32,8 +32,8 @@
 
 import net.imglib2.type.numeric.real.DoubleType;
 
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java
index 6c40c7b96..a4e52c429 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java
@@ -33,8 +33,8 @@
 
 import net.imglib2.type.numeric.real.DoubleType;
 
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java
index d557fb9d6..071a48311 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java
@@ -59,8 +59,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java
index f7f35a782..c51bde4a6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java
@@ -43,8 +43,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java
index 335d7a3e0..eb3dd031e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java
@@ -48,8 +48,8 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java
index 04b2c2bbc..2f9638cf7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java
@@ -34,8 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java
index 202b29e58..64f8c8644 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java
@@ -45,8 +45,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java
index 9252f17d4..2c79367c4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java
@@ -35,8 +35,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java
index 4937afbb8..d27eb0058 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java
@@ -35,8 +35,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java
index f51bcf457..1d7f2f180 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java
index 0a07487c5..b72da5994 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java
@@ -40,8 +40,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java
index 9945b4933..550c5e919 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java
@@ -41,7 +41,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java
index 6d1d1d78e..905914e97 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java
@@ -37,8 +37,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java
index ad271293d..3a859d9b7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java
@@ -47,8 +47,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java
index afbc123ab..a4a3af15a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java
@@ -39,7 +39,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java
index fd21790dd..77a129e06 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java
@@ -45,8 +45,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java
index 638438f16..3cb9cccb6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java
@@ -36,8 +36,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java
index f29971d66..f1359dfb3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java
@@ -44,8 +44,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java
index 89d7a3c35..ace9c701e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java
@@ -41,8 +41,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java
index 41b4d9353..736baae5a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java
@@ -39,8 +39,8 @@
 import net.imglib2.view.composite.RealComposite;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java
index 923c89517..7d0635698 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java
@@ -42,8 +42,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java
index 2c64a2fdb..f4387abb1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java
@@ -39,8 +39,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java
index 8b41dead8..c7fb7a2d2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java
@@ -37,8 +37,8 @@
 import net.imglib2.type.numeric.NumericType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java
index 019133f5c..53aa7f38a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java
@@ -35,8 +35,8 @@
 import net.imglib2.img.Img;
 
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java
index 2cddc479a..1ebc23d5d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java
@@ -38,7 +38,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java
index 5f8df82a7..b0a8ed9fb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java
@@ -41,8 +41,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java
index 866e586fd..28e2aff17 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java
@@ -33,7 +33,7 @@
 import net.imglib2.algorithm.fft2.FFTMethods;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java
index e6e1bb0fa..ba97379bf 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java
@@ -37,7 +37,7 @@
 import net.imglib2.util.ValuePair;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java
index 39db46c80..52e8e38c3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java
@@ -33,7 +33,7 @@
 
 import net.imglib2.Dimensions;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java
index 116719a50..263686782 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java
@@ -39,8 +39,8 @@
 import net.imglib2.view.composite.RealComposite;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java
index 0b3c11048..ab093b056 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java
@@ -38,8 +38,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java
index 04cb5f9b3..d0a24033d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java
@@ -36,7 +36,7 @@
 import net.imglib2.type.numeric.ComplexType;
 
 import org.scijava.function.Inplaces;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java
index a83103e03..0d9d72ed4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java
@@ -36,8 +36,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java
index 3219a60fe..1511007a4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java
@@ -36,8 +36,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java
index ce4bfa967..2c710475f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java
@@ -35,8 +35,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java
index 2301e5821..8a6d313bf 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java
@@ -35,8 +35,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java
index 7feee4227..18f0e9e63 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java
@@ -37,8 +37,8 @@
 import net.imglib2.type.numeric.ComplexType;
 
 import org.scijava.Priority;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.ops.util.Adapt;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java
index ec494e634..067e3eada 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java
@@ -37,8 +37,8 @@
 import net.imglib2.type.numeric.ComplexType;
 
 import org.scijava.Priority;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.ops.util.Adapt;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java
index 25d12a71a..e83a07894 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java
@@ -42,8 +42,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java
index 966f25fcd..22d5b9d31 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java
@@ -37,8 +37,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.ops.util.Adapt;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java
index c23d88450..4ea0a55db 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java
@@ -40,8 +40,8 @@
 import net.imglib2.util.Util;
 import net.imglib2.view.Views;
 
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java
index 926343b4c..2c7e6e562 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java
@@ -37,8 +37,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.ops.util.Adapt;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java
index 51c080c23..8cb3adb0d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java
@@ -39,7 +39,7 @@
 import net.imglib2.type.numeric.ComplexType;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java
index 4e5e883e3..03f1c32a9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java
@@ -37,7 +37,7 @@
 import net.imglib2.type.numeric.ComplexType;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java
index 34219be0e..05fc0e11e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java
@@ -38,8 +38,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java
index 954aca598..109e6162c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java
@@ -34,8 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java
index 3e7cd81ba..a7961a3b2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java
@@ -50,8 +50,8 @@
 
 import org.scijava.Cancelable;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java
index fb0e1c031..2b55e6151 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java
@@ -36,8 +36,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java
index fc1db37c4..e3337eac2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java
@@ -42,7 +42,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java
index 79fb51871..65525e556 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java
@@ -36,7 +36,7 @@
 import net.imglib2.RealPoint;
 import net.imglib2.roi.IterableRegion;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java
index 2d972fab8..032947322 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java
@@ -36,7 +36,7 @@
 import net.imglib2.roi.IterableRegion;
 import net.imglib2.roi.labeling.LabelRegion;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java
index d01519873..c90c39c0a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java
@@ -36,8 +36,8 @@
 import net.imglib2.RealPoint;
 import net.imglib2.type.numeric.real.DoubleType;
 
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java
index 629a84a7d..165349c08 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java
@@ -36,8 +36,8 @@
 import net.imglib2.roi.geom.real.Polygon2D;
 import net.imglib2.type.numeric.real.DoubleType;
 
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java
index d6c5ce5fb..14f6cea77 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java
@@ -38,7 +38,7 @@
 import net.imglib2.roi.IterableRegion;
 import net.imglib2.type.numeric.RealType;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java
index 3d73db642..e0e803bb5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java
@@ -35,7 +35,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java
index 416764793..da027659f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java
@@ -33,7 +33,7 @@
 import net.imglib2.roi.geom.real.Polygon2D;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java
index bfdf6ab4d..e37b9a7c3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java
@@ -39,7 +39,7 @@
 import net.imglib2.roi.geom.real.DefaultWritablePolygon2D;
 import net.imglib2.roi.geom.real.Polygon2D;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java
index d4c6f3408..df1b47507 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java
@@ -33,7 +33,7 @@
 import net.imglib2.roi.geom.real.Polygon2D;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java
index 0030e60f7..4c0fe94e9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java
@@ -35,8 +35,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java
index d061e3b51..e9a3f2a36 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java
@@ -44,7 +44,7 @@
 import net.imglib2.util.Util;
 import net.imglib2.view.Views;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java
index b6bef5532..6432ec156 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java
@@ -40,7 +40,7 @@
 import net.imglib2.roi.geom.real.DefaultWritablePolygon2D;
 import net.imglib2.roi.geom.real.Polygon2D;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java
index 4fef58a19..715e62ba9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java
@@ -32,7 +32,7 @@
 import net.imglib2.roi.geom.real.Polygon2D;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java
index 75bde0bcf..0fc7017f7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java
@@ -35,8 +35,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java
index 070bdb662..8ec5f9793 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java
@@ -38,8 +38,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java
index ee2e20dc1..41b49f1d4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java
@@ -34,7 +34,7 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java
index 6d0758a9a..db0475f77 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java
@@ -34,7 +34,7 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java
index 84cc30313..63e8cc9ec 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java
@@ -38,8 +38,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java
index a1fd149d3..cbf7f39ec 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java
@@ -36,8 +36,8 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java
index e46451bff..382504813 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java
@@ -38,8 +38,8 @@
 import net.imglib2.util.Pair;
 import net.imglib2.util.ValuePair;
 
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java
index fd015c68a..7646ea1ed 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java
@@ -36,8 +36,8 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java
index a8c547d76..5595c321a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java
@@ -36,8 +36,8 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java
index 7bec34a20..cbc9565c3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java
@@ -41,8 +41,8 @@
 
 import org.apache.commons.math3.geometry.euclidean.twod.Line;
 import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java
index c65b92617..4f7224cac 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java
@@ -36,8 +36,8 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java
index e473611f3..5adcecd55 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java
@@ -36,8 +36,8 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java
index 2b7a8be23..8767bb9d9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java
@@ -36,8 +36,8 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java
index 6bd2096fd..88b72c028 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java
@@ -42,7 +42,7 @@
 import net.imglib2.util.Pair;
 import net.imglib2.util.ValuePair;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java
index c556d79ce..b2076f0ea 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java
@@ -37,7 +37,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java
index 4c15ebb1b..2f1131268 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java
@@ -35,8 +35,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java
index 1d83cd341..a4d8817ba 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java
@@ -33,7 +33,7 @@
 import net.imglib2.roi.geom.real.Polygon2D;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java
index 3ea7ec1b8..18fc5b126 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java
@@ -37,7 +37,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java
index e629b3e8d..04ef57348 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java
@@ -40,8 +40,8 @@
 import net.imglib2.roi.geom.real.Polygon2D;
 import net.imglib2.type.numeric.real.DoubleType;
 
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java
index 08edb1ea0..076a2319e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java
@@ -33,7 +33,7 @@
 import net.imglib2.roi.geom.real.Polygon2D;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java
index 8aeebbe8a..4f31522c4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java
@@ -36,8 +36,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java
index 847126045..6179e8c28 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java
@@ -34,7 +34,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java
index 8890d89ec..55c8554b3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java
@@ -33,7 +33,7 @@
 import net.imagej.ops2.geom.AbstractBoxivity;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java
index de62a5729..1a99d7b35 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java
@@ -36,8 +36,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java
index d9ffa2b1a..179e29ac2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java
@@ -47,7 +47,7 @@
 import net.imglib2.util.ValuePair;
 
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java
index 1892d94f0..af39027cd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java
@@ -33,7 +33,7 @@
 import net.imagej.ops2.geom.AbstractConvexity;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java
index 5c84b1338..efd502ee0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java
@@ -38,8 +38,8 @@
 
 import org.apache.commons.math3.linear.BlockRealMatrix;
 import org.apache.commons.math3.linear.RealMatrix;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java
index 80a2c394c..b4405aa0a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java
@@ -38,8 +38,8 @@
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
 import org.apache.commons.math3.linear.BlockRealMatrix;
 import org.apache.commons.math3.linear.RealMatrix;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java
index 51c2042a9..027a6d504 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java
@@ -38,8 +38,8 @@
 import org.apache.commons.math3.linear.RealMatrix;
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java
index 2bd07cf41..86f142be0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java
@@ -45,8 +45,8 @@
 
 import org.apache.commons.math3.util.MathArrays;
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java
index ada6ec30f..57f404196 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java
@@ -38,8 +38,8 @@
 import org.apache.commons.math3.linear.RealMatrix;
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java
index b27ead05c..1b96f50c9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java
@@ -33,7 +33,7 @@
 import net.imagej.ops2.geom.AbstractSolidity;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java
index c3f4f1406..cab0deb43 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java
@@ -38,8 +38,8 @@
 import org.apache.commons.math3.linear.RealMatrix;
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java
index 710cac142..9843d1443 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java
@@ -36,8 +36,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java
index 6d02b9449..1b7c6f173 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java
@@ -36,7 +36,7 @@
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java
index 11f308f6e..0f390ec00 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java
@@ -33,7 +33,7 @@
 import net.imagej.ops2.geom.AbstractBoundarySizeConvexHull;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java
index 56e51ce8c..767c6b2ce 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java
@@ -36,8 +36,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java
index a26b86718..d763b2432 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java
@@ -34,7 +34,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java
index 8eb4259ae..3beeddd1a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java
@@ -33,7 +33,7 @@
 import net.imagej.ops2.geom.AbstractSizeConvexHull;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java
index 37b689026..f56b42084 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java
@@ -36,7 +36,7 @@
 
 import org.apache.commons.math3.util.MathArrays;
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java
index 650bbf40a..00705c05f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java
@@ -44,8 +44,8 @@
 
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java
index c6a0a8649..5c62728a7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java
@@ -32,9 +32,9 @@
 import java.util.function.BiFunction;
 
 import org.scijava.Priority;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpService;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java
index 1cb16e37b..8fe08fe70 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java
@@ -30,7 +30,7 @@
 package net.imagej.ops2.identity;
 
 import org.scijava.function.Inplaces;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java
index a2baae844..c8ee6ac57 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java
@@ -37,8 +37,8 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java
index 007c93cfa..5c2845ee6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java
@@ -7,8 +7,8 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java
index fde760a76..67c08ac8d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java
@@ -36,7 +36,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java
index 0a4541e73..ab5a15d67 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java
@@ -42,7 +42,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java
index 5ec6e8997..9a545d57b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java
@@ -36,7 +36,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java
index b2f2e8049..ee72d1e08 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java
@@ -36,7 +36,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java
index dcafa9136..c17fbbdd9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java
@@ -41,8 +41,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpExecutionException;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.script.ScriptLanguage;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java
index 86b441d4a..f2ead8904 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java
@@ -35,7 +35,7 @@
 import net.imglib2.type.Type;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java
index 017a9f5ed..8ab99befe 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java
@@ -35,7 +35,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java
index b8d99bea2..8027c3154 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java
@@ -37,8 +37,8 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.util.Pair;
 
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java
index c869a9385..0659d7086 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java
@@ -36,7 +36,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java
index 7153f412e..b1608b6ec 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java
@@ -36,7 +36,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java
index 87116dee4..597f54ac1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java
@@ -38,7 +38,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java
index fd2f7039d..d307e6376 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java
@@ -39,8 +39,8 @@
 import net.imglib2.util.Util;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java
index 0e36656be..6b8ecc05c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java
@@ -37,8 +37,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java
index 1866fb7ae..6f200e1ea 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java
@@ -37,8 +37,8 @@
 import net.imglib2.util.Util;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java
index eb4ead609..4302115b7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java
@@ -35,8 +35,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java
index 68f1b4f19..a30d47bbd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java
@@ -56,8 +56,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java
index a84016dab..12621f782 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java
@@ -43,8 +43,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java
index 49d7457fb..870642eb6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java
@@ -44,8 +44,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java
index d0a25e0dc..1af0a1129 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java
@@ -66,8 +66,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java
index 48cad5858..88431dac5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java
@@ -34,8 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment01.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment01.java
index 454441834..ab26a9f75 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment01.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment01.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java
index ea10b10f4..a8c96c9d7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java
@@ -39,8 +39,8 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java
index ba894c0d8..53a9a134c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java
@@ -39,8 +39,8 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment10.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment10.java
index d273b9368..ff79fc2c3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment10.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment10.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java
index b660dfdd5..8d56811de 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java
@@ -35,8 +35,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java
index c77454664..8f11371c8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java
@@ -39,8 +39,8 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java
index 4c1fc580c..d2c1b01f0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java
@@ -38,8 +38,8 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java
index 7d0559b99..8a3eafdd7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java
@@ -39,8 +39,8 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java
index 57b15443c..e824cbe6e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java
@@ -39,8 +39,8 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java
index 657d1240e..c912e75a1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java
@@ -35,7 +35,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java
index 83228c0c2..c1be9aed1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java
@@ -35,7 +35,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java
index 928a036a0..d5445f935 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java
@@ -34,8 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java
index 40fa04956..ca71ec854 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java
@@ -34,8 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java
index 9fc923ed4..358da38ae 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java
@@ -34,8 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java
index 7e2fb5da8..6ffd15c3a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java
@@ -34,8 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java
index 52c5fd0ad..49b3c677a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java
@@ -34,8 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java
index 382ef3ab2..5a6abb7a2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java
@@ -34,8 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java
index dd14aeb09..411c64566 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java
@@ -34,8 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment00.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment00.java
index 1b48082c2..79c6b63f9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment00.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment00.java
@@ -39,7 +39,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment01.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment01.java
index 3cfebeb53..86fece070 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment01.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment01.java
@@ -39,7 +39,7 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment10.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment10.java
index 23ac2e3e4..a8116c551 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment10.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment10.java
@@ -39,7 +39,7 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment11.java
index 41ff2a155..56c041ab8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment11.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment11.java
@@ -39,7 +39,7 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java
index f725020d7..e1bf84cb5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java
@@ -34,8 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java
index 9d87f64c4..74b4e3d80 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java
@@ -34,8 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java
index 20b817932..7b80a7e8d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java
@@ -34,8 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java
index bdd5be083..95ea34ab5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java
@@ -34,8 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java
index 4e697c690..d9b7200b8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java
@@ -34,8 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java
index 357044e9c..dda6e4d4f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java
@@ -34,8 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java
index d255c56f8..c9fba1ee7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java
@@ -34,8 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java
index 0ab083109..082f4eaf5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java
@@ -47,8 +47,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java
index 7d14e598b..9f3bfda27 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java
@@ -42,8 +42,8 @@
 import net.imglib2.type.numeric.integer.IntType;
 
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java
index 9de65c4ff..a694d5c97 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.Type;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java
index a081ffb24..b4a1fda59 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.Type;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java
index 91f1d762e..949cf16a5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java
@@ -39,7 +39,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java
index db32240c4..b43529227 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java
@@ -40,8 +40,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java
index bc7c6b314..bbf0200d3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java
index 43c5e417b..20863d1d5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java
@@ -38,8 +38,8 @@
 import net.imglib2.type.BooleanType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java
index 7f59e3a07..d5871e9a7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java
@@ -38,8 +38,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java
index b8fb462aa..bdd21e7a6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java
@@ -45,7 +45,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java
index 2a1cbbd77..b6b26ba0c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java
@@ -32,7 +32,7 @@
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.type.logic.BitType;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java
index fd6135f11..865fc2d13 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java
@@ -32,7 +32,7 @@
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.type.logic.BitType;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java
index a1947976c..4bc6d4f15 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java
@@ -32,7 +32,7 @@
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.type.logic.BitType;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java
index dc1c016a6..0ea8fe3ec 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java
@@ -32,7 +32,7 @@
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.type.logic.BitType;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java
index c8c143904..b0ec412ff 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java
@@ -38,7 +38,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java
index f5c8503f4..f7e703936 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java
@@ -38,7 +38,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java
index 93ad55e8f..ccf043191 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java
@@ -44,8 +44,8 @@
 import net.imglib2.roi.util.RealLocalizableRealPositionable;
 import net.imglib2.util.Intervals;
 
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java
index a1aedaf8b..fe67e32f3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java
@@ -48,8 +48,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java
index 5720cd114..d88766a7a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java
@@ -34,7 +34,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java
index 0b33f523d..a6c7ccf22 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java
@@ -33,8 +33,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java
index ad5595f31..c8d361d05 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java
@@ -33,8 +33,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java
index 5a01ae663..ef9d8d9b1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java
@@ -33,8 +33,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java
index 28650f6f3..1469d83c2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java
@@ -37,8 +37,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java
index d93209a77..17fd594f3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java
@@ -34,8 +34,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java
index e88389cbb..098212ca7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java
@@ -34,8 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java
index 2aff0a2d1..de413137d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java
@@ -37,8 +37,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java
index df8fc3053..798b14636 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java
@@ -40,7 +40,7 @@
 import net.imglib2.util.ValuePair;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java
index 93451520e..eb193a150 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java
@@ -34,8 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java
index ece6214f2..61991eae3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java
@@ -34,8 +34,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java
index 4199af8b9..d61f4ca19 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java
@@ -34,8 +34,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java
index 44f113680..97ca54592 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java
@@ -34,8 +34,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java
index f964754c7..e00a62792 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java
@@ -38,8 +38,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java
index dad171964..7ddadf4a1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java
@@ -32,8 +32,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java
index 39492dde9..31042e585 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java
@@ -37,7 +37,7 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.util.ArrayUtils;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java
index 97b268bb5..1d1861b5f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java
index 5a012c8ce..bdd0a21b0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java
@@ -33,8 +33,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java
index 9e3997a63..76300169b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java
@@ -34,8 +34,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java
index 32242e25c..4c6eb739e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java
@@ -37,7 +37,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java
index 8c0179599..84a40ae25 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java
@@ -38,8 +38,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java
index 5c0358c20..ff1acb5cb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java
@@ -39,8 +39,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java
index 68e8e6114..29b08c0b3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java
@@ -37,8 +37,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java
index 583ff142d..63e4728cb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java
@@ -40,8 +40,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java
index 7dfeac133..1b7c8b1cd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java
@@ -39,7 +39,7 @@
 import net.imglib2.view.composite.Composite;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java
index 7291125b8..f6d2d2ae1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java
@@ -37,7 +37,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java
index 583807604..314c72b71 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java
@@ -39,7 +39,7 @@
 import net.imglib2.view.composite.Composite;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java
index b29378a85..c067a3cb4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java
index b2dd83b76..d86d0b8cd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java
index 6b15a3cce..833505194 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java
index 24cddf2c1..8f3dce783 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java
index 230b48049..b7e71f8d6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java
index 5267eee1a..49879cfc2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java
@@ -36,7 +36,7 @@
 import net.imglib2.util.Pair;
 import net.imglib2.util.ValuePair;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java
index 41ce223b6..a2d177eef 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java
@@ -32,8 +32,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java
index d32189ebc..b6c9d0572 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java
@@ -32,8 +32,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java
index d98453016..05884460b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java
index 55cc3566f..5cb99df23 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java
index 9aac30fb6..f5c1de51f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java
@@ -32,7 +32,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java
index bdee0346a..c41b19009 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java
@@ -32,7 +32,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java
index 4a76ac047..26e7f7b96 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java
@@ -32,7 +32,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java
index 7ee4918a9..943771bd6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java
@@ -32,7 +32,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java
index 397549f45..77df9d3f2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java
index 8371e0a35..f93d0af9c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java
@@ -38,7 +38,7 @@
 import org.ojalgo.matrix.BasicMatrix;
 import org.ojalgo.matrix.PrimitiveMatrix;
 import org.ojalgo.random.Deterministic;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java
index 4c23fd830..ddb1db5f9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java
@@ -35,7 +35,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java
index 87469b974..d93512ccc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java
@@ -35,7 +35,7 @@
 import java.util.concurrent.Future;
 
 import org.scijava.function.Inplaces;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethod.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethod.java
index a6ff3106e..53c1a480b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethod.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethod.java
@@ -34,8 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java
index 26b2037f7..8dbcf2298 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java
@@ -42,8 +42,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java
index dedc603bd..d456c0d67 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java
@@ -35,8 +35,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.ops.util.Adapt;
 import org.scijava.ops.util.Maps;
 import org.scijava.plugin.Plugin;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java
index c964f6c05..4e1fad0f9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java
@@ -32,7 +32,7 @@
 import net.imglib2.type.logic.BitType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java
index 2c5563c79..16dc9cb03 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.logic.BitType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java
index e3f90b391..44ae98d05 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java
@@ -33,7 +33,7 @@
 import net.imglib2.histogram.Histogram1d;
 import net.imglib2.type.numeric.RealType;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 //NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java
index e404c539e..d0cc01c4c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java
index c2beb0527..451fd9935 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java
@@ -35,8 +35,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpExecutionException;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java
index 28a512059..e5660c56b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java
@@ -34,8 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpExecutionException;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java
index c5bdda399..5b5d75c32 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java
index 2096baf89..60264f32a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java
@@ -37,8 +37,8 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java
index ab76e4a23..a2f9c54d3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java
@@ -38,8 +38,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java
index d7d0dae54..d2ea329dd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java
@@ -36,8 +36,8 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java
index 39b3c1f0e..ad7fbd76d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java
@@ -38,8 +38,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java
index b497a99d2..60a51653c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java
@@ -35,8 +35,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java
index 835f0f689..d6df3ae26 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java
@@ -39,8 +39,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java
index 52ea914f0..00aa40d9a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java
@@ -48,8 +48,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java
index 559adf6ab..9d366d4bc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java
@@ -34,8 +34,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java
index 09df42dea..0b5206769 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java
@@ -38,8 +38,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java
index b52fd1d5c..18a7c6e2a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java
@@ -37,8 +37,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java
index a5d4472b1..da588b56c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java
@@ -39,8 +39,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java
index 408c69e57..aa36c26e4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java
@@ -35,8 +35,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java
index 839e20d04..4b589d86d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java
@@ -40,8 +40,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java
index 2207cb076..e5461fd0c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java
@@ -47,8 +47,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java
index eba2b1289..e04e15117 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java
@@ -35,8 +35,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java
index b23fdcf0d..f6fec2136 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java
@@ -40,8 +40,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java
index 178fa124e..6a546ecee 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java
@@ -47,8 +47,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java
index 160079dc1..7976c5cf8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java
@@ -35,8 +35,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java
index 51d391c13..b99a6897c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java
@@ -40,8 +40,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java
index dbd982b53..32631af2e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java
@@ -47,8 +47,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java
index 105142e28..591f34e69 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java
index 0d56ed52f..a90f10106 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java
@@ -35,7 +35,7 @@
 import net.imglib2.histogram.Histogram1d;
 import net.imglib2.type.numeric.RealType;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 // This plugin code ported from the original MatLab code of the max likelihood
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java
index d7d016fa0..29faffec7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java
@@ -33,7 +33,7 @@
 import net.imglib2.histogram.Histogram1d;
 import net.imglib2.type.numeric.RealType;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java
index 50b01cad0..abd70abe0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java
@@ -36,8 +36,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpExecutionException;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java
index d814b4971..9a6e6bbaa 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java
@@ -35,7 +35,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java
index 0e48ff8d6..507d439a7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java
index f77a7381a..c851cc96b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/percentile/ComputePercentileThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/percentile/ComputePercentileThreshold.java
index 6d34013b7..0b3dcdffe 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/percentile/ComputePercentileThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/percentile/ComputePercentileThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java
index 389188f1d..bcc8870b1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java
index 9401e1074..2abcd7c12 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java
index 07831106a..a813983b6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java
index 1866271ac..00c949c64 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java
index 4d83f6708..fe17fd56f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java
index 4e548c4e5..3a00217dc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java
@@ -47,7 +47,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java
index d7ae08b84..86298788e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java
index 3d207a1c4..366c34252 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java
index 9cdd7a0b1..690d7a828 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java
@@ -37,7 +37,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java
index 21ed480e4..63ff42c0e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java
@@ -34,8 +34,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.Op;
 import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java
index 72042d2c1..4c7df5f41 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java
@@ -50,8 +50,8 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.scijava.Context;
 import org.scijava.cache.CacheService;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpService;
-import org.scijava.ops.core.Op;
 import org.scijava.ops.provenance.OpHistoryService;
 import org.scijava.plugin.PluginService;
 import org.scijava.thread.ThreadService;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/core/Op.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/Op.java
similarity index 78%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/core/Op.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/Op.java
index c6105ef4c..485783fd2 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/core/Op.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/Op.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.core;
+package org.scijava.ops;
 
 import org.scijava.plugin.SciJavaPlugin;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java
index 665eadafc..79b3dd7f7 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java
@@ -74,8 +74,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java
index 3ec18b5e8..ab0ea811e 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java
@@ -40,8 +40,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java
index 67e06bcb0..9bf2868b2 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java
@@ -39,8 +39,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java
index 6ef32930c..9d0b7ebe2 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java
@@ -41,8 +41,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Producer;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java
index cf7816485..ead54e7cc 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java
@@ -40,8 +40,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Producer;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java
index 7a7d0dc65..b783268a7 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java
@@ -40,8 +40,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/IdentityLossReporter.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/IdentityLossReporter.java
index a23e5e1ac..c89ff6ae9 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/IdentityLossReporter.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/IdentityLossReporter.java
@@ -1,8 +1,8 @@
 
 package org.scijava.ops.conversionLoss;
 
-import org.scijava.ops.core.Op;
 import org.scijava.ops.hints.BaseOpHints.Simplification;
+import org.scijava.ops.Op;
 import org.scijava.ops.hints.OpHints;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
index ba7df6fa9..8749981ac 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
@@ -53,6 +53,7 @@
 import org.scijava.InstantiableException;
 import org.scijava.Priority;
 import org.scijava.log.LogService;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.OpDependencyMember;
 import org.scijava.ops.OpEnvironment;
@@ -61,7 +62,6 @@
 import org.scijava.ops.OpInstance;
 import org.scijava.ops.OpMethod;
 import org.scijava.ops.OpUtils;
-import org.scijava.ops.core.Op;
 import org.scijava.ops.core.OpCollection;
 import org.scijava.ops.hints.BaseOpHints.Adaptation;
 import org.scijava.ops.hints.BaseOpHints.DependencyMatching;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpRef.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpRef.java
index e2247ff94..9d506b080 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpRef.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpRef.java
@@ -38,9 +38,9 @@
 import java.util.Objects;
 
 import org.scijava.log.Logger;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.OpInfo;
-import org.scijava.ops.core.Op;
 import org.scijava.types.Types;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java
index 6c06a225e..31af65a0e 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java
@@ -3,7 +3,7 @@
 import java.util.Arrays;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Identity.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Identity.java
index ef9361593..81e2b3d7f 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Identity.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Identity.java
@@ -3,8 +3,8 @@
 
 import java.util.function.Function;
 
-import org.scijava.ops.core.Op;
 import org.scijava.ops.hints.BaseOpHints.Simplification;
+import org.scijava.ops.Op;
 import org.scijava.ops.hints.OpHints;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveListSimplifier.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveListSimplifier.java
index 67c715b8c..a0fc7f910 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveListSimplifier.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveListSimplifier.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import java.util.function.Function;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java
index 6c6745c59..82f99ae1e 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java
@@ -9,11 +9,11 @@
 import java.util.stream.Collectors;
 
 import org.scijava.Priority;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpUtils;
 import org.scijava.ops.conversionLoss.LossReporter;
-import org.scijava.ops.core.Op;
 import org.scijava.ops.hints.BaseOpHints.Adaptation;
 import org.scijava.ops.hints.BaseOpHints.Simplification;
 import org.scijava.ops.hints.Hints;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java
index c173c46ed..6db29c485 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java
@@ -3,8 +3,8 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
 import org.scijava.plugin.Plugin;
 
 public class Mean {
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Size.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Size.java
index 7119fd12e..f9c34d8df 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Size.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Size.java
@@ -4,7 +4,7 @@
 import java.util.function.Function;
 import java.util.stream.StreamSupport;
 
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 public class Size {
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Adapt.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Adapt.java
index b4feb8242..1819e5c65 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Adapt.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Adapt.java
@@ -14,8 +14,8 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
+import org.scijava.ops.Op;
 import org.scijava.ops.core.OneToOneCommand;
-import org.scijava.ops.core.Op;
 
 /**
  * Utility providing adaptation between {@link Op} types.
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java
index 865232878..33c8d2796 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java
@@ -40,7 +40,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.scijava.Context;
 import org.scijava.function.Producer;
-import org.scijava.ops.core.Op;
 import org.scijava.ops.core.OpCollection;
 import org.scijava.ops.impl.DefaultOpEnvironment;
 import org.scijava.ops.impl.MatchingConditions;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java
index 8a8ca26ba..aee9ea41f 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java
@@ -33,7 +33,6 @@
 import org.junit.Test;
 import org.scijava.Priority;
 import org.scijava.function.Producer;
-import org.scijava.ops.core.Op;
 import org.scijava.types.Nil;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java
index 084fd1ecb..4d1c6b7d5 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java
@@ -5,7 +5,6 @@
 import java.util.function.Function;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java
index f1b9b9bb8..4af1519b6 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java
@@ -7,9 +7,9 @@
 import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.Op;
 import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java
index ea16621d5..d9463fbb0 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java
@@ -11,7 +11,7 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Producer;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Any;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java
index 6961c8e56..9cc3810a2 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java
@@ -12,7 +12,7 @@
 import org.junit.Test;
 import org.scijava.function.Functions;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.ops.util.FunctionUtils;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
index aaa805886..e239a9e1d 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
@@ -8,8 +8,8 @@
 import org.junit.Test;
 import org.scijava.function.Functions;
 import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.Op;
 import org.scijava.ops.core.OpCollection;
 import org.scijava.ops.core.builder.OpBuilder;
 import org.scijava.types.Nil;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
index 1a6a416dc..71bd28788 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
@@ -16,12 +16,12 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.OpField;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpMethod;
 import org.scijava.ops.OpUtils;
-import org.scijava.ops.core.Op;
 import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 

From 77109af48aabd416c1e5707ab255c95a3d0e92e9 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Mon, 28 Jun 2021 15:15:07 -0500
Subject: [PATCH 44/91] Move OpCollection to org.scijava.ops

---
 .../src/main/java/net/imagej/ops2/convert/ConvertTypes.java     | 2 +-
 .../src/main/java/net/imagej/ops2/convert/Converters.java       | 2 +-
 .../src/main/java/net/imagej/ops2/create/CreateTypes.java       | 2 +-
 .../src/main/java/net/imagej/ops2/create/Creators.java          | 2 +-
 .../main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java  | 2 +-
 .../src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java   | 2 +-
 .../net/imagej/ops2/image/integral/AbstractIntegralImg.java     | 2 +-
 .../src/main/java/net/imagej/ops2/image/invert/Inverters.java   | 2 +-
 .../src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java  | 2 +-
 .../src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java   | 2 +-
 .../main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java   | 2 +-
 .../src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java  | 2 +-
 .../main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java  | 2 +-
 .../src/main/java/net/imagej/ops2/math/UnaryRealTypeMath.java   | 2 +-
 .../src/main/java/net/imagej/ops2/morphology/BlackTopHats.java  | 2 +-
 .../src/main/java/net/imagej/ops2/morphology/Closes.java        | 2 +-
 .../src/main/java/net/imagej/ops2/morphology/Dilations.java     | 2 +-
 .../java/net/imagej/ops2/morphology/DistanceTransforms.java     | 2 +-
 .../src/main/java/net/imagej/ops2/morphology/Erosions.java      | 2 +-
 .../src/main/java/net/imagej/ops2/morphology/FloodFills.java    | 2 +-
 .../src/main/java/net/imagej/ops2/morphology/Opens.java         | 2 +-
 .../src/main/java/net/imagej/ops2/morphology/Table2Ds.java      | 2 +-
 .../src/main/java/net/imagej/ops2/morphology/WhiteTopHats.java  | 2 +-
 .../src/main/java/net/imagej/ops2/transform/Transforms.java     | 2 +-
 .../java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java    | 2 +-
 .../java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java    | 2 +-
 .../src/main/java/net/imagej/ops2/types/adapt/RAIToIIOps.java   | 2 +-
 .../java/net/imagej/ops2/types/maxValue/MaxValueRealTypes.java  | 2 +-
 .../java/net/imagej/ops2/types/minValue/MinValueRealTypes.java  | 2 +-
 .../src/test/java/net/imagej/ops2/slice/SliceTest.java          | 2 +-
 .../src/test/java/net/imagej/ops2/types/TypeExtractorTests.java | 2 +-
 .../net/imagej/ops2/types/adapt/LiftComputersToRAITest.java     | 2 +-
 .../net/imagej/ops2/types/adapt/LiftFunctionsToRAITest.java     | 2 +-
 .../src/main/java/org/scijava/ops/{core => }/OpCollection.java  | 2 +-
 scijava/scijava-ops/src/main/java/org/scijava/ops/OpField.java  | 1 -
 .../org/scijava/ops/adapt/functional/InplacesToFunctions.java   | 2 +-
 .../main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java  | 2 +-
 .../java/org/scijava/ops/adapt/lift/ComputerToIterables.java    | 2 +-
 .../main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java  | 2 +-
 .../java/org/scijava/ops/adapt/lift/FunctionToIterables.java    | 2 +-
 .../main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java   | 2 +-
 .../scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java | 2 +-
 .../org/scijava/ops/conversionLoss/PrimitiveLossReporters.java  | 2 +-
 .../src/main/java/org/scijava/ops/copy/CopyOpCollection.java    | 2 +-
 .../main/java/org/scijava/ops/create/CreateOpCollection.java    | 2 +-
 .../main/java/org/scijava/ops/impl/DefaultOpEnvironment.java    | 2 +-
 scijava/scijava-ops/src/main/java/org/scijava/ops/math/Add.java | 2 +-
 .../src/main/java/org/scijava/ops/math/MathOpCollection.java    | 2 +-
 .../scijava-ops/src/main/java/org/scijava/ops/math/Power.java   | 2 +-
 .../scijava-ops/src/main/java/org/scijava/ops/math/Sqrt.java    | 2 +-
 .../scijava-ops/src/main/java/org/scijava/ops/math/Zero.java    | 2 +-
 .../org/scijava/ops/simplify/PrimitiveArraySimplifiers.java     | 2 +-
 .../java/org/scijava/ops/simplify/PrimitiveSimplifiers.java     | 2 +-
 .../src/test/java/org/scijava/ops/OpCachingTest.java            | 1 -
 .../java/org/scijava/ops/OpMethodDependencyPositionTest.java    | 1 -
 .../scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java | 1 -
 .../src/test/java/org/scijava/ops/OpMethodTestOps.java          | 1 -
 .../java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java    | 2 +-
 .../ops/adapt/functional/ComputerToFunctionAdaptTestOps.java    | 2 +-
 .../ops/adapt/functional/FunctionToComputerAdaptTestOps.java    | 2 +-
 .../java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java   | 2 +-
 .../java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java   | 2 +-
 .../java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java    | 2 +-
 .../org/scijava/ops/core/builder/OpBuilderNoOutputTest.java     | 2 +-
 .../java/org/scijava/ops/core/builder/OpBuilderTestOps.java     | 2 +-
 .../src/test/java/org/scijava/ops/hints/AdaptationHintTest.java | 2 +-
 .../test/java/org/scijava/ops/hints/SimplificationHintTest.java | 2 +-
 .../java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java  | 2 +-
 .../test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java | 2 +-
 .../org/scijava/ops/simplify/SimplificationAdaptationTest.java  | 2 +-
 .../org/scijava/ops/simplify/SimplificationPriorityTest.java    | 2 +-
 .../src/test/java/org/scijava/ops/simplify/SimplifyIOTest.java  | 2 +-
 .../src/test/java/org/scijava/ops/simplify/SimplifyTest.java    | 2 +-
 .../src/test/java/org/scijava/ops/util/OpsAsParametersTest.java | 2 +-
 .../src/test/java/org/scijava/param/JavadocParameterTest.java   | 2 +-
 75 files changed, 70 insertions(+), 75 deletions(-)
 rename scijava/scijava-ops/src/main/java/org/scijava/ops/{core => }/OpCollection.java (86%)

diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java
index 42ed0532f..17d604834 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java
@@ -52,8 +52,8 @@
 import net.imglib2.type.numeric.real.FloatType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java
index 0cfec5064..d07d9a303 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java
@@ -6,8 +6,8 @@
 import net.imglib2.type.Type;
 
 import org.scijava.function.Functions;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java
index 0284a33b9..8e6305b6a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java
@@ -19,8 +19,8 @@
 import net.imglib2.type.numeric.real.FloatType;
 
 import org.scijava.function.Producer;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java
index 1c3357e06..127a95d60 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java
@@ -50,8 +50,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Functions;
 import org.scijava.function.Producer;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java
index 2b2970849..9c18fc0bf 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java
@@ -37,8 +37,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java
index 822952bc1..8738143a7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java
@@ -47,8 +47,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/AbstractIntegralImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/AbstractIntegralImg.java
index 130994197..c04f09d60 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/AbstractIntegralImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/AbstractIntegralImg.java
@@ -37,7 +37,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.core.OpCollection;
+import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/Inverters.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/Inverters.java
index b27516e18..7f6a29422 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/Inverters.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/Inverters.java
@@ -13,8 +13,8 @@
 import net.imglib2.util.Util;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java
index 50eef28f0..9e9564799 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java
@@ -37,8 +37,8 @@
 import org.joml.Vector3d;
 import org.joml.Vector3f;
 import org.scijava.function.Computers;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java
index 8ff58a48d..ffa853768 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java
@@ -32,8 +32,8 @@
 import net.imglib2.type.BooleanType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java
index 65d4306f6..563f02494 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java
@@ -34,8 +34,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java
index a0012071b..ccb11bca4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java
@@ -32,8 +32,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java
index 5618692a6..16ab64985 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java
@@ -33,8 +33,8 @@
 import net.imglib2.type.numeric.NumericType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/UnaryRealTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/UnaryRealTypeMath.java
index fdd63a9fd..a5cf84cb2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/UnaryRealTypeMath.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/UnaryRealTypeMath.java
@@ -36,8 +36,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/BlackTopHats.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/BlackTopHats.java
index 3723b627e..e43d392d8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/BlackTopHats.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/BlackTopHats.java
@@ -14,8 +14,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Closes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Closes.java
index 120c09a5e..779f6bab4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Closes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Closes.java
@@ -14,8 +14,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Dilations.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Dilations.java
index dae7f33e3..a021844b7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Dilations.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Dilations.java
@@ -14,8 +14,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java
index 2320045a1..c61fec18e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java
@@ -10,9 +10,9 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.ops.core.ExceptionUtils;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Erosions.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Erosions.java
index cc1741188..e61ed8fc5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Erosions.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Erosions.java
@@ -14,8 +14,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java
index 518b84101..b2ca7a942 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java
@@ -14,8 +14,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Opens.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Opens.java
index 3751f44ef..050eaf44e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Opens.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Opens.java
@@ -14,8 +14,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java
index e3ffded8a..c3e1e1351 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java
@@ -21,8 +21,8 @@
 import net.imglib2.type.BooleanType;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/WhiteTopHats.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/WhiteTopHats.java
index c7e634d9e..2bde0e35e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/WhiteTopHats.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/WhiteTopHats.java
@@ -14,8 +14,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java
index 63ff42c0e..b012e216e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java
@@ -35,8 +35,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java
index 2213c607e..018bb372e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java
@@ -8,8 +8,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java
index 60177b1f7..3cf61831c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java
@@ -14,8 +14,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Functions;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/RAIToIIOps.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/RAIToIIOps.java
index a252ea346..669669185 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/RAIToIIOps.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/RAIToIIOps.java
@@ -6,8 +6,8 @@
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.view.Views;
 
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/maxValue/MaxValueRealTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/maxValue/MaxValueRealTypes.java
index 6d96cc1b3..30d3920c2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/maxValue/MaxValueRealTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/maxValue/MaxValueRealTypes.java
@@ -24,8 +24,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 import net.imglib2.type.numeric.real.FloatType;
 
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/minValue/MinValueRealTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/minValue/MinValueRealTypes.java
index df6dc9824..af28ece70 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/minValue/MinValueRealTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/minValue/MinValueRealTypes.java
@@ -24,8 +24,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 import net.imglib2.type.numeric.real.FloatType;
 
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/slice/SliceTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/slice/SliceTest.java
index e5427250d..c8cc021ca 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/slice/SliceTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/slice/SliceTest.java
@@ -51,7 +51,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.OpCollection;
+import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/TypeExtractorTests.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/TypeExtractorTests.java
index b23dbe6d1..f907e6f71 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/TypeExtractorTests.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/TypeExtractorTests.java
@@ -13,8 +13,8 @@
 import net.imglib2.type.numeric.integer.UnsignedByteType;
 
 import org.junit.jupiter.api.Test;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.TypeExtractor;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftComputersToRAITest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftComputersToRAITest.java
index 7456fdba3..af0e78c73 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftComputersToRAITest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftComputersToRAITest.java
@@ -11,8 +11,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Computers;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.types.Nil;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAITest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAITest.java
index f08f2ef3b..e0c082e95 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAITest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAITest.java
@@ -15,8 +15,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/core/OpCollection.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpCollection.java
similarity index 86%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/core/OpCollection.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/OpCollection.java
index 1413c3816..3b6d79a2b 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/core/OpCollection.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpCollection.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.core;
+package org.scijava.ops;
 
 import org.scijava.plugin.SciJavaPlugin;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpField.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpField.java
index 2c46e9970..eecb7c70f 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpField.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpField.java
@@ -6,7 +6,6 @@
 import java.lang.annotation.Target;
 
 import org.scijava.Priority;
-import org.scijava.ops.core.OpCollection;
 
 /** Annotates an op declared as a field in an {@link OpCollection}. */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java
index b783268a7..55ab08e92 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java
@@ -41,8 +41,8 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.Op;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java
index 110be871c..111be587a 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java
@@ -37,8 +37,8 @@
 import java.util.function.Function;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java
index a96ccaf0f..627584125 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java
@@ -38,8 +38,8 @@
 import java.util.function.Function;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java
index 74d03ee08..c66bca664 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java
@@ -39,8 +39,8 @@
 import java.util.function.Function;
 
 import org.scijava.function.Functions;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java
index 692299db2..4991d429c 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java
@@ -39,8 +39,8 @@
 import java.util.function.Function;
 
 import org.scijava.function.Functions;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java
index 4a4b3429b..728fb6ab0 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java
@@ -37,8 +37,8 @@
 import java.util.function.Function;
 
 import org.scijava.function.Inplaces;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java
index 0c9074269..1c8002a95 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java
@@ -1,7 +1,7 @@
 package org.scijava.ops.conversionLoss;
 
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.ops.hints.OpHints;
 import org.scijava.ops.hints.BaseOpHints.Simplification;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveLossReporters.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveLossReporters.java
index c159ec686..a069a780f 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveLossReporters.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveLossReporters.java
@@ -1,8 +1,8 @@
 
 package org.scijava.ops.conversionLoss;
 
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.ops.hints.BaseOpHints.Simplification;
 import org.scijava.ops.hints.OpHints;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/copy/CopyOpCollection.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/copy/CopyOpCollection.java
index 83975861d..2e2c21cc3 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/copy/CopyOpCollection.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/copy/CopyOpCollection.java
@@ -2,8 +2,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java
index 4a3a63da2..c00f304a4 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java
@@ -5,8 +5,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Producer;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
index 8749981ac..d784c01c3 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
@@ -54,6 +54,7 @@
 import org.scijava.Priority;
 import org.scijava.log.LogService;
 import org.scijava.ops.Op;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.OpDependencyMember;
 import org.scijava.ops.OpEnvironment;
@@ -62,7 +63,6 @@
 import org.scijava.ops.OpInstance;
 import org.scijava.ops.OpMethod;
 import org.scijava.ops.OpUtils;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.ops.hints.BaseOpHints.Adaptation;
 import org.scijava.ops.hints.BaseOpHints.DependencyMatching;
 import org.scijava.ops.hints.BaseOpHints.Simplification;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Add.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Add.java
index c0ab872ac..71324f789 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Add.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Add.java
@@ -11,8 +11,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOpCollection.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOpCollection.java
index 8496b50ca..575f20bf1 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOpCollection.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOpCollection.java
@@ -4,8 +4,8 @@
 import java.util.function.BinaryOperator;
 
 import org.scijava.Priority;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Power.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Power.java
index 1be85150e..2f971f6a8 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Power.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Power.java
@@ -3,8 +3,8 @@
 import java.util.function.BiFunction;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Sqrt.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Sqrt.java
index 64f0806ce..02107ec02 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Sqrt.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Sqrt.java
@@ -4,8 +4,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java
index 85da2fc89..51d251142 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java
@@ -3,8 +3,8 @@
 import java.util.stream.IntStream;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveArraySimplifiers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveArraySimplifiers.java
index 8d9ad13de..a10fcc1ff 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveArraySimplifiers.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveArraySimplifiers.java
@@ -3,8 +3,8 @@
 
 import java.util.function.Function;
 
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.ops.hints.BaseOpHints.Simplification;
 import org.scijava.ops.hints.OpHints;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveSimplifiers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveSimplifiers.java
index 9c279ed91..8b7e01bf0 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveSimplifiers.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveSimplifiers.java
@@ -3,8 +3,8 @@
 
 import java.util.function.Function;
 
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.ops.hints.BaseOpHints.Simplification;
 import org.scijava.ops.hints.OpHints;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java
index 33c8d2796..21978b9f2 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java
@@ -40,7 +40,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.scijava.Context;
 import org.scijava.function.Producer;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.ops.impl.DefaultOpEnvironment;
 import org.scijava.ops.impl.MatchingConditions;
 import org.scijava.ops.provenance.OpHistoryService;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodDependencyPositionTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodDependencyPositionTest.java
index 666cd7f77..6cb0d1d87 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodDependencyPositionTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodDependencyPositionTest.java
@@ -8,7 +8,6 @@
 
 import org.junit.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java
index 1677c2599..f454725ac 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java
@@ -42,7 +42,6 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 import org.scijava.types.Nil;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
index f7743923c..1d9eefcd0 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
@@ -37,7 +37,6 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java
index 9f5d60ed0..d6d084597 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java
@@ -38,10 +38,10 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Producer;
 import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.ops.adapt.functional.ComputersToFunctionsViaFunction;
 import org.scijava.ops.adapt.functional.ComputersToFunctionsViaSource;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.ops.core.builder.OpBuilder;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java
index 722eee90f..be74f6a3c 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java
@@ -35,8 +35,8 @@
 package org.scijava.ops.adapt.functional;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java
index cf9ea9d4b..2844e7d9e 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java
@@ -38,8 +38,8 @@
 import java.util.function.Function;
 
 import org.scijava.function.Functions;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java
index e97b12d0c..d11b3bec6 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java
@@ -38,8 +38,8 @@
 import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Computers;
 import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java
index cfe47e3a9..3a4868175 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java
@@ -41,8 +41,8 @@
 import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Functions;
 import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java
index 1992f51e2..3c927a211 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java
@@ -38,8 +38,8 @@
 import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderNoOutputTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderNoOutputTest.java
index 12c6070d5..cbf6a1141 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderNoOutputTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderNoOutputTest.java
@@ -8,8 +8,8 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderTestOps.java
index 17bc33297..a5204bdd6 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderTestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderTestOps.java
@@ -36,8 +36,8 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/AdaptationHintTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/AdaptationHintTest.java
index 08f282423..fdb3549ec 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/AdaptationHintTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/AdaptationHintTest.java
@@ -6,8 +6,8 @@
 
 import org.junit.Test;
 import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.function.Computers;
 import org.scijava.ops.hints.BaseOpHints.Adaptation;
 import org.scijava.ops.hints.impl.DefaultHints;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/SimplificationHintTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/SimplificationHintTest.java
index c9bf4b1b3..6b88523b0 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/SimplificationHintTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/SimplificationHintTest.java
@@ -7,8 +7,8 @@
 
 import org.junit.Test;
 import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.ops.hints.BaseOpHints.Adaptation;
 import org.scijava.ops.hints.BaseOpHints.Simplification;
 import org.scijava.ops.hints.impl.DefaultHints;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java
index 4af1519b6..4d6c61c3a 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java
@@ -8,9 +8,9 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.Op;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java
index 7c966f4f7..5a5c6d3f7 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java
@@ -8,8 +8,8 @@
 
 import org.junit.Test;
 import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.ops.core.builder.OpBuilder;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationAdaptationTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationAdaptationTest.java
index 75e3ab6d3..8c5b7f11b 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationAdaptationTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationAdaptationTest.java
@@ -4,8 +4,8 @@
 import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationPriorityTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationPriorityTest.java
index ae605f733..159198392 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationPriorityTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationPriorityTest.java
@@ -8,9 +8,9 @@
 
 import org.junit.Test;
 import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.ops.conversionLoss.LossReporter;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.ops.hints.BaseOpHints.Simplification;
 import org.scijava.ops.hints.OpHints;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyIOTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyIOTest.java
index b193a353d..896a908fb 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyIOTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyIOTest.java
@@ -9,8 +9,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyTest.java
index cff119a6c..2c0515c4b 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyTest.java
@@ -7,8 +7,8 @@
 
 import org.junit.Test;
 import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
index e239a9e1d..8c2e31247 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
@@ -9,8 +9,8 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.Op;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.ops.core.builder.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
index 71bd28788..88e98727a 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
@@ -17,12 +17,12 @@
 import org.scijava.function.Inplaces;
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.Op;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.OpField;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpMethod;
 import org.scijava.ops.OpUtils;
-import org.scijava.ops.core.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**

From cb9734c125514f8099f9aea1e75154debe1001cf Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Mon, 28 Jun 2021 16:10:11 -0500
Subject: [PATCH 45/91] Move OpBuilder to org.scijava.ops

OpEnvironment returns an OpBuilder, so OpBuilder should be in the same
package
---
 .../test/java/net/imagej/ops2/coloc/ColocalisationTest.java   | 2 +-
 .../src/test/java/net/imagej/ops2/convert/ConvertMapTest.java | 2 +-
 .../src/test/java/net/imagej/ops2/copy/CopyArrayImgTest.java  | 2 +-
 .../imagej/ops2/create/CreateKernel2ndDerivBiGaussTest.java   | 2 +-
 .../java/net/imagej/ops2/create/CreateKernelBiGaussTest.java  | 2 +-
 .../ops2/features/hog/HistogramOfOrientedGradients2DTest.java | 2 +-
 .../ops2/filter/derivative/PartialDerivativeFilterTest.java   | 2 +-
 .../net/imagej/ops2/filter/hessian/HessianFilterTest.java     | 2 +-
 .../test/java/net/imagej/ops2/filter/mean/MeanFilterTest.java | 2 +-
 .../java/net/imagej/ops2/filter/sobel/SobelFilterTest.java    | 2 +-
 .../imagej/ops2/filter/vesselness/FrangiVesselnessTest.java   | 2 +-
 .../src/test/java/net/imagej/ops2/geom/QuickHull3DTest.java   | 2 +-
 .../src/test/java/net/imagej/ops2/image/ascii/ASCIITest.java  | 2 +-
 .../image/distancetransform/DefaultDistanceTransformTest.java | 2 +-
 .../ops2/image/distancetransform/DistanceTransform3DTest.java | 2 +-
 .../net/imagej/ops2/image/histogram/DefaultHistogramTest.java | 2 +-
 .../java/net/imagej/ops2/image/normalize/NormalizeTest.java   | 2 +-
 .../net/imagej/ops2/image/watershed/WatershedBinaryTest.java  | 2 +-
 .../java/net/imagej/ops2/image/watershed/WatershedTest.java   | 2 +-
 .../test/java/net/imagej/ops2/linalg/rotate/Rotate3dTest.java | 2 +-
 .../test/java/net/imagej/ops2/linalg/rotate/Rotate3fTest.java | 2 +-
 .../test/java/net/imagej/ops2/logic/BooleanTypeLogicTest.java | 2 +-
 .../src/test/java/net/imagej/ops2/logic/ConditionalTest.java  | 2 +-
 scijava/scijava-ops/src/main/java/module-info.java            | 3 ---
 .../java/org/scijava/ops/{core/builder => }/OpBuilder.java    | 2 +-
 .../src/main/java/org/scijava/ops/OpEnvironment.java          | 1 -
 .../scijava-ops/src/main/java/org/scijava/ops/OpService.java  | 1 -
 .../ops/adapt/complexLift/ComputersToFunctionsAndLift.java    | 2 +-
 .../ops/adapt/complexLift/FunctionsToComputersAndLift.java    | 2 +-
 .../ops/adapt/functional/ComputersToFunctionsViaFunction.java | 2 +-
 .../ops/adapt/functional/ComputersToFunctionsViaSource.java   | 2 +-
 .../scijava/ops/adapt/functional/FunctionsToComputers.java    | 2 +-
 .../org/scijava/ops/adapt/functional/InplacesToFunctions.java | 2 +-
 .../java/org/scijava/ops/adapt/lift/ComputerToArrays.java     | 2 +-
 .../java/org/scijava/ops/adapt/lift/ComputerToIterables.java  | 2 +-
 .../java/org/scijava/ops/adapt/lift/FunctionToArrays.java     | 2 +-
 .../java/org/scijava/ops/adapt/lift/FunctionToIterables.java  | 2 +-
 .../main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java | 2 +-
 .../src/test/java/org/scijava/ops/AutoTransformTest.java      | 1 -
 .../org/scijava/ops/{core/builder => }/OpBuilderTest.java     | 2 +-
 .../org/scijava/ops/{core/builder => }/OpBuilderTestOps.java  | 4 ++--
 .../src/test/java/org/scijava/ops/OpMethodTest.java           | 1 +
 .../src/test/java/org/scijava/ops/OpMethodTestOps.java        | 1 +
 .../java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java  | 2 +-
 .../adapt/complexLift/ComputerToFunctionIterablesTest.java    | 2 +-
 .../adapt/complexLift/FunctionToComputerIterablesTest.java    | 2 +-
 .../ops/adapt/functional/ComputerToFunctionAdaptTest.java     | 2 +-
 .../ops/adapt/functional/ComputerToFunctionAdaptTestOps.java  | 2 +-
 .../ops/adapt/functional/FunctionToComputerAdaptTest.java     | 2 +-
 .../ops/adapt/functional/FunctionToComputerAdaptTestOps.java  | 2 +-
 .../ops/adapt/functional/InplaceToFunctionAdaptTest.java      | 2 +-
 .../java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java | 2 +-
 .../org/scijava/ops/adapt/lift/ComputerToIterablesTest.java   | 2 +-
 .../java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java | 2 +-
 .../org/scijava/ops/adapt/lift/FunctionToIterablesTest.java   | 2 +-
 .../java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java  | 2 +-
 .../org/scijava/ops/core/builder/OpBuilderNoOutputTest.java   | 1 +
 .../java/org/scijava/ops/matcher/MatchingWithGCSTTest.java    | 2 +-
 .../test/java/org/scijava/ops/provenance/ProvenanceTest.java  | 2 +-
 .../test/java/org/scijava/ops/util/OpsAsParametersTest.java   | 2 +-
 scijava/scijava-ops/templates/main/java/module-info.vm        | 2 --
 .../java/org/scijava/ops/{core/builder => }/OpBuilder.list    | 0
 .../main/java/org/scijava/ops/{core/builder => }/OpBuilder.vm | 2 +-
 .../ops/adapt/complexLift/ComputersToFunctionsAndLift.vm      | 2 +-
 .../ops/adapt/complexLift/FunctionsToComputersAndLift.vm      | 2 +-
 .../ops/adapt/functional/ComputersToFunctionsViaFunction.vm   | 2 +-
 .../ops/adapt/functional/ComputersToFunctionsViaSource.vm     | 2 +-
 .../org/scijava/ops/adapt/functional/FunctionsToComputers.vm  | 2 +-
 .../org/scijava/ops/adapt/functional/InplacesToFunctions.vm   | 4 ++--
 .../main/java/org/scijava/ops/adapt/lift/ComputerToArrays.vm  | 2 +-
 .../java/org/scijava/ops/adapt/lift/ComputerToIterables.vm    | 2 +-
 .../main/java/org/scijava/ops/adapt/lift/FunctionToArrays.vm  | 2 +-
 .../java/org/scijava/ops/adapt/lift/FunctionToIterables.vm    | 2 +-
 .../main/java/org/scijava/ops/adapt/lift/InplaceToArrays.vm   | 2 +-
 .../org/scijava/ops/{core/builder => }/OpBuilderTest.list     | 0
 .../java/org/scijava/ops/{core/builder => }/OpBuilderTest.vm  | 2 +-
 .../org/scijava/ops/{core/builder => }/OpBuilderTestOps.list  | 0
 .../org/scijava/ops/{core/builder => }/OpBuilderTestOps.vm    | 4 ++--
 .../templates/test/java/org/scijava/ops/OpMethodTest.vm       | 2 +-
 .../templates/test/java/org/scijava/ops/OpMethodTestOps.vm    | 2 +-
 .../ops/adapt/complexLift/ComputerToFunctionIterablesTest.vm  | 2 +-
 .../ops/adapt/complexLift/FunctionToComputerIterablesTest.vm  | 2 +-
 .../ops/adapt/functional/ComputerToFunctionAdaptTest.vm       | 2 +-
 .../ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm    | 2 +-
 .../ops/adapt/functional/FunctionToComputerAdaptTest.vm       | 2 +-
 .../ops/adapt/functional/FunctionToComputerAdaptTestOps.vm    | 2 +-
 .../ops/adapt/functional/InplaceToFunctionAdaptTest.vm        | 2 +-
 .../java/org/scijava/ops/adapt/lift/ComputerToArraysTest.vm   | 2 +-
 .../org/scijava/ops/adapt/lift/ComputerToIterablesTest.vm     | 2 +-
 .../java/org/scijava/ops/adapt/lift/FunctionToArraysTest.vm   | 2 +-
 .../org/scijava/ops/adapt/lift/FunctionToIterablesTest.vm     | 2 +-
 .../java/org/scijava/ops/adapt/lift/InplaceToArraysTest.vm    | 2 +-
 92 files changed, 87 insertions(+), 92 deletions(-)
 rename scijava/scijava-ops/src/main/java/org/scijava/ops/{core/builder => }/OpBuilder.java (99%)
 rename scijava/scijava-ops/src/test/java/org/scijava/ops/{core/builder => }/OpBuilderTest.java (99%)
 rename scijava/scijava-ops/src/test/java/org/scijava/ops/{core/builder => }/OpBuilderTestOps.java (99%)
 rename scijava/scijava-ops/templates/main/java/org/scijava/ops/{core/builder => }/OpBuilder.list (100%)
 rename scijava/scijava-ops/templates/main/java/org/scijava/ops/{core/builder => }/OpBuilder.vm (99%)
 rename scijava/scijava-ops/templates/test/java/org/scijava/ops/{core/builder => }/OpBuilderTest.list (100%)
 rename scijava/scijava-ops/templates/test/java/org/scijava/ops/{core/builder => }/OpBuilderTest.vm (99%)
 rename scijava/scijava-ops/templates/test/java/org/scijava/ops/{core/builder => }/OpBuilderTestOps.list (100%)
 rename scijava/scijava-ops/templates/test/java/org/scijava/ops/{core/builder => }/OpBuilderTestOps.vm (97%)

diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/ColocalisationTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/ColocalisationTest.java
index 84906856e..a768395f3 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/ColocalisationTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/ColocalisationTest.java
@@ -59,8 +59,8 @@
 import org.scijava.app.StatusService;
 import org.scijava.cache.CacheService;
 import org.scijava.io.location.FileLocation;
+import org.scijava.ops.OpBuilder;
 import org.scijava.ops.OpService;
-import org.scijava.ops.core.builder.OpBuilder;
 import org.scijava.ops.provenance.OpHistoryService;
 import org.scijava.plugin.PluginService;
 import org.scijava.thread.ThreadService;
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/convert/ConvertMapTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/convert/ConvertMapTest.java
index baa029624..54ab97359 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/convert/ConvertMapTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/convert/ConvertMapTest.java
@@ -42,7 +42,7 @@
 import net.imglib2.util.Intervals;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 
 /**
  * Tests that the {@code convert} ops work on {@link Img} objects via
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyArrayImgTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyArrayImgTest.java
index a4ade1b69..d47df5c0b 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyArrayImgTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyArrayImgTest.java
@@ -41,7 +41,7 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 import org.scijava.util.MersenneTwisterFast;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernel2ndDerivBiGaussTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernel2ndDerivBiGaussTest.java
index f37dfcc81..e95257ecd 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernel2ndDerivBiGaussTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernel2ndDerivBiGaussTest.java
@@ -38,7 +38,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelBiGaussTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelBiGaussTest.java
index 7253ceec0..027da3ee4 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelBiGaussTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelBiGaussTest.java
@@ -38,7 +38,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2DTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2DTest.java
index a52a0c486..ebf047468 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2DTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2DTest.java
@@ -39,8 +39,8 @@
 import net.imglib2.type.numeric.real.FloatType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.core.builder.OpBuilder;
 import org.scijava.types.Nil;
+import org.scijava.ops.OpBuilder;
 import org.scijava.thread.ThreadService;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/derivative/PartialDerivativeFilterTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/derivative/PartialDerivativeFilterTest.java
index 34bb5ec0a..1a7762338 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/derivative/PartialDerivativeFilterTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/derivative/PartialDerivativeFilterTest.java
@@ -43,7 +43,7 @@
 import net.imglib2.view.composite.RealComposite;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/hessian/HessianFilterTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/hessian/HessianFilterTest.java
index 940f283ff..8eb655c69 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/hessian/HessianFilterTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/hessian/HessianFilterTest.java
@@ -42,7 +42,7 @@
 import net.imglib2.view.composite.RealComposite;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/mean/MeanFilterTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/mean/MeanFilterTest.java
index e0364ff52..2edd1da28 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/mean/MeanFilterTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/mean/MeanFilterTest.java
@@ -10,7 +10,7 @@
 import net.imglib2.type.numeric.integer.ByteType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 public class MeanFilterTest extends AbstractOpTest{
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/sobel/SobelFilterTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/sobel/SobelFilterTest.java
index 550aa52a8..803527c17 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/sobel/SobelFilterTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/sobel/SobelFilterTest.java
@@ -40,7 +40,7 @@
 import net.imglib2.util.Util;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/vesselness/FrangiVesselnessTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/vesselness/FrangiVesselnessTest.java
index fe2172ff0..e087a908d 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/vesselness/FrangiVesselnessTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/vesselness/FrangiVesselnessTest.java
@@ -48,8 +48,8 @@
 import org.junit.jupiter.api.Test;
 import org.scijava.Context;
 import org.scijava.cache.CacheService;
+import org.scijava.ops.OpBuilder;
 import org.scijava.ops.OpService;
-import org.scijava.ops.core.builder.OpBuilder;
 import org.scijava.ops.provenance.OpHistory;
 import org.scijava.ops.provenance.OpHistoryService;
 import org.scijava.plugin.PluginService;
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/QuickHull3DTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/QuickHull3DTest.java
index 209bbfe3e..566f23c79 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/QuickHull3DTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/QuickHull3DTest.java
@@ -44,7 +44,7 @@
 
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 
 /**
  * This class tests the {@link DefaultConvexHull3D} implementation. The number
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/ascii/ASCIITest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/ascii/ASCIITest.java
index e842c3045..fb63cc11c 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/ascii/ASCIITest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/ascii/ASCIITest.java
@@ -38,7 +38,7 @@
 import net.imglib2.util.Pair;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformTest.java
index 94230f259..20686415b 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformTest.java
@@ -38,8 +38,8 @@
 import net.imglib2.type.numeric.real.FloatType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.core.builder.OpBuilder;
 import org.scijava.types.Nil;
+import org.scijava.ops.OpBuilder;
 import org.scijava.thread.ThreadService;
 import org.scijava.util.MersenneTwisterFast;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DistanceTransform3DTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DistanceTransform3DTest.java
index d782d3692..b072ff63b 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DistanceTransform3DTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DistanceTransform3DTest.java
@@ -38,8 +38,8 @@
 import net.imglib2.type.numeric.real.FloatType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.core.builder.OpBuilder;
 import org.scijava.types.Nil;
+import org.scijava.ops.OpBuilder;
 import org.scijava.thread.ThreadService;
 import org.scijava.util.MersenneTwisterFast;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/histogram/DefaultHistogramTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/histogram/DefaultHistogramTest.java
index 409eae0ae..9467439a0 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/histogram/DefaultHistogramTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/histogram/DefaultHistogramTest.java
@@ -9,7 +9,7 @@
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/normalize/NormalizeTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/normalize/NormalizeTest.java
index 8720141fa..abfb77813 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/normalize/NormalizeTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/normalize/NormalizeTest.java
@@ -41,7 +41,7 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedBinaryTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedBinaryTest.java
index 4be48f061..f96b881af 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedBinaryTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedBinaryTest.java
@@ -45,8 +45,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.core.builder.OpBuilder;
 import org.scijava.types.Nil;
+import org.scijava.ops.OpBuilder;
 import org.scijava.thread.ThreadService;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedTest.java
index 935a00d61..9d861ae11 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedTest.java
@@ -51,7 +51,7 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 import org.scijava.thread.ThreadService;
 import org.scijava.types.Nil;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3dTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3dTest.java
index dbba18b43..a11df24ba 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3dTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3dTest.java
@@ -39,7 +39,7 @@
 import org.joml.Quaterniondc;
 import org.joml.Vector3d;
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 
 /**
  * Tests for {@link Rotate3d}.
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3fTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3fTest.java
index 508658959..73cdeb339 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3fTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3fTest.java
@@ -39,7 +39,7 @@
 import org.joml.Quaternionfc;
 import org.joml.Vector3f;
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 
 /**
  * Tests for {@link Rotate3f}.
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/BooleanTypeLogicTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/BooleanTypeLogicTest.java
index ff9eb39fa..b2ca28123 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/BooleanTypeLogicTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/BooleanTypeLogicTest.java
@@ -36,7 +36,7 @@
 import net.imglib2.type.logic.BitType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 
 /**
  * Tests {@link BooleanTypeLogic}.
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/ConditionalTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/ConditionalTest.java
index dc9551010..6f4b3a511 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/ConditionalTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/ConditionalTest.java
@@ -36,7 +36,7 @@
 import net.imglib2.type.numeric.integer.ByteType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 
 /**
  * Tests {@link Ternary} and {@link Default}.
diff --git a/scijava/scijava-ops/src/main/java/module-info.java b/scijava/scijava-ops/src/main/java/module-info.java
index 92d5debcc..191c887bc 100644
--- a/scijava/scijava-ops/src/main/java/module-info.java
+++ b/scijava/scijava-ops/src/main/java/module-info.java
@@ -7,8 +7,6 @@
 
 	//TODO: rearrange packages to export only needed classes
 	exports org.scijava.ops; //contains OpDependency interface
-	exports org.scijava.ops.core; // contains OpCollection, Op interfaces
-	exports org.scijava.ops.core.builder; // contains OpBuilder classes
 	exports org.scijava.ops.matcher;
 	exports org.scijava.ops.math;
 	exports org.scijava.ops.simplify;
@@ -20,7 +18,6 @@
 
 	opens org.scijava.ops.conversionLoss to therapi.runtime.javadoc;
 	opens org.scijava.ops.log to therapi.runtime.javadoc;
-	opens org.scijava.ops.core.builder to therapi.runtime.javadoc;
 	opens org.scijava.ops.copy to therapi.runtime.javadoc;
 	opens org.scijava.ops.hints to therapi.runtime.javadoc;
 	opens org.scijava.ops.adapt.complexLift to therapi.runtime.javadoc;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/core/builder/OpBuilder.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpBuilder.java
similarity index 99%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/core/builder/OpBuilder.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/OpBuilder.java
index 5015fedfc..e471459b5 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/core/builder/OpBuilder.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpBuilder.java
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.core.builder;
+package org.scijava.ops;
 
 import java.lang.reflect.Type;
 import java.util.function.BiFunction;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java
index d9b815c8c..10b89dd90 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java
@@ -31,7 +31,6 @@
 
 import java.lang.reflect.Type;
 
-import org.scijava.ops.core.builder.OpBuilder;
 import org.scijava.ops.hints.Hints;
 import org.scijava.ops.matcher.OpRef;
 import org.scijava.types.Nil;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpService.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpService.java
index 150871589..cd597bd8d 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpService.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpService.java
@@ -28,7 +28,6 @@
  */
 package org.scijava.ops;
 
-import org.scijava.ops.core.builder.OpBuilder;
 import org.scijava.ops.impl.DefaultOpEnvironment;
 import org.scijava.plugin.Plugin;
 import org.scijava.service.AbstractService;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java
index 79b3dd7f7..7e9f6b8ee 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java
@@ -74,8 +74,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java
index ab0ea811e..a3aaa5cad 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java
@@ -40,8 +40,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java
index 9bf2868b2..d87cc3780 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java
@@ -39,8 +39,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java
index 9d0b7ebe2..ee70eb362 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java
@@ -41,8 +41,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Producer;
-import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java
index ead54e7cc..0037ac545 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java
@@ -40,8 +40,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Producer;
-import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java
index 55ab08e92..c3f5e132e 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java
@@ -40,9 +40,9 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
+import org.scijava.ops.OpDependency;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpCollection;
-import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java
index 111be587a..eebd67cb5 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java
@@ -37,8 +37,8 @@
 import java.util.function.Function;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
+import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java
index 627584125..c70930437 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java
@@ -38,8 +38,8 @@
 import java.util.function.Function;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
+import org.scijava.ops.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java
index c66bca664..25f1a5689 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java
@@ -39,8 +39,8 @@
 import java.util.function.Function;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
+import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java
index 4991d429c..0c6cb0452 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java
@@ -39,8 +39,8 @@
 import java.util.function.Function;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
+import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java
index 728fb6ab0..3e58d7558 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java
@@ -37,8 +37,8 @@
 import java.util.function.Function;
 
 import org.scijava.function.Inplaces;
-import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
+import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/AutoTransformTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/AutoTransformTest.java
index f8785a351..076301020 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/AutoTransformTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/AutoTransformTest.java
@@ -38,7 +38,6 @@
 
 import org.junit.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.core.builder.OpBuilder;
 import org.scijava.types.Nil;
 
 //TODO: think about removing this class
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderTest.java
similarity index 99%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderTest.java
rename to scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderTest.java
index b51f6da8f..6846fe0e4 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderTest.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops.core.builder;
+package org.scijava.ops;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderTestOps.java
similarity index 99%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderTestOps.java
rename to scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderTestOps.java
index a5204bdd6..7e7df8702 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderTestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderTestOps.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops.core.builder;
+package org.scijava.ops;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
@@ -36,8 +36,8 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
+import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java
index f454725ac..8fd968092 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java
@@ -42,6 +42,7 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
+import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 import org.scijava.types.Nil;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
index 1d9eefcd0..9a9907031 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
@@ -37,6 +37,7 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
+import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java
index d6d084597..ba17419ce 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java
@@ -38,11 +38,11 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Producer;
 import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.OpBuilder;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.ops.adapt.functional.ComputersToFunctionsViaFunction;
 import org.scijava.ops.adapt.functional.ComputersToFunctionsViaSource;
-import org.scijava.ops.core.builder.OpBuilder;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/complexLift/ComputerToFunctionIterablesTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/complexLift/ComputerToFunctionIterablesTest.java
index cff69061f..3b54fed83 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/complexLift/ComputerToFunctionIterablesTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/complexLift/ComputerToFunctionIterablesTest.java
@@ -42,7 +42,7 @@
 import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/complexLift/FunctionToComputerIterablesTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/complexLift/FunctionToComputerIterablesTest.java
index b4d70ac2c..cfca57cbb 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/complexLift/FunctionToComputerIterablesTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/complexLift/FunctionToComputerIterablesTest.java
@@ -40,7 +40,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 
 public class FunctionToComputerIterablesTest extends AbstractTestEnvironment {
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTest.java
index 0a0498d0f..d7f8b4c59 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTest.java
@@ -38,7 +38,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 
 public class ComputerToFunctionAdaptTest extends AbstractTestEnvironment {
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java
index be74f6a3c..453f7aeab 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java
@@ -35,8 +35,8 @@
 package org.scijava.ops.adapt.functional;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
+import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTest.java
index 5c0656393..b30eabb53 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTest.java
@@ -37,7 +37,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 
 public class FunctionToComputerAdaptTest extends AbstractTestEnvironment {
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java
index 2844e7d9e..93bf96dfb 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java
@@ -38,8 +38,8 @@
 import java.util.function.Function;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
+import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/InplaceToFunctionAdaptTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/InplaceToFunctionAdaptTest.java
index 5946ac834..43039aa61 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/InplaceToFunctionAdaptTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/InplaceToFunctionAdaptTest.java
@@ -40,7 +40,7 @@
 
 import org.junit.Test;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 public class InplaceToFunctionAdaptTest extends AbstractTestEnvironment {
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java
index d11b3bec6..0903cf7a6 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java
@@ -38,8 +38,8 @@
 import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Computers;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
+import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToIterablesTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToIterablesTest.java
index 9da2f3b43..eb9b6e8fa 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToIterablesTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToIterablesTest.java
@@ -42,7 +42,7 @@
 import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 
 /**
  * Tests the adaptation of {@link Computers} running on a type into
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java
index 3a4868175..79d3285db 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java
@@ -41,8 +41,8 @@
 import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Functions;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
+import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToIterablesTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToIterablesTest.java
index df63676ce..fecffb2ce 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToIterablesTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToIterablesTest.java
@@ -40,7 +40,7 @@
 import org.junit.Test;
 import org.scijava.function.Functions;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java
index 3c927a211..4a049ed93 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java
@@ -38,8 +38,8 @@
 import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
+import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderNoOutputTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderNoOutputTest.java
index cbf6a1141..dcac1b7f0 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderNoOutputTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderNoOutputTest.java
@@ -8,6 +8,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.OpBuilder;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.param.Parameter;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java
index 5a5c6d3f7..37597f5c9 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java
@@ -8,9 +8,9 @@
 
 import org.junit.Test;
 import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.OpBuilder;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.builder.OpBuilder;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java
index 54e79c9ee..9b41fc2fa 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java
@@ -17,7 +17,7 @@
 import org.scijava.ops.OpField;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpMethod;
-import org.scijava.ops.core.OpCollection;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.hints.Hints;
 import org.scijava.ops.hints.impl.DefaultHints;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
index 8c2e31247..91661493e 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
@@ -9,9 +9,9 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.Op;
+import org.scijava.ops.OpBuilder;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.builder.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/templates/main/java/module-info.vm b/scijava/scijava-ops/templates/main/java/module-info.vm
index d42f7c123..60119399a 100644
--- a/scijava/scijava-ops/templates/main/java/module-info.vm
+++ b/scijava/scijava-ops/templates/main/java/module-info.vm
@@ -13,8 +13,6 @@ module org.scijava.ops {
 #set($therapiPackages = $modulePackages.call("src/main/java/org/scijava"))
 	//TODO: rearrange packages to export only needed classes
 	exports org.scijava.ops; //contains OpDependency interface
-	exports org.scijava.ops.core; // contains OpCollection, Op interfaces
-	exports org.scijava.ops.core.builder; // contains OpBuilder classes
 	exports org.scijava.ops.matcher;
 	exports org.scijava.ops.math;
 	exports org.scijava.ops.simplify;
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/core/builder/OpBuilder.list b/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.list
similarity index 100%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/core/builder/OpBuilder.list
rename to scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.list
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/core/builder/OpBuilder.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.vm
similarity index 99%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/core/builder/OpBuilder.vm
rename to scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.vm
index ecccf660b..289c11fc8 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/core/builder/OpBuilder.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.vm
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.core.builder;
+package org.scijava.ops;
 
 import java.lang.reflect.Type;
 import java.util.function.BiFunction;
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.vm
index c05667e64..93da58b1e 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.vm
@@ -75,7 +75,7 @@ import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.vm
index 59d0088c8..72f65052c 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.vm
@@ -41,7 +41,7 @@ import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.vm
index 788fd0d0f..ac0e65fc3 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.vm
@@ -40,7 +40,7 @@ import java.util.function.Function;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.vm
index 389325b38..99306c671 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.vm
@@ -42,7 +42,7 @@ import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Producer;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.vm
index e0b00c492..f4879200b 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.vm
@@ -41,7 +41,7 @@ import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Producer;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
+import org.scijava.ops.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.vm
index f3e3a1183..7e29a5268 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.vm
@@ -41,8 +41,8 @@ import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.core.Op;
-import org.scijava.ops.core.OpCollection;
+import org.scijava.ops.Op;
+import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 
 #set($classArity = $maxArity + 1)
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.vm
index 8ed29b630..b20e6bc33 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.vm
@@ -38,7 +38,7 @@ import java.util.function.Function;
 
 import org.scijava.function.Computers;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
+import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm
index 702bb69ac..3b02876a8 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm
@@ -39,7 +39,7 @@ import java.util.function.Function;
 
 import org.scijava.function.Computers;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
+import org.scijava.ops.OpCollection;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.vm
index 88af66634..f98763699 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.vm
@@ -40,7 +40,7 @@ import java.util.function.Function;
 
 import org.scijava.function.Functions;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
+import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.vm
index 1bff435b9..f8bf9c9a3 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.vm
@@ -40,7 +40,7 @@ import java.util.function.Function;
 
 import org.scijava.function.Functions;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
+import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.vm
index cead7be70..a90ec37f6 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.vm
@@ -38,7 +38,7 @@ import java.util.function.Function;
 
 import org.scijava.function.Inplaces;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
+import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/core/builder/OpBuilderTest.list b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTest.list
similarity index 100%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/core/builder/OpBuilderTest.list
rename to scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTest.list
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/core/builder/OpBuilderTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTest.vm
similarity index 99%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/core/builder/OpBuilderTest.vm
rename to scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTest.vm
index e64ba305b..ddcb664f4 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/core/builder/OpBuilderTest.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTest.vm
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops.core.builder;
+package org.scijava.ops;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/core/builder/OpBuilderTestOps.list b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTestOps.list
similarity index 100%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/core/builder/OpBuilderTestOps.list
rename to scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTestOps.list
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/core/builder/OpBuilderTestOps.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTestOps.vm
similarity index 97%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/core/builder/OpBuilderTestOps.vm
rename to scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTestOps.vm
index 9be64ce4b..e10b8b0c3 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/core/builder/OpBuilderTestOps.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTestOps.vm
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops.core.builder;
+package org.scijava.ops;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
@@ -37,7 +37,7 @@ import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
+import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTest.vm
index f614927f6..2e06fa1f2 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTest.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTest.vm
@@ -42,7 +42,7 @@ import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.core.OpCollection;
+import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTestOps.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTestOps.vm
index c022cc5d1..4361862ac 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTestOps.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTestOps.vm
@@ -37,7 +37,7 @@ import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.core.OpCollection;
+import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/complexLift/ComputerToFunctionIterablesTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/complexLift/ComputerToFunctionIterablesTest.vm
index cc834c67f..965ee580f 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/complexLift/ComputerToFunctionIterablesTest.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/complexLift/ComputerToFunctionIterablesTest.vm
@@ -42,7 +42,7 @@ import java.util.List;
 import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/complexLift/FunctionToComputerIterablesTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/complexLift/FunctionToComputerIterablesTest.vm
index f0ef64fe6..a2f7e80c4 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/complexLift/FunctionToComputerIterablesTest.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/complexLift/FunctionToComputerIterablesTest.vm
@@ -40,7 +40,7 @@ import java.util.List;
 import org.junit.Assert;
 import org.junit.Test;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 
 public class FunctionToComputerIterablesTest extends AbstractTestEnvironment {
 #foreach($arity in [1..$maxArity])
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTest.vm
index 014aa1284..b37305228 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTest.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTest.vm
@@ -38,7 +38,7 @@ package org.scijava.ops.adapt.functional;
 import org.junit.Assert;
 import org.junit.Test;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 
 public class ComputerToFunctionAdaptTest extends AbstractTestEnvironment {
 #foreach($arity in [1..$maxArity])
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm
index 64acd53c6..1e3de0e7f 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm
@@ -36,7 +36,7 @@ package org.scijava.ops.adapt.functional;
 
 import org.scijava.function.Computers;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
+import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTest.vm
index 0f0917d04..bc8298360 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTest.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTest.vm
@@ -37,7 +37,7 @@ package org.scijava.ops.adapt.functional;
 import org.junit.Assert;
 import org.junit.Test;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 
 public class FunctionToComputerAdaptTest extends AbstractTestEnvironment {
 #foreach($arity in [1..$maxArity])
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.vm
index 723e9503e..42676adbe 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.vm
@@ -39,7 +39,7 @@ import java.util.function.Function;
 
 import org.scijava.function.Functions;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
+import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/InplaceToFunctionAdaptTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/InplaceToFunctionAdaptTest.vm
index d86ab3e9a..48df13f20 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/InplaceToFunctionAdaptTest.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/InplaceToFunctionAdaptTest.vm
@@ -40,7 +40,7 @@ import java.util.Arrays;
 
 import org.junit.Test;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 public class InplaceToFunctionAdaptTest extends AbstractTestEnvironment {
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.vm
index bc4d2e290..202abac4d 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.vm
@@ -39,7 +39,7 @@ import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Computers;
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
+import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToIterablesTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToIterablesTest.vm
index acf32683f..e0d7ae304 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToIterablesTest.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToIterablesTest.vm
@@ -42,7 +42,7 @@ import java.util.List;
 import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 
 /**
  * Tests the adaptation of {@link Computers} running on a type into
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.vm
index e1ea8eec7..3730150da 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.vm
@@ -42,7 +42,7 @@ import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Functions;
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
+import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToIterablesTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToIterablesTest.vm
index 6d7599b89..2c79a9387 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToIterablesTest.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToIterablesTest.vm
@@ -40,7 +40,7 @@ import java.util.List;
 import org.junit.Test;
 import org.scijava.function.Functions;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.core.builder.OpBuilder;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.vm
index 2235a214a..61a50a6a3 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.vm
@@ -39,7 +39,7 @@ import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.OpCollection;
+import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**

From 30699f767a3b7b7bc0ca99f0419523af58c08e2b Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Mon, 28 Jun 2021 16:33:10 -0500
Subject: [PATCH 46/91] Move Hints/OpHints to org.scijava.ops

Since OpEnvironments have Hints, the Hints need to be in the base
package.
---
 scijava/scijava-ops/src/main/java/module-info.java |  3 +--
 .../org/scijava/ops/{hints => }/BaseOpHints.java   |  2 +-
 .../java/org/scijava/ops/{hints => }/Hints.java    |  4 ++--
 .../src/main/java/org/scijava/ops/OpBuilder.java   |  2 +-
 .../main/java/org/scijava/ops/OpEnvironment.java   |  1 -
 .../java/org/scijava/ops/{hints => }/OpHints.java  |  2 +-
 .../src/main/java/org/scijava/ops/OpInfo.java      |  4 +---
 .../ops/conversionLoss/IdentityLossReporter.java   |  4 ++--
 .../ops/conversionLoss/LossReporterWrapper.java    |  4 ++--
 .../PrimitiveArrayLossReporters.java               |  4 ++--
 .../ops/conversionLoss/PrimitiveLossReporters.java |  4 ++--
 .../ops/{hints/impl => hint}/AbstractHints.java    |  4 ++--
 .../ops/{hints/impl => hint}/AdaptationHints.java  |  6 +++---
 .../ops/{hints/impl => hint}/DefaultHints.java     | 10 +++++-----
 .../ops/{hints/impl => hint}/ImmutableHints.java   |  4 ++--
 .../{hints/impl => hint}/SimplificationHints.java  |  6 +++---
 .../org/scijava/ops/impl/DefaultOpEnvironment.java | 14 +++++++-------
 .../org/scijava/ops/impl/MatchingConditions.java   |  2 +-
 .../org/scijava/ops/matcher/DefaultOpMatcher.java  |  6 +++---
 .../org/scijava/ops/matcher/OpAdaptationInfo.java  |  8 ++++----
 .../java/org/scijava/ops/matcher/OpClassInfo.java  |  4 ++--
 .../java/org/scijava/ops/matcher/OpFieldInfo.java  |  4 ++--
 .../java/org/scijava/ops/matcher/OpMatcher.java    |  2 +-
 .../java/org/scijava/ops/matcher/OpMethodInfo.java |  4 ++--
 .../java/org/scijava/ops/matcher/OpWrappers.java   |  4 ++--
 .../java/org/scijava/ops/simplify/Identity.java    |  4 ++--
 .../ops/simplify/InfoSimplificationGenerator.java  |  2 +-
 .../ops/simplify/PrimitiveArraySimplifiers.java    |  4 ++--
 .../scijava/ops/simplify/PrimitiveSimplifiers.java |  4 ++--
 .../org/scijava/ops/simplify/SimplifiedOpInfo.java | 10 +++++-----
 .../org/scijava/ops/simplify/SimplifiedOpRef.java  | 13 +++++--------
 .../java/org/scijava/ops/util/ComputerUtils.java   |  2 +-
 .../java/org/scijava/ops/util/FunctionUtils.java   |  2 +-
 .../java/org/scijava/ops/util/InplaceUtils.java    |  2 +-
 .../main/java/org/scijava/ops/util/OpWrapper.java  |  2 +-
 .../{core/builder => }/OpBuilderNoOutputTest.java  |  3 +--
 .../test/java/org/scijava/ops/OpMethodTest.java    |  1 -
 .../test/java/org/scijava/ops/OpMethodTestOps.java |  1 -
 .../org/scijava/ops/hints/AdaptationHintTest.java  |  6 ++++--
 .../scijava/ops/hints/SimplificationHintTest.java  |  8 +++++---
 .../org/scijava/ops/provenance/ProvenanceTest.java |  6 +++---
 .../ops/simplify/SimplificationPriorityTest.java   |  4 ++--
 .../main/java/org/scijava/ops/OpBuilder.vm         |  2 +-
 .../java/org/scijava/ops/matcher/OpWrappers.vm     | 14 +++++++-------
 .../java/org/scijava/ops/util/ComputerUtils.vm     |  2 +-
 .../java/org/scijava/ops/util/FunctionUtils.vm     |  2 +-
 .../main/java/org/scijava/ops/util/InplaceUtils.vm |  2 +-
 47 files changed, 101 insertions(+), 107 deletions(-)
 rename scijava/scijava-ops/src/main/java/org/scijava/ops/{hints => }/BaseOpHints.java (94%)
 rename scijava/scijava-ops/src/main/java/org/scijava/ops/{hints => }/Hints.java (91%)
 rename scijava/scijava-ops/src/main/java/org/scijava/ops/{hints => }/OpHints.java (89%)
 rename scijava/scijava-ops/src/main/java/org/scijava/ops/{hints/impl => hint}/AbstractHints.java (92%)
 rename scijava/scijava-ops/src/main/java/org/scijava/ops/{hints/impl => hint}/AdaptationHints.java (85%)
 rename scijava/scijava-ops/src/main/java/org/scijava/ops/{hints/impl => hint}/DefaultHints.java (71%)
 rename scijava/scijava-ops/src/main/java/org/scijava/ops/{hints/impl => hint}/ImmutableHints.java (88%)
 rename scijava/scijava-ops/src/main/java/org/scijava/ops/{hints/impl => hint}/SimplificationHints.java (88%)
 rename scijava/scijava-ops/src/test/java/org/scijava/ops/{core/builder => }/OpBuilderNoOutputTest.java (91%)

diff --git a/scijava/scijava-ops/src/main/java/module-info.java b/scijava/scijava-ops/src/main/java/module-info.java
index 191c887bc..5010452e3 100644
--- a/scijava/scijava-ops/src/main/java/module-info.java
+++ b/scijava/scijava-ops/src/main/java/module-info.java
@@ -19,7 +19,7 @@
 	opens org.scijava.ops.conversionLoss to therapi.runtime.javadoc;
 	opens org.scijava.ops.log to therapi.runtime.javadoc;
 	opens org.scijava.ops.copy to therapi.runtime.javadoc;
-	opens org.scijava.ops.hints to therapi.runtime.javadoc;
+	opens org.scijava.ops.hint to therapi.runtime.javadoc;
 	opens org.scijava.ops.adapt.complexLift to therapi.runtime.javadoc;
 	opens org.scijava.ops.math to therapi.runtime.javadoc;
 	opens org.scijava.ops.adapt.lift to therapi.runtime.javadoc;
@@ -27,7 +27,6 @@
 	opens org.scijava.ops.impl to therapi.runtime.javadoc, org.scijava;
 	opens org.scijava.ops.monitor to therapi.runtime.javadoc;
 	opens org.scijava.ops.provenance to therapi.runtime.javadoc;
-	opens org.scijava.ops.hints.impl to therapi.runtime.javadoc;
 	opens org.scijava.ops.adapt.functional to therapi.runtime.javadoc;
 	opens org.scijava.ops to therapi.runtime.javadoc, org.scijava;
 	opens org.scijava.ops.util to therapi.runtime.javadoc;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/BaseOpHints.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/BaseOpHints.java
similarity index 94%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/hints/BaseOpHints.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/BaseOpHints.java
index 647222a02..0e5f8aa25 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/BaseOpHints.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/BaseOpHints.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.hints;
+package org.scijava.ops;
 
 import java.lang.annotation.Annotation;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/Hints.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/Hints.java
similarity index 91%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/hints/Hints.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/Hints.java
index af66b188d..4b7fb1f42 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/Hints.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/Hints.java
@@ -1,11 +1,11 @@
 
-package org.scijava.ops.hints;
+package org.scijava.ops;
 
 import java.util.Deque;
 import java.util.Map;
 import java.util.UUID;
 
-import org.scijava.ops.hints.BaseOpHints.Simplification;
+import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.ops.provenance.OpHistory;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpBuilder.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpBuilder.java
index e471459b5..141183305 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpBuilder.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpBuilder.java
@@ -43,7 +43,7 @@
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
 import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.hints.Hints;
+import org.scijava.ops.Hints;
 import org.scijava.ops.util.ComputerUtils;
 import org.scijava.ops.util.FunctionUtils;
 import org.scijava.ops.util.InplaceUtils;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java
index 10b89dd90..55c10e687 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java
@@ -31,7 +31,6 @@
 
 import java.lang.reflect.Type;
 
-import org.scijava.ops.hints.Hints;
 import org.scijava.ops.matcher.OpRef;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/OpHints.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpHints.java
similarity index 89%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/hints/OpHints.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/OpHints.java
index b245c4e17..b624069d4 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/OpHints.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpHints.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops.hints;
+package org.scijava.ops;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java
index de0747cfa..0f99368a2 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java
@@ -8,9 +8,7 @@
 import java.util.Map;
 
 import org.scijava.log.Logger;
-import org.scijava.ops.hints.Hints;
-import org.scijava.ops.hints.OpHints;
-import org.scijava.ops.hints.impl.ImmutableHints;
+import org.scijava.ops.hint.ImmutableHints;
 import org.scijava.ops.matcher.OpCandidate;
 import org.scijava.ops.matcher.OpRef;
 import org.scijava.param.ValidityException;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/IdentityLossReporter.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/IdentityLossReporter.java
index c89ff6ae9..9659ed887 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/IdentityLossReporter.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/IdentityLossReporter.java
@@ -1,9 +1,9 @@
 
 package org.scijava.ops.conversionLoss;
 
-import org.scijava.ops.hints.BaseOpHints.Simplification;
 import org.scijava.ops.Op;
-import org.scijava.ops.hints.OpHints;
+import org.scijava.ops.OpHints;
+import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporterWrapper.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporterWrapper.java
index 26fcbb1cd..a7b62f51b 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporterWrapper.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporterWrapper.java
@@ -3,9 +3,9 @@
 import java.lang.reflect.Type;
 import java.util.UUID;
 
+import org.scijava.ops.BaseOpHints.DependencyMatching;
+import org.scijava.ops.Hints;
 import org.scijava.ops.OpInfo;
-import org.scijava.ops.hints.BaseOpHints.DependencyMatching;
-import org.scijava.ops.hints.Hints;
 import org.scijava.ops.provenance.OpExecutionSummary;
 import org.scijava.ops.provenance.OpHistory;
 import org.scijava.ops.util.OpWrapper;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java
index 1c8002a95..29781f59b 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java
@@ -2,8 +2,8 @@
 
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.hints.OpHints;
-import org.scijava.ops.hints.BaseOpHints.Simplification;
+import org.scijava.ops.OpHints;
+import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveLossReporters.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveLossReporters.java
index a069a780f..f2d428fc4 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveLossReporters.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveLossReporters.java
@@ -3,8 +3,8 @@
 
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.hints.BaseOpHints.Simplification;
-import org.scijava.ops.hints.OpHints;
+import org.scijava.ops.OpHints;
+import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/AbstractHints.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/AbstractHints.java
similarity index 92%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/AbstractHints.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/hint/AbstractHints.java
index 7ca7bb648..11fa46d05 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/AbstractHints.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/AbstractHints.java
@@ -1,11 +1,11 @@
-package org.scijava.ops.hints.impl;
+package org.scijava.ops.hint;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.UUID;
 
-import org.scijava.ops.hints.Hints;
+import org.scijava.ops.Hints;
 
 /**
  * Abstract class containing behavior common to most {@link Hints}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/AdaptationHints.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/AdaptationHints.java
similarity index 85%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/AdaptationHints.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/hint/AdaptationHints.java
index f151c8153..d910a88ff 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/AdaptationHints.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/AdaptationHints.java
@@ -1,12 +1,12 @@
 
-package org.scijava.ops.hints.impl;
+package org.scijava.ops.hint;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
-import org.scijava.ops.hints.Hints;
-import org.scijava.ops.hints.BaseOpHints.Adaptation;
+import org.scijava.ops.Hints;
+import org.scijava.ops.BaseOpHints.Adaptation;
 
 /**
  * A set of {@link Hints} governing Adaptation procedures.
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/DefaultHints.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/DefaultHints.java
similarity index 71%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/DefaultHints.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/hint/DefaultHints.java
index ef7862d4b..f37ee34db 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/DefaultHints.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/DefaultHints.java
@@ -1,13 +1,13 @@
-package org.scijava.ops.hints.impl;
+package org.scijava.ops.hint;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
-import org.scijava.ops.hints.Hints;
-import org.scijava.ops.hints.BaseOpHints.Adaptation;
-import org.scijava.ops.hints.BaseOpHints.DependencyMatching;
-import org.scijava.ops.hints.BaseOpHints.Simplification;
+import org.scijava.ops.BaseOpHints.Adaptation;
+import org.scijava.ops.BaseOpHints.DependencyMatching;
+import org.scijava.ops.BaseOpHints.Simplification;
+import org.scijava.ops.Hints;
 
 /**
  * Default Implementation of {@link Hints}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/ImmutableHints.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/ImmutableHints.java
similarity index 88%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/ImmutableHints.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/hint/ImmutableHints.java
index 6e45e6e31..d3c2613e8 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/ImmutableHints.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/ImmutableHints.java
@@ -1,10 +1,10 @@
-package org.scijava.ops.hints.impl;
+package org.scijava.ops.hint;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
-import org.scijava.ops.hints.Hints;
+import org.scijava.ops.Hints;
 
 /**
  * A {@link Hints} not modifiable after creation.
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/SimplificationHints.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/SimplificationHints.java
similarity index 88%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/SimplificationHints.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/hint/SimplificationHints.java
index b6d4b42f3..b99c31d90 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/SimplificationHints.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/SimplificationHints.java
@@ -1,12 +1,12 @@
 
-package org.scijava.ops.hints.impl;
+package org.scijava.ops.hint;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
-import org.scijava.ops.hints.Hints;
-import org.scijava.ops.hints.BaseOpHints.Simplification;
+import org.scijava.ops.Hints;
+import org.scijava.ops.BaseOpHints.Simplification;
 
 public class SimplificationHints extends AbstractHints {
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
index d784c01c3..c950a2bde 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
@@ -53,6 +53,10 @@
 import org.scijava.InstantiableException;
 import org.scijava.Priority;
 import org.scijava.log.LogService;
+import org.scijava.ops.BaseOpHints.Adaptation;
+import org.scijava.ops.BaseOpHints.DependencyMatching;
+import org.scijava.ops.BaseOpHints.Simplification;
+import org.scijava.ops.Hints;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpDependency;
@@ -63,13 +67,9 @@
 import org.scijava.ops.OpInstance;
 import org.scijava.ops.OpMethod;
 import org.scijava.ops.OpUtils;
-import org.scijava.ops.hints.BaseOpHints.Adaptation;
-import org.scijava.ops.hints.BaseOpHints.DependencyMatching;
-import org.scijava.ops.hints.BaseOpHints.Simplification;
-import org.scijava.ops.hints.Hints;
-import org.scijava.ops.hints.impl.AdaptationHints;
-import org.scijava.ops.hints.impl.DefaultHints;
-import org.scijava.ops.hints.impl.SimplificationHints;
+import org.scijava.ops.hint.AdaptationHints;
+import org.scijava.ops.hint.DefaultHints;
+import org.scijava.ops.hint.SimplificationHints;
 import org.scijava.ops.matcher.DefaultOpMatcher;
 import org.scijava.ops.matcher.DependencyMatchingException;
 import org.scijava.ops.matcher.MatchingUtils;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/MatchingConditions.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/MatchingConditions.java
index 85c4b29bd..b25ec8605 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/MatchingConditions.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/MatchingConditions.java
@@ -3,7 +3,7 @@
 
 import java.util.Objects;
 
-import org.scijava.ops.hints.Hints;
+import org.scijava.ops.Hints;
 import org.scijava.ops.matcher.OpRef;
 
 public class MatchingConditions {
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java
index dbd71d3b3..3b8d8d6a6 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java
@@ -44,12 +44,12 @@
 import java.util.function.Predicate;
 
 import org.scijava.log.Logger;
+import org.scijava.ops.Hints;
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpUtils;
-import org.scijava.ops.hints.BaseOpHints.Simplification;
-import org.scijava.ops.hints.Hints;
-import org.scijava.ops.hints.impl.DefaultHints;
+import org.scijava.ops.BaseOpHints.Simplification;
+import org.scijava.ops.hint.DefaultHints;
 import org.scijava.ops.matcher.OpCandidate.StatusCode;
 import org.scijava.ops.simplify.InfoSimplificationGenerator;
 import org.scijava.service.AbstractService;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java
index d46dd9882..03ce14ba1 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java
@@ -8,13 +8,13 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import org.scijava.ops.Hints;
 import org.scijava.ops.OpDependencyMember;
+import org.scijava.ops.OpHints;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpUtils;
-import org.scijava.ops.hints.BaseOpHints.Adaptation;
-import org.scijava.ops.hints.Hints;
-import org.scijava.ops.hints.OpHints;
-import org.scijava.ops.hints.impl.ImmutableHints;
+import org.scijava.ops.BaseOpHints.Adaptation;
+import org.scijava.ops.hint.ImmutableHints;
 import org.scijava.param.ParameterStructs;
 import org.scijava.param.ValidityException;
 import org.scijava.struct.Struct;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java
index 7a8a4173a..6e69658fb 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java
@@ -36,11 +36,11 @@
 import java.util.List;
 
 import org.scijava.Priority;
+import org.scijava.ops.Hints;
 import org.scijava.ops.OpDependencyMember;
+import org.scijava.ops.OpHints;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpUtils;
-import org.scijava.ops.hints.Hints;
-import org.scijava.ops.hints.OpHints;
 import org.scijava.param.ParameterStructs;
 import org.scijava.param.ValidityException;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java
index f75ed601e..1b434466a 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java
@@ -37,11 +37,11 @@
 import java.util.List;
 
 import org.scijava.Priority;
+import org.scijava.ops.Hints;
 import org.scijava.ops.OpField;
+import org.scijava.ops.OpHints;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpUtils;
-import org.scijava.ops.hints.Hints;
-import org.scijava.ops.hints.OpHints;
 import org.scijava.param.ParameterStructs;
 import org.scijava.param.ValidityException;
 import org.scijava.param.ValidityProblem;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java
index 02b4a2ccd..61c28db31 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java
@@ -31,8 +31,8 @@
 
 import java.util.List;
 
+import org.scijava.ops.Hints;
 import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.hints.Hints;
 
 /**
  * Finds Ops which match an {@link OpRef}.
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java
index 35f1c392e..88180e45a 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java
@@ -43,13 +43,13 @@
 import java.util.stream.Collectors;
 
 import org.scijava.Priority;
+import org.scijava.ops.Hints;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.OpDependencyMember;
+import org.scijava.ops.OpHints;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpMethod;
 import org.scijava.ops.OpUtils;
-import org.scijava.ops.hints.Hints;
-import org.scijava.ops.hints.OpHints;
 import org.scijava.ops.util.Adapt;
 import org.scijava.param.ParameterStructs;
 import org.scijava.param.ValidityException;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpWrappers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpWrappers.java
index 8b7e5ea82..865bfbfbd 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpWrappers.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpWrappers.java
@@ -15,9 +15,9 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
+import org.scijava.ops.BaseOpHints.DependencyMatching;
+import org.scijava.ops.Hints;
 import org.scijava.ops.OpInfo;
-import org.scijava.ops.hints.BaseOpHints.DependencyMatching;
-import org.scijava.ops.hints.Hints;
 import org.scijava.ops.provenance.OpExecutionSummary;
 import org.scijava.ops.provenance.OpHistory;
 import org.scijava.ops.util.OpWrapper;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Identity.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Identity.java
index 81e2b3d7f..6aaa382a2 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Identity.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Identity.java
@@ -3,9 +3,9 @@
 
 import java.util.function.Function;
 
-import org.scijava.ops.hints.BaseOpHints.Simplification;
 import org.scijava.ops.Op;
-import org.scijava.ops.hints.OpHints;
+import org.scijava.ops.OpHints;
+import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.plugin.Plugin;
 
 @OpHints(hints = { Simplification.FORBIDDEN })
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/InfoSimplificationGenerator.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/InfoSimplificationGenerator.java
index 2d22f1e24..a26fbbe0a 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/InfoSimplificationGenerator.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/InfoSimplificationGenerator.java
@@ -9,10 +9,10 @@
 import java.util.Map;
 import java.util.Optional;
 
+import org.scijava.ops.Hints;
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpUtils;
-import org.scijava.ops.hints.Hints;
 import org.scijava.ops.matcher.OpMatchingException;
 import org.scijava.ops.matcher.OpRef;
 import org.scijava.types.Types;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveArraySimplifiers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveArraySimplifiers.java
index a10fcc1ff..b2b470174 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveArraySimplifiers.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveArraySimplifiers.java
@@ -5,8 +5,8 @@
 
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.hints.BaseOpHints.Simplification;
-import org.scijava.ops.hints.OpHints;
+import org.scijava.ops.OpHints;
+import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.plugin.Plugin;
 import org.scijava.util.ObjectArray;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveSimplifiers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveSimplifiers.java
index 8b7e01bf0..b2c825e57 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveSimplifiers.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveSimplifiers.java
@@ -5,8 +5,8 @@
 
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.hints.BaseOpHints.Simplification;
-import org.scijava.ops.hints.OpHints;
+import org.scijava.ops.OpHints;
+import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java
index 82f99ae1e..1a3bf6862 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java
@@ -9,16 +9,16 @@
 import java.util.stream.Collectors;
 
 import org.scijava.Priority;
+import org.scijava.ops.Hints;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpEnvironment;
+import org.scijava.ops.OpHints;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpUtils;
+import org.scijava.ops.BaseOpHints.Adaptation;
+import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.ops.conversionLoss.LossReporter;
-import org.scijava.ops.hints.BaseOpHints.Adaptation;
-import org.scijava.ops.hints.BaseOpHints.Simplification;
-import org.scijava.ops.hints.Hints;
-import org.scijava.ops.hints.OpHints;
-import org.scijava.ops.hints.impl.ImmutableHints;
+import org.scijava.ops.hint.ImmutableHints;
 import org.scijava.ops.matcher.OpMatchingException;
 import org.scijava.param.ParameterStructs;
 import org.scijava.param.ValidityException;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpRef.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpRef.java
index fcb1a8c82..78c16bdc0 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpRef.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpRef.java
@@ -5,18 +5,15 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.OpInfo;
-import org.scijava.ops.hints.Hints;
-import org.scijava.ops.hints.impl.DefaultHints;
-import org.scijava.ops.hints.BaseOpHints.Adaptation;
-import org.scijava.ops.hints.BaseOpHints.Simplification;
-import org.scijava.ops.hints.Hints;
-import org.scijava.ops.matcher.OpMatchingException;
 import org.scijava.function.Computers;
 import org.scijava.function.Computers.Arity1;
+import org.scijava.ops.BaseOpHints.Adaptation;
+import org.scijava.ops.BaseOpHints.Simplification;
+import org.scijava.ops.Hints;
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.OpInfo;
+import org.scijava.ops.hint.DefaultHints;
+import org.scijava.ops.matcher.OpMatchingException;
 import org.scijava.ops.matcher.OpRef;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/ComputerUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/ComputerUtils.java
index 0f65080b2..2f64c817a 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/ComputerUtils.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/ComputerUtils.java
@@ -15,7 +15,7 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.hints.Hints;
+import org.scijava.ops.Hints;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/FunctionUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/FunctionUtils.java
index ca6b34954..60eaed736 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/FunctionUtils.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/FunctionUtils.java
@@ -17,7 +17,7 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Producer;
 import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.hints.Hints;
+import org.scijava.ops.Hints;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java
index 329ece2af..40dc9b1ee 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java
@@ -17,7 +17,7 @@
 import org.scijava.function.Inplaces;
 import org.scijava.function.Mutable;
 import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.hints.Hints;
+import org.scijava.ops.Hints;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpWrapper.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpWrapper.java
index f42138593..810f941b0 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpWrapper.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpWrapper.java
@@ -4,8 +4,8 @@
 import java.lang.reflect.Type;
 import java.util.UUID;
 
+import org.scijava.ops.Hints;
 import org.scijava.ops.OpInfo;
-import org.scijava.ops.hints.Hints;
 import org.scijava.ops.provenance.OpHistory;
 import org.scijava.plugin.SciJavaPlugin;
 import org.scijava.types.Types;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderNoOutputTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderNoOutputTest.java
similarity index 91%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderNoOutputTest.java
rename to scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderNoOutputTest.java
index dcac1b7f0..d642ba3d6 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderNoOutputTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderNoOutputTest.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops.core.builder;
+package org.scijava.ops;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -7,7 +7,6 @@
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.OpBuilder;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java
index 8fd968092..313bd23f7 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java
@@ -44,7 +44,6 @@
 import org.scijava.function.Producer;
 import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 import org.scijava.types.Nil;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
index 9a9907031..d67e346fe 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
@@ -39,7 +39,6 @@
 import org.scijava.function.Producer;
 import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 @Plugin(type = OpCollection.class)
 public class OpMethodTestOps {
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/AdaptationHintTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/AdaptationHintTest.java
index fdb3549ec..a7c4d7955 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/AdaptationHintTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/AdaptationHintTest.java
@@ -6,11 +6,13 @@
 
 import org.junit.Test;
 import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.Hints;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
+import org.scijava.ops.OpHints;
+import org.scijava.ops.BaseOpHints.Adaptation;
+import org.scijava.ops.hint.DefaultHints;
 import org.scijava.function.Computers;
-import org.scijava.ops.hints.BaseOpHints.Adaptation;
-import org.scijava.ops.hints.impl.DefaultHints;
 import org.scijava.ops.matcher.OpMatchingException;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/SimplificationHintTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/SimplificationHintTest.java
index 6b88523b0..618d6d3dd 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/SimplificationHintTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/SimplificationHintTest.java
@@ -7,11 +7,13 @@
 
 import org.junit.Test;
 import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.Hints;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.hints.BaseOpHints.Adaptation;
-import org.scijava.ops.hints.BaseOpHints.Simplification;
-import org.scijava.ops.hints.impl.DefaultHints;
+import org.scijava.ops.OpHints;
+import org.scijava.ops.BaseOpHints.Adaptation;
+import org.scijava.ops.BaseOpHints.Simplification;
+import org.scijava.ops.hint.DefaultHints;
 import org.scijava.ops.matcher.OpMatchingException;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java
index 9b41fc2fa..6fb17de2f 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java
@@ -13,13 +13,13 @@
 import org.scijava.Priority;
 import org.scijava.function.Producer;
 import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.Hints;
+import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.OpField;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpMethod;
-import org.scijava.ops.OpCollection;
-import org.scijava.ops.hints.Hints;
-import org.scijava.ops.hints.impl.DefaultHints;
+import org.scijava.ops.hint.DefaultHints;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationPriorityTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationPriorityTest.java
index 159198392..44824d677 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationPriorityTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationPriorityTest.java
@@ -10,9 +10,9 @@
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
+import org.scijava.ops.OpHints;
+import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.ops.conversionLoss.LossReporter;
-import org.scijava.ops.hints.BaseOpHints.Simplification;
-import org.scijava.ops.hints.OpHints;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.vm
index 289c11fc8..364961f5e 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.vm
@@ -43,7 +43,7 @@ import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
 import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.hints.Hints;
+import org.scijava.ops.Hints;
 import org.scijava.ops.util.ComputerUtils;
 import org.scijava.ops.util.FunctionUtils;
 import org.scijava.ops.util.InplaceUtils;
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/OpWrappers.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/OpWrappers.vm
index 10efa2822..07e5ee540 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/OpWrappers.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/OpWrappers.vm
@@ -15,11 +15,11 @@ import org.scijava.function.Container;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
+import org.scijava.ops.BaseOpHints.DependencyMatching;
+import org.scijava.ops.Hints;
 import org.scijava.ops.OpInfo;
-import org.scijava.ops.hints.BaseOpHints.DependencyMatching;
-import org.scijava.ops.hints.Hints;
 import org.scijava.ops.provenance.OpExecutionSummary;
-import org.scijava.ops.provenance.OpHistoryService;
+import org.scijava.ops.provenance.OpHistory;
 import org.scijava.ops.util.OpWrapper;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.GenericTyped;
@@ -32,7 +32,7 @@ public class OpWrappers {
 	public static class ProducerOpWrapper<T> implements OpWrapper<Producer<T>> {
 
 		@Override
-		public Producer<T> wrap(final Producer<T> op, final OpInfo info, final Hints hints, final OpHistoryService history, final UUID executionID, final Type reifiedType) {
+		public Producer<T> wrap(final Producer<T> op, final OpInfo info, final Hints hints, final OpHistory history, final UUID executionID, final Type reifiedType) {
 			class GenericTypedProducer implements Producer<T>, GenericTyped {
 
 				@Override
@@ -73,7 +73,7 @@ public class OpWrappers {
 			final $fg op, //
 			final OpInfo info, //
 			final Hints hints, //
-			final OpHistoryService history, //
+			final OpHistory history, //
 			final UUID executionID, //
 			final Type reifiedType)
 		{
@@ -121,7 +121,7 @@ public class OpWrappers {
 			final $cg op, //
 			final OpInfo info, //
 			final Hints hints, //
-			final OpHistoryService history, //
+			final OpHistory history, //
 			final UUID executionID, //
 			final Type reifiedType)
 		{
@@ -169,7 +169,7 @@ public class OpWrappers {
 			final $ig op, //
 			final OpInfo info, //
 			final Hints hints, //
-			final OpHistoryService history, //
+			final OpHistory history, //
 			final UUID executionID, //
 			final Type reifiedType)
 		{
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.vm
index cc07a76ad..d01e5ef63 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.vm
@@ -15,7 +15,7 @@ import java.util.function.Consumer;
 
 import org.scijava.function.Computers;
 import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.hints.Hints;
+import org.scijava.ops.Hints;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
 
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.vm
index af0e19b48..fb28b968e 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.vm
@@ -17,7 +17,7 @@ import java.util.function.Function;
 import org.scijava.function.Functions;
 import org.scijava.function.Producer;
 import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.hints.Hints;
+import org.scijava.ops.Hints;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
 
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.vm
index c6dfd4bd5..7bacb1459 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.vm
@@ -17,7 +17,7 @@ import java.util.stream.Collectors;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Mutable;
 import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.hints.Hints;
+import org.scijava.ops.Hints;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
 

From 0ca0882e82cd7d3c3e3f93a840cdfdd491da0e2c Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Tue, 29 Jun 2021 09:51:14 -0500
Subject: [PATCH 47/91] Extract OpService interface

---
 .../src/main/java/org/scijava/ops/OpInfo.java |  5 --
 .../main/java/org/scijava/ops/OpService.java  | 26 ++-----
 .../scijava/ops/impl/DefaultOpService.java    | 78 +++++++++++++++++++
 .../scijava/ops/matcher/OpAdaptationInfo.java |  9 ---
 .../org/scijava/ops/matcher/OpClassInfo.java  |  6 ++
 .../org/scijava/ops/matcher/OpFieldInfo.java  |  8 ++
 .../org/scijava/ops/matcher/OpMethodInfo.java |  7 ++
 .../ops/simplify/SimplifiedOpInfo.java        |  9 ---
 8 files changed, 104 insertions(+), 44 deletions(-)
 create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpService.java

diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java
index 0f99368a2..2dfe28db6 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java
@@ -34,11 +34,6 @@ public interface OpInfo extends Comparable<OpInfo> {
 	/** Gets the hints declared in the {@link OpHints} annotation */
 	Hints declaredHints();
 
-	default Hints formHints(OpHints h) {
-		if (h == null) return new ImmutableHints(new String[0]);
-		return new ImmutableHints(h.hints());
-	}
-
 	/** Gets the op's input parameters. */
 	default List<Member<?>> inputs() {
 		return OpUtils.inputs(struct());
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpService.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpService.java
index cd597bd8d..8b059552a 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpService.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpService.java
@@ -26,24 +26,19 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
+
 package org.scijava.ops;
 
-import org.scijava.ops.impl.DefaultOpEnvironment;
-import org.scijava.plugin.Plugin;
-import org.scijava.service.AbstractService;
 import org.scijava.service.SciJavaService;
-import org.scijava.service.Service;
 
 /**
  * Service to provide a list of available ops structured in a prefix tree and to
  * search for ops matching specified types.
  *
+ * @author Gabriel Selzer
  * @author David Kolb
  */
-@Plugin(type = Service.class)
-public class OpService extends AbstractService implements SciJavaService {
-
-	private OpEnvironment env;
+public interface OpService extends SciJavaService {
 
 	/**
 	 * Begins declaration of an op matching request for locating an op with a
@@ -55,20 +50,9 @@ public class OpService extends AbstractService implements SciJavaService {
 	 * @return An {@link OpBuilder} for refining the search criteria for an op.
 	 * @see OpBuilder
 	 */
-	public OpBuilder op(final String opName) {
-		return env().op(opName);
-	}
+	public OpBuilder op(final String opName);
 
 	/** Retrieves the motherlode of available ops. */
-	public OpEnvironment env() {
-		if (env == null) initEnv();
-		return env;
-	}
-
-	// -- Helper methods - lazy initialization --
+	public OpEnvironment env();
 
-	private synchronized void initEnv() {
-		if (env != null) return;
-		env = new DefaultOpEnvironment(context());
-	}
 }
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpService.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpService.java
new file mode 100644
index 000000000..20ff30013
--- /dev/null
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpService.java
@@ -0,0 +1,78 @@
+/*
+ * #%L
+ * SciJava Operations: a framework for reusable algorithms.
+ * %%
+ * Copyright (C) 2018 SciJava developers.
+ * %%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.ops.impl;
+
+import org.scijava.ops.OpBuilder;
+import org.scijava.ops.OpEnvironment;
+import org.scijava.ops.OpService;
+import org.scijava.plugin.Plugin;
+import org.scijava.service.AbstractService;
+import org.scijava.service.Service;
+
+/**
+ * Service to provide a list of available ops structured in a prefix tree and to
+ * search for ops matching specified types.
+ *
+ * @author David Kolb
+ */
+@Plugin(type = Service.class)
+public class DefaultOpService extends AbstractService implements OpService {
+
+	private OpEnvironment env;
+
+	/**
+	 * Begins declaration of an op matching request for locating an op with a
+	 * particular name. Additional criteria are specified as chained method calls
+	 * on the returned {@link OpBuilder} object. See {@link OpBuilder} for
+	 * examples.
+	 * 
+	 * @param opName The name of the op to be matched.
+	 * @return An {@link OpBuilder} for refining the search criteria for an op.
+	 * @see OpBuilder
+	 */
+	@Override
+	public OpBuilder op(final String opName) {
+		return env().op(opName);
+	}
+
+	/** Retrieves the motherlode of available ops. */
+	@Override
+	public OpEnvironment env() {
+		if (env == null) initEnv();
+		return env;
+	}
+
+	// -- Helper methods - lazy initialization --
+
+	private synchronized void initEnv() {
+		if (env != null) return;
+		env = new DefaultOpEnvironment(context());
+	}
+}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java
index 03ce14ba1..47e6158b9 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java
@@ -56,15 +56,6 @@ public OpAdaptationInfo(OpInfo srcInfo, Type type, Function<Object, Object> adap
 		this.hints = new ImmutableHints(hintList.toArray(String[]::new));
 	}
 
-	@Override
-	public Hints formHints(OpHints h) {
-		// NB we don't use Arrays.toList() here because we cannot add to that list!
-		List<String> hintList = Arrays.stream(h.hints()).collect(Collectors.toList());
-		hintList.remove(Adaptation.ALLOWED);
-		hintList.add(Adaptation.FORBIDDEN);
-		return new ImmutableHints(hintList.toArray(String[]::new));
-	}
-
 	@Override
 	public List<OpDependencyMember<?>> dependencies() {
 		return srcInfo.dependencies();
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java
index 6e69658fb..b1cd7c8d2 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java
@@ -41,6 +41,7 @@
 import org.scijava.ops.OpHints;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpUtils;
+import org.scijava.ops.hint.ImmutableHints;
 import org.scijava.param.ParameterStructs;
 import org.scijava.param.ValidityException;
 import org.scijava.plugin.Plugin;
@@ -190,4 +191,9 @@ private static double priorityFromAnnotation(Class<?> annotationBearer) {
 		return opAnnotation == null ? Priority.NORMAL : opAnnotation.priority();
 	}
 
+	private Hints formHints(OpHints h) {
+		if (h == null) return new ImmutableHints(new String[0]);
+		return new ImmutableHints(h.hints());
+	}
+
 }
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java
index 1b434466a..2e4e0f19d 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java
@@ -42,6 +42,7 @@
 import org.scijava.ops.OpHints;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpUtils;
+import org.scijava.ops.hint.ImmutableHints;
 import org.scijava.param.ParameterStructs;
 import org.scijava.param.ValidityException;
 import org.scijava.param.ValidityProblem;
@@ -186,4 +187,11 @@ public String toString() {
 		return OpUtils.opString(this);
 	}
 
+	// -- Helper methods -- //
+
+	private Hints formHints(OpHints h) {
+		if (h == null) return new ImmutableHints(new String[0]);
+		return new ImmutableHints(h.hints());
+	}
+
 }
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java
index 88180e45a..c10b784cc 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java
@@ -50,6 +50,7 @@
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpMethod;
 import org.scijava.ops.OpUtils;
+import org.scijava.ops.hint.ImmutableHints;
 import org.scijava.ops.util.Adapt;
 import org.scijava.param.ParameterStructs;
 import org.scijava.param.ValidityException;
@@ -359,4 +360,10 @@ public AnnotatedElement getAnnotationBearer() {
 		return method;
 	}
 
+	// -- Helper methods -- //
+
+	private Hints formHints(OpHints h) {
+		if (h == null) return new ImmutableHints(new String[0]);
+		return new ImmutableHints(h.hints());
+	}
 }
\ No newline at end of file
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java
index 1a3bf6862..e5e5e5f7b 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java
@@ -61,15 +61,6 @@ public SimplifiedOpInfo(OpInfo info, OpEnvironment env, SimplificationMetadata m
 		this.hints = new ImmutableHints(hintList.toArray(String[]::new));
 	}
 
-	@Override
-	public Hints formHints(OpHints h) {
-		// NB we don't use Arrays.toList() here because we cannot add to that list!
-		List<String> hintList = Arrays.stream(h.hints()).collect(Collectors.toList());
-		hintList.remove(Adaptation.ALLOWED);
-		hintList.add(Adaptation.FORBIDDEN);
-		return new ImmutableHints(hintList.toArray(String[]::new));
-	}
-
 	public OpInfo srcInfo() {
 		return srcInfo;
 	}

From 3b99ab499b3b42cb1dbab9579a666329a63b4bb6 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Tue, 29 Jun 2021 11:36:00 -0500
Subject: [PATCH 48/91] Extract OpRef interface

This commit also makes some changes to SimplifiedOpRef that make it more
correct. I chose to throw UnsupportedOperationException for many of
the standard OpRef methods because the concrete type that the
SimplifiedOpRef is asking for is rather indeterminate - it is really
asking for an Op that is of a set of Types, so to pin a particualar set
of arguments, a particular output type, etc. is not possible until you
have a SimplifiedOpInfo to narrow down these Types. Similarly, we throw
an UnsupportedOperationException for typesMatch because the typing of
the SimplifiedOpRef is unclear. We could match against all possible
permutations of the input/output types, but we don't really have enough
information about how to form the opType. We could probably find a way
to devise all opType permutations, but this would be a pretty
computationally expensive method to run, so for now we'll just throw an
error
---
 .../java/org/scijava/ops/OpEnvironment.java   |   1 -
 .../src/main/java/org/scijava/ops/OpInfo.java |   2 -
 .../src/main/java/org/scijava/ops/OpRef.java  | 140 ++++++++++++++++++
 .../main/java/org/scijava/ops/OpUtils.java    |   1 -
 .../ops/impl/DefaultOpEnvironment.java        |  15 +-
 .../scijava/ops/impl/MatchingConditions.java  |   2 +-
 .../scijava/ops/matcher/DefaultOpMatcher.java |   1 +
 .../matcher/{OpRef.java => DefaultOpRef.java} | 100 ++++---------
 .../matcher/DependencyMatchingException.java  |   2 +
 .../scijava/ops/matcher/MatchingResult.java   |   1 +
 .../org/scijava/ops/matcher/OpCandidate.java  |   1 +
 .../org/scijava/ops/matcher/OpMatcher.java    |   1 +
 .../ops/matcher/OpMatchingException.java      |   2 +
 .../simplify/InfoSimplificationGenerator.java |   4 +-
 .../ops/simplify/SimplificationUtils.java     |   2 +-
 .../scijava/ops/simplify/SimplifiedOpRef.java |  86 +++++++++--
 .../scijava/ops/{ => impl}/OpCachingTest.java |  12 +-
 17 files changed, 273 insertions(+), 100 deletions(-)
 create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/OpRef.java
 rename scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/{OpRef.java => DefaultOpRef.java} (64%)
 rename scijava/scijava-ops/src/test/java/org/scijava/ops/{ => impl}/OpCachingTest.java (92%)

diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java
index 55c10e687..ae5929c03 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java
@@ -31,7 +31,6 @@
 
 import java.lang.reflect.Type;
 
-import org.scijava.ops.matcher.OpRef;
 import org.scijava.types.Nil;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java
index 2dfe28db6..3f5a6c508 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java
@@ -8,9 +8,7 @@
 import java.util.Map;
 
 import org.scijava.log.Logger;
-import org.scijava.ops.hint.ImmutableHints;
 import org.scijava.ops.matcher.OpCandidate;
-import org.scijava.ops.matcher.OpRef;
 import org.scijava.param.ValidityException;
 import org.scijava.struct.Member;
 import org.scijava.struct.Struct;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpRef.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpRef.java
new file mode 100644
index 000000000..93c149e1d
--- /dev/null
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpRef.java
@@ -0,0 +1,140 @@
+/*
+ * #%L
+ * ImageJ software for multidimensional image processing and analysis.
+ * %%
+ * Copyright (C) 2014 - 2018 ImageJ developers.
+ * %%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.ops;
+
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Objects;
+
+import org.scijava.ops.matcher.OpMatcher;
+import org.scijava.types.Types;
+
+/**
+ * Data structure which identifies an op by name and/or type(s) and/or argument
+ * type(s), along with a list of input arguments.
+ * <p>
+ * With the help of the {@link OpMatcher}, an {@code OpRef} holds all
+ * information needed to create an appropriate {@link Op}.
+ * </p>
+ *
+ * @author Christian Dietz (University of Konstanz)
+ * @author Curtis Rueden
+ */
+public interface OpRef {
+
+	// -- OpRef methods --
+
+	/** Gets the name of the op. */
+	public String getName();
+
+	/** Gets the type which the op must match. */
+	public Type getType();
+
+	/**
+	 * Gets the op's output type constraint, or null for no constraint.
+	 */
+	public Type getOutType();
+
+	/** Gets the op's arguments. */
+	public Type[] getArgs();
+
+	/**
+	 * Gets a label identifying the op's scope (i.e., its name and/or types).
+	 */
+	public String getLabel();
+
+	public boolean typesMatch(final Type opType);
+
+	/**
+	 * Determines whether the specified type satisfies the op's required types
+	 * using {@link Types#isApplicable(Type[], Type[])}.
+	 */
+	public boolean typesMatch(final Type opType, final Map<TypeVariable<?>, Type> typeVarAssigns);
+
+	// -- Object methods --
+
+	default String refString() {
+		String n = getName() == null ? "" : "Name: \"" + getName() + "\", Types: ";
+		n += getType() + "\n";
+		n += "Input Types: \n";
+		for (Type arg : getArgs()) {
+			n += "\t\t* ";
+			n += arg == null ? "" : arg.getTypeName();
+			n += "\n";
+		}
+		n += "Output Type: \n";
+		n += "\t\t* ";
+		n += getOutType() == null ? "" : getOutType().getTypeName();
+		n += "\n";
+		return n.substring(0, n.length() - 1);
+	}
+
+	default boolean refEquals(final Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		final OpRef other = (OpRef) obj;
+		if (!Objects.equals(getName(), other.getName()))
+			return false;
+		if (!Objects.equals(getType(), other.getType()))
+			return false;
+		if (!Objects.equals(getOutType(), other.getOutType()))
+			return false;
+		if (!Arrays.equals(getArgs(), other.getArgs()))
+			return false;
+		return true;
+	}
+
+	default int refHashCode() {
+		return Arrays.deepHashCode(new Object[] {getName(), getType(), getOutType(), getArgs()});
+	}
+
+	// -- Utility methods --
+
+	public static Type[] filterNulls(final Type... types) {
+		Type[] ts = Arrays.stream(types).filter(t -> t != null).toArray(Type[]::new);
+		return ts == null ? null : ts;
+	}
+
+	// -- Helper methods --
+
+	static void append(final StringBuilder sb, final String s) {
+		if (s == null)
+			return;
+		if (sb.length() > 0)
+			sb.append("/");
+		sb.append(s);
+	}
+}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
index 42b4ea12d..7a73e86a8 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
@@ -40,7 +40,6 @@
 import org.scijava.ops.matcher.OpCandidate;
 import org.scijava.ops.matcher.OpCandidate.StatusCode;
 import org.scijava.ops.matcher.OpMatcher;
-import org.scijava.ops.matcher.OpRef;
 import org.scijava.param.ParameterMember;
 import org.scijava.param.ParameterStructs;
 import org.scijava.param.ValidityException;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
index c950a2bde..d6677132f 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
@@ -66,11 +66,13 @@
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpInstance;
 import org.scijava.ops.OpMethod;
+import org.scijava.ops.OpRef;
 import org.scijava.ops.OpUtils;
 import org.scijava.ops.hint.AdaptationHints;
 import org.scijava.ops.hint.DefaultHints;
 import org.scijava.ops.hint.SimplificationHints;
 import org.scijava.ops.matcher.DefaultOpMatcher;
+import org.scijava.ops.matcher.DefaultOpRef;
 import org.scijava.ops.matcher.DependencyMatchingException;
 import org.scijava.ops.matcher.MatchingUtils;
 import org.scijava.ops.matcher.OpAdaptationInfo;
@@ -81,7 +83,6 @@
 import org.scijava.ops.matcher.OpMatcher;
 import org.scijava.ops.matcher.OpMatchingException;
 import org.scijava.ops.matcher.OpMethodInfo;
-import org.scijava.ops.matcher.OpRef;
 import org.scijava.ops.provenance.OpHistoryService;
 import org.scijava.ops.simplify.SimplifiedOpInfo;
 import org.scijava.ops.util.OpWrapper;
@@ -198,7 +199,11 @@ public <T> T op(final String opName, final Nil<T> specialType,
 	
 	@Override
 	public <T> T op(final OpInfo info, final Nil<T> specialType, final Nil<?>[] inTypes, final Nil<?> outType) {
-		return op(info, specialType, inTypes, outType, getHints());
+		try {
+			return findOp(info, specialType, inTypes, outType, getHints());
+		} catch (OpMatchingException e) {
+			throw new IllegalArgumentException(e);
+		}
 	}
 
 	@Override
@@ -249,7 +254,7 @@ public void register(final OpInfo info, final String name) {
 	@SuppressWarnings("unchecked")
 	private <T> T findOp(final String opName, final Nil<T> specialType, final Nil<?>[] inTypes,
 			final Nil<?> outType, Hints hints) throws OpMatchingException {
-		final OpRef ref = OpRef.fromTypes(opName, specialType.getType(), outType != null ? outType.getType() : null,
+		final OpRef ref = DefaultOpRef.fromTypes(opName, specialType.getType(), outType != null ? outType.getType() : null,
 				toTypes(inTypes));
 		MatchingConditions conditions = MatchingConditions.from(ref, hints, true);
 		generateOpInstance(conditions);
@@ -260,7 +265,7 @@ private <T> T findOp(final String opName, final Nil<T> specialType, final Nil<?>
 	private <T> T findOp(final OpInfo info, final Nil<T> specialType, final Nil<?>[] inTypes,
 		final Nil<?> outType, Hints hints) throws OpMatchingException
 	{
-		OpRef ref = OpRef.fromTypes(specialType.getType(), outType.getType(),
+		OpRef ref = DefaultOpRef.fromTypes(specialType.getType(), outType.getType(),
 			toTypes(inTypes));
 		MatchingConditions conditions = MatchingConditions.from(ref, hints, true);
 		generateOpInstance(conditions, info);
@@ -717,7 +722,7 @@ private OpRef inferOpRef(Type type, String name, Map<TypeVariable<?>, Type> type
 			error += ". This is not supported.";
 			throw new OpMatchingException(error);
 		}
-		return new OpRef(name, type, mappedOutputs[0], mappedInputs);
+		return new DefaultOpRef(name, type, mappedOutputs[0], mappedInputs);
 	}
 
 	private void initOpDirectory() {
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/MatchingConditions.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/MatchingConditions.java
index b25ec8605..77c96d147 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/MatchingConditions.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/MatchingConditions.java
@@ -4,7 +4,7 @@
 import java.util.Objects;
 
 import org.scijava.ops.Hints;
-import org.scijava.ops.matcher.OpRef;
+import org.scijava.ops.OpRef;
 
 public class MatchingConditions {
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java
index 3b8d8d6a6..5e5d03fcf 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java
@@ -47,6 +47,7 @@
 import org.scijava.ops.Hints;
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.OpInfo;
+import org.scijava.ops.OpRef;
 import org.scijava.ops.OpUtils;
 import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.ops.hint.DefaultHints;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpRef.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpRef.java
similarity index 64%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpRef.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpRef.java
index 9d506b080..c101472e6 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpRef.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpRef.java
@@ -32,15 +32,11 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 
-import org.scijava.log.Logger;
 import org.scijava.ops.Op;
-import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.OpInfo;
+import org.scijava.ops.OpRef;
 import org.scijava.types.Types;
 
 /**
@@ -54,7 +50,7 @@
  * @author Christian Dietz (University of Konstanz)
  * @author Curtis Rueden
  */
-public class OpRef {
+public class DefaultOpRef implements OpRef {
 
 	/** Name of the op, or null for any name. */
 	private final String name;
@@ -70,12 +66,16 @@ public class OpRef {
 
 	// -- Static construction methods --
 
-	public static OpRef fromTypes(final Type type, final Type outType, final Type... args) {
-		return new OpRef(null, type, outType, filterNulls(args));
+	public static DefaultOpRef fromTypes(final Type type, final Type outType,
+		final Type... args)
+	{
+		return new DefaultOpRef(null, type, outType, OpRef.filterNulls(args));
 	}
 
-	public static OpRef fromTypes(final String name, final Type type, final Type outType, final Type... args) {
-		return new OpRef(name, type, outType, filterNulls(args));
+	public static DefaultOpRef fromTypes(final String name, final Type type,
+		final Type outType, final Type... args)
+	{
+		return new DefaultOpRef(name, type, outType, OpRef.filterNulls(args));
 	}
 
 	// -- Constructor --
@@ -83,16 +83,14 @@ public static OpRef fromTypes(final String name, final Type type, final Type out
 	/**
 	 * Creates a new op reference.
 	 *
-	 * @param name
-	 *            name of the op, or null for any name.
-	 * @param type
-	 *            type which the ops must match.
-	 * @param outType
-	 *            the op's required output type.
-	 * @param args
-	 *            arguments to the op.
+	 * @param name name of the op, or null for any name.
+	 * @param type type which the ops must match.
+	 * @param outType the op's required output type.
+	 * @param args arguments to the op.
 	 */
-	public OpRef(final String name, final Type type, final Type outType, final Type[] args) {
+	public DefaultOpRef(final String name, final Type type, final Type outType,
+		final Type[] args)
+	{
 		this.name = name;
 		this.type = type;
 		this.outType = outType;
@@ -102,11 +100,13 @@ public OpRef(final String name, final Type type, final Type outType, final Type[
 	// -- OpRef methods --
 
 	/** Gets the name of the op. */
+	@Override
 	public String getName() {
 		return name;
 	}
 
 	/** Gets the type which the op must match. */
+	@Override
 	public Type getType() {
 		return type;
 	}
@@ -114,11 +114,13 @@ public Type getType() {
 	/**
 	 * Gets the op's output type constraint, or null for no constraint.
 	 */
+	@Override
 	public Type getOutType() {
 		return outType;
 	}
 
 	/** Gets the op's arguments. */
+	@Override
 	public Type[] getArgs() {
 		return args.clone();
 	}
@@ -126,15 +128,17 @@ public Type[] getArgs() {
 	/**
 	 * Gets a label identifying the op's scope (i.e., its name and/or types).
 	 */
+	@Override
 	public String getLabel() {
 		final StringBuilder sb = new StringBuilder();
-		append(sb, name);
+		OpRef.append(sb, name);
 		if (type != null) {
-			append(sb, Types.name(type));
+			OpRef.append(sb, Types.name(type));
 		}
 		return sb.toString();
 	}
 
+	@Override
 	public boolean typesMatch(final Type opType) {
 		return typesMatch(opType, new HashMap<>());
 	}
@@ -143,7 +147,10 @@ public boolean typesMatch(final Type opType) {
 	 * Determines whether the specified type satisfies the op's required types
 	 * using {@link Types#isApplicable(Type[], Type[])}.
 	 */
-	public boolean typesMatch(final Type opType, final Map<TypeVariable<?>, Type> typeVarAssigns) {
+	@Override
+	public boolean typesMatch(final Type opType,
+		final Map<TypeVariable<?>, Type> typeVarAssigns)
+	{
 		if (type == null) return true;
 		if (type instanceof ParameterizedType) {
 			if (!MatchingUtils.checkGenericAssignability(opType,
@@ -164,60 +171,17 @@ public boolean typesMatch(final Type opType, final Map<TypeVariable<?>, Type> ty
 
 	@Override
 	public String toString() {
-		String n = name == null ? "" : "Name: \"" + name + "\", Types: ";
-		n += type + "\n";
-		n += "Input Types: \n";
-		for (Type arg : args) {
-			n += "\t\t* ";
-			n += arg == null ? "" : arg.getTypeName();
-			n += "\n";
-		}
-		n += "Output Type: \n";
-		n += "\t\t* ";
-		n += outType == null ? "" : outType.getTypeName();
-		n += "\n";
-		return n.substring(0, n.length() - 1);
+		return refString();
 	}
 
 	@Override
 	public boolean equals(final Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		final OpRef other = (OpRef) obj;
-		if (!Objects.equals(name, other.name))
-			return false;
-		if (!Objects.equals(type, other.type))
-			return false;
-		if (!Objects.equals(outType, other.outType))
-			return false;
-		if (!Arrays.equals(args, other.args))
-			return false;
-		return true;
+		return refEquals(obj);
 	}
 
 	@Override
 	public int hashCode() {
-		return Arrays.deepHashCode(new Object[] {name, type, outType, args});
+		return refHashCode();
 	}
 
-	// -- Utility methods --
-
-	public static Type[] filterNulls(final Type... types) {
-		Type[] ts = Arrays.stream(types).filter(t -> t != null).toArray(Type[]::new);
-		return ts == null ? null : ts;
-	}
-
-	// -- Helper methods --
-
-	private void append(final StringBuilder sb, final String s) {
-		if (s == null)
-			return;
-		if (sb.length() > 0)
-			sb.append("/");
-		sb.append(s);
-	}
 }
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DependencyMatchingException.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DependencyMatchingException.java
index c76d9458b..7ce7561cb 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DependencyMatchingException.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DependencyMatchingException.java
@@ -1,6 +1,8 @@
 
 package org.scijava.ops.matcher;
 
+import org.scijava.ops.OpRef;
+
 /**
  * An {@link OpMatchingException} caused by another {@code OpMatchingException}
  * thrown when resolving dependencies. We illustrate the need for
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingResult.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingResult.java
index 9bd856f94..e55b1f185 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingResult.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingResult.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.scijava.ops.OpRef;
 import org.scijava.ops.OpUtils;
 import org.scijava.ops.simplify.SimplifiedOpInfo;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpCandidate.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpCandidate.java
index c3d3f1672..83eccd7b3 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpCandidate.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpCandidate.java
@@ -37,6 +37,7 @@
 import org.scijava.log.Logger;
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.OpInfo;
+import org.scijava.ops.OpRef;
 import org.scijava.ops.OpUtils;
 import org.scijava.param.ValidityProblem;
 import org.scijava.struct.Member;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java
index 61c28db31..a91a00456 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java
@@ -33,6 +33,7 @@
 
 import org.scijava.ops.Hints;
 import org.scijava.ops.OpEnvironment;
+import org.scijava.ops.OpRef;
 
 /**
  * Finds Ops which match an {@link OpRef}.
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatchingException.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatchingException.java
index 9788ae674..d2977dd02 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatchingException.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatchingException.java
@@ -1,5 +1,7 @@
 package org.scijava.ops.matcher;
 
+import org.scijava.ops.OpRef;
+
 /**
  * Indicates that no op matching a given {@link OpRef} could be found.
  * 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/InfoSimplificationGenerator.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/InfoSimplificationGenerator.java
index a26fbbe0a..1bdb75547 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/InfoSimplificationGenerator.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/InfoSimplificationGenerator.java
@@ -12,9 +12,9 @@
 import org.scijava.ops.Hints;
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.OpInfo;
+import org.scijava.ops.OpRef;
 import org.scijava.ops.OpUtils;
 import org.scijava.ops.matcher.OpMatchingException;
-import org.scijava.ops.matcher.OpRef;
 import org.scijava.types.Types;
 
 
@@ -54,7 +54,7 @@ public OpInfo generateSuitableInfo(OpEnvironment env, OpRef originalRef, Hints h
 	}
 
 	public OpInfo generateSuitableInfo(SimplifiedOpRef ref) {
-		if(!Types.isAssignable(Types.raw(info.opType()), Types.raw(ref.getType())))
+		if(!Types.isAssignable(Types.raw(info.opType()), ref.rawType()))
 				throw new IllegalArgumentException("OpInfo and OpRef do not share an Op type");
 		TypePair[] argPairings = generatePairings(ref);
 		TypePair outPairing = generateOutPairing(ref);
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java
index a983240d1..42c1cbf00 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java
@@ -23,8 +23,8 @@
 import org.scijava.function.Mutable;
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.OpInfo;
+import org.scijava.ops.OpRef;
 import org.scijava.ops.matcher.MatchingUtils;
-import org.scijava.ops.matcher.OpRef;
 import org.scijava.ops.util.AnnotationUtils;
 import org.scijava.param.ParameterStructs;
 import org.scijava.types.Nil;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpRef.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpRef.java
index 78c16bdc0..2c5e88f98 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpRef.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpRef.java
@@ -2,7 +2,10 @@
 package org.scijava.ops.simplify;
 
 import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 import org.scijava.function.Computers;
@@ -12,41 +15,45 @@
 import org.scijava.ops.Hints;
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.OpInfo;
+import org.scijava.ops.OpRef;
 import org.scijava.ops.hint.DefaultHints;
 import org.scijava.ops.matcher.OpMatchingException;
-import org.scijava.ops.matcher.OpRef;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
 
-public class SimplifiedOpRef extends OpRef {
+public class SimplifiedOpRef implements OpRef {
+
+	/** Name of the op, or null for any name. */
+	private final String name;
+
+	/** Raw type of the request */
+	private final Class<?> rawType;
 
 	private final OpRef srcRef;
 	private final List<List<OpInfo>> simplifierSets;
 	private final List<OpInfo> outputFocusers;
 	private final Optional<Computers.Arity1<?, ?>> copyOp;
 
-	private SimplifiedOpRef(String name, Type type, Type outType,
-		Type[] args)
-	{
-		super(name, type, outType, args);
-		throw new UnsupportedOperationException("Simplified OpRef requires original OpRef!");
-	}
-
 	private SimplifiedOpRef(OpRef ref, OpEnvironment env) {
 		// TODO: this is probably incorrect
-		super(ref.getName(), ref.getType(), ref.getOutType(), ref.getArgs());
+		this.name = ref.getName();
+		this.rawType = Types.raw(ref.getType());
 		this.srcRef = ref;
 		this.simplifierSets = SimplificationUtils.simplifyArgs(env, ref.getArgs());
-		this.outputFocusers = SimplificationUtils.getFocusers(env, ref.getOutType());
+		this.outputFocusers = SimplificationUtils.getFocusers(env, ref
+			.getOutType());
 		this.copyOp = Optional.empty();
 	}
 
-	private SimplifiedOpRef(OpRef ref, OpEnvironment env, Computers.Arity1<?, ?> copyOp) {
-		// TODO: this is probably incorrect
-		super(ref.getName(), ref.getType(), ref.getOutType(), ref.getArgs());
+	private SimplifiedOpRef(OpRef ref, OpEnvironment env,
+		Computers.Arity1<?, ?> copyOp)
+	{
+		this.name = ref.getName();
+		this.rawType = Types.raw(ref.getType());
 		this.srcRef = ref;
 		this.simplifierSets = SimplificationUtils.simplifyArgs(env, ref.getArgs());
-		this.outputFocusers = SimplificationUtils.getFocusers(env, ref.getOutType());
+		this.outputFocusers = SimplificationUtils.getFocusers(env, ref
+			.getOutType());
 		this.copyOp = Optional.of(copyOp);
 	}
 
@@ -54,6 +61,10 @@ public OpRef srcRef() {
 		return srcRef;
 	}
 
+	public Class<?> rawType() {
+		return rawType;
+	}
+
 	public List<List<OpInfo>> simplifierSets() {
 		return simplifierSets;
 	}
@@ -66,7 +77,9 @@ public List<OpInfo> outputFocusers() {
 		return copyOp;
 	}
 
-	public static SimplifiedOpRef simplificationOf(OpEnvironment env, OpRef ref, Hints hints) throws OpMatchingException {
+	public static SimplifiedOpRef simplificationOf(OpEnvironment env, OpRef ref,
+		Hints hints) throws OpMatchingException
+	{
 		Class<?> opType = Types.raw(ref.getType());
 		int mutableIndex = SimplificationUtils.findMutableArgIndex(opType);
 		if (mutableIndex == -1) return new SimplifiedOpRef(ref, env);
@@ -112,4 +125,45 @@ public static SimplifiedOpRef simplificationOf(OpEnvironment env, OpRef ref, Hin
 			return (Arity1<?, ?>) env.op("copy", Nil.of(copierType), new Nil<?>[] {copyNil, copyNil}, copyNil, hintsCopy);
 	}
 
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	@Override
+	public Type getType() {
+		throw new UnsupportedOperationException(
+			"The type of a SimplifiedOpRef is indeterminate; it must be matched with a OpInfo to form a concrete Type");
+	}
+
+	@Override
+	public Type getOutType() {
+		throw new UnsupportedOperationException(
+			"The output type of a SimplifiedOpRef is indeterminate; it must be matched with a OpInfo to form a concrete Type");
+	}
+
+	@Override
+	public Type[] getArgs() {
+		throw new UnsupportedOperationException(
+			"The output type of a SimplifiedOpRef is indeterminate; it must be matched with a OpInfo to form a concrete Type");
+	}
+
+	@Override
+	public String getLabel() {
+		return "Simplification of " + srcRef.getLabel();
+	}
+
+	@Override
+	public boolean typesMatch(Type opType) {
+		return typesMatch(opType, new HashMap<>());
+	}
+
+	@Override
+	public boolean typesMatch(Type opType,
+		Map<TypeVariable<?>, Type> typeVarAssigns)
+	{
+		throw new UnsupportedOperationException(
+			"The type of a SimplifiedOpRef is indeterminate; it must be matched with an OpInfo to form a concrete Type!");
+	}
+
 }
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java
similarity index 92%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java
rename to scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java
index 21978b9f2..0eaf3ed88 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.impl;
 
 import static org.junit.Assert.fail;
 
@@ -40,8 +40,14 @@
 import org.junit.jupiter.api.Assertions;
 import org.scijava.Context;
 import org.scijava.function.Producer;
-import org.scijava.ops.impl.DefaultOpEnvironment;
-import org.scijava.ops.impl.MatchingConditions;
+import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.Op;
+import org.scijava.ops.OpCollection;
+import org.scijava.ops.OpDependency;
+import org.scijava.ops.OpEnvironment;
+import org.scijava.ops.OpField;
+import org.scijava.ops.OpInstance;
+import org.scijava.ops.OpService;
 import org.scijava.ops.provenance.OpHistoryService;
 import org.scijava.plugin.Plugin;
 import org.scijava.plugin.PluginService;

From 6b430d5f0bbe8391f00db3c932f5928e67627d64 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Tue, 29 Jun 2021 11:57:28 -0500
Subject: [PATCH 49/91] OpMatchingException: Extend RuntimeException

This prevents us from having to declare it. There was no reason why we
should
---
 .../ops/impl/DefaultOpEnvironment.java        | 28 +++++++------------
 .../scijava/ops/matcher/DefaultOpMatcher.java |  4 +--
 .../scijava/ops/matcher/MatchingResult.java   |  2 +-
 .../org/scijava/ops/matcher/OpMatcher.java    |  4 +--
 .../ops/matcher/OpMatchingException.java      |  2 +-
 .../simplify/InfoSimplificationGenerator.java |  3 +-
 .../ops/simplify/SimplifiedOpInfo.java        |  6 +---
 .../scijava/ops/simplify/SimplifiedOpRef.java |  2 +-
 8 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
index d6677132f..cd20048b3 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
@@ -253,7 +253,7 @@ public void register(final OpInfo info, final String name) {
 
 	@SuppressWarnings("unchecked")
 	private <T> T findOp(final String opName, final Nil<T> specialType, final Nil<?>[] inTypes,
-			final Nil<?> outType, Hints hints) throws OpMatchingException {
+			final Nil<?> outType, Hints hints) {
 		final OpRef ref = DefaultOpRef.fromTypes(opName, specialType.getType(), outType != null ? outType.getType() : null,
 				toTypes(inTypes));
 		MatchingConditions conditions = MatchingConditions.from(ref, hints, true);
@@ -287,7 +287,7 @@ private Type[] toTypes(Nil<?>... nils) {
 	 * @param info
 	 * @throws OpMatchingException
 	 */
-	private void generateOpInstance(final MatchingConditions conditions, final OpInfo info) throws OpMatchingException {
+	private void generateOpInstance(final MatchingConditions conditions, final OpInfo info) {
 		// create new OpCandidate from ref and info
 		Map<TypeVariable<?>, Type> typeVarAssigns = new HashMap<>();
 		if (!conditions.ref().typesMatch(info.opType(), typeVarAssigns))
@@ -327,9 +327,8 @@ private Object wrapViaCache(MatchingConditions conditions,
 	 * 
 	 * @param conditions - the {@link MatchingConditions} outlining the
 	 *          requirements that must be fulfilled by the Op returned
-	 * @throws OpMatchingException
 	 */
-	private void generateOpInstance(final MatchingConditions conditions) throws OpMatchingException
+	private void generateOpInstance(final MatchingConditions conditions) 
 	{
 		// see if the ref has been matched already
 		OpInstance cachedOp = getInstance(conditions);
@@ -360,7 +359,7 @@ private OpInstance getInstance(MatchingConditions conditions) {
 		return opCache.get(conditions);
 	}
 	
-	private OpCandidate findOpCandidate(OpRef ref, Hints hints) throws OpMatchingException{
+	private OpCandidate findOpCandidate(OpRef ref, Hints hints) {
 		try {
 			// attempt to find a direct match
 			return matcher.findSingleMatch(this, ref, hints);
@@ -395,7 +394,7 @@ private OpCandidate findOpCandidate(OpRef ref, Hints hints) throws OpMatchingExc
 		}
 	}
 
-	private OpCandidate findSimplifiedOp(OpRef ref, Hints hints) throws OpMatchingException {
+	private OpCandidate findSimplifiedOp(OpRef ref, Hints hints) {
 		Hints simplificationHints = SimplificationHints.generateHints(hints, false);
 		return matcher.findSingleMatch(this, ref, simplificationHints);
 	}
@@ -406,10 +405,8 @@ private OpCandidate findSimplifiedOp(OpRef ref, Hints hints) throws OpMatchingEx
 	 * 
 	 * @param candidate
 	 * @return an Op with all needed dependencies
-	 * @throws OpMatchingException
 	 */
 	private Object instantiateOp(final OpCandidate candidate, Hints hints)
-		throws OpMatchingException
 	{
 		final List<MatchingConditions> instances = resolveOpDependencies(candidate, hints);
 		Object op = candidate.createOp(wrappedDeps(instances, hints.executionChainID()));
@@ -491,7 +488,7 @@ private List<Class<?>> filterWrapperSuperclasses(
 		return list;
 	}
 
-	private List<MatchingConditions> resolveOpDependencies(OpCandidate candidate, Hints hints) throws OpMatchingException {
+	private List<MatchingConditions> resolveOpDependencies(OpCandidate candidate, Hints hints) {
 		return resolveOpDependencies(candidate.opInfo(), candidate.typeVarAssigns(), hints);
 	}
 
@@ -511,11 +508,8 @@ private void initWrappers() {
 	 *          injected
 	 * @param typeVarAssigns - the mapping of {@link TypeVariable}s in the
 	 *          {@code OpInfo} to {@link Type}s given in the request.
-	 * @throws OpMatchingException if the type of the specified object is not
-	 *           functional, if the Op matching the functional type and the name
-	 *           could not be found, if an exception occurs during injection
 	 */
-	private List<MatchingConditions> resolveOpDependencies(OpInfo info, Map<TypeVariable<?>, Type> typeVarAssigns, Hints hints) throws OpMatchingException {
+	private List<MatchingConditions> resolveOpDependencies(OpInfo info, Map<TypeVariable<?>, Type> typeVarAssigns, Hints hints) {
 
 		final List<OpDependencyMember<?>> dependencies = info.dependencies();
 		final List<MatchingConditions> resolvedDependencies = new ArrayList<>(dependencies.size());
@@ -564,9 +558,8 @@ private List<MatchingConditions> resolveOpDependencies(OpInfo info, Map<TypeVari
 	 * @param ref - the type of Op that we are looking to adapt to.
 	 * @return {@link OpCandidate} - an Op that has been adapted to conform
 	 *         the the ref type (if one exists).
-	 * @throws OpMatchingException
 	 */
-	private OpCandidate adaptOp(OpRef ref, Hints hints) throws OpMatchingException {
+	private OpCandidate adaptOp(OpRef ref, Hints hints) {
 
 		List<DependencyMatchingException> depExceptions = new ArrayList<>();
 		for (final OpInfo adaptor : infos("adapt")) {
@@ -634,7 +627,6 @@ private OpCandidate adaptOp(OpRef ref, Hints hints) throws OpMatchingException {
 	}
 
 	private OpCandidate findAdaptationCandidate(final OpRef srcOpRef, final Hints hints)
-		throws OpMatchingException
 	{
 		Hints adaptationHints = AdaptationHints.generateHints(hints, false);
 		final OpCandidate srcCandidate = findOpCandidate(srcOpRef, adaptationHints);
@@ -658,7 +650,7 @@ else if (!Types.isAssignable(opType, adaptTo, map)) {
 	}
 
 	private OpRef inferOpRef(OpDependencyMember<?> dependency,
-		Map<TypeVariable<?>, Type> typeVarAssigns) throws OpMatchingException
+		Map<TypeVariable<?>, Type> typeVarAssigns) 
 	{
 		final Type mappedDependencyType = Types.mapVarToTypes(new Type[] {
 			dependency.getType() }, typeVarAssigns)[0];
@@ -696,7 +688,7 @@ private OpRef inferOpRef(OpDependencyMember<?> dependency,
 	 * @return null if the specified type has no functional method
 	 */
 	private OpRef inferOpRef(Type type, String name, Map<TypeVariable<?>, Type> typeVarAssigns)
-			throws OpMatchingException {
+			{
 		List<FunctionalMethodType> fmts = ParameterStructs.findFunctionalMethodTypes(type);
 		if (fmts == null)
 			return null;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java
index 5e5d03fcf..507201184 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java
@@ -73,12 +73,12 @@ public DefaultOpMatcher(final Logger log) {
 	}
 
 	@Override
-	public OpCandidate findSingleMatch(final OpEnvironment env, final OpRef ref) throws OpMatchingException {
+	public OpCandidate findSingleMatch(final OpEnvironment env, final OpRef ref) {
 		return findMatch(env, ref).singleMatch();
 	}
 
 	@Override
-	public OpCandidate findSingleMatch(final OpEnvironment env, final OpRef ref, final Hints hints) throws OpMatchingException {
+	public OpCandidate findSingleMatch(final OpEnvironment env, final OpRef ref, final Hints hints) {
 		return findMatch(env, ref, hints).singleMatch();
 	}
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingResult.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingResult.java
index e55b1f185..8d088252b 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingResult.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingResult.java
@@ -43,7 +43,7 @@ public List<OpCandidate> getMatches() {
 		return matches;
 	}
 
-	public OpCandidate singleMatch() throws OpMatchingException {
+	public OpCandidate singleMatch() {
 		if (matches.size() == 1) {
 			// if (log.isDebug()) {
 			// log.debug("Selected '" + match.getRef().getLabel() + "' op: " +
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java
index a91a00456..4d4006c83 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java
@@ -43,9 +43,9 @@
 //TODO javadoc
 public interface OpMatcher {
 
-	OpCandidate findSingleMatch(OpEnvironment env, OpRef ref) throws OpMatchingException;
+	OpCandidate findSingleMatch(OpEnvironment env, OpRef ref);
 
-	OpCandidate findSingleMatch(OpEnvironment env, OpRef ref, Hints hints) throws OpMatchingException;
+	OpCandidate findSingleMatch(OpEnvironment env, OpRef ref, Hints hints);
 
 	MatchingResult findMatch(OpEnvironment env, OpRef ref);
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatchingException.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatchingException.java
index d2977dd02..d29b1aaa7 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatchingException.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatchingException.java
@@ -7,7 +7,7 @@
  * 
  * @author David Kolb
  */
-public class OpMatchingException extends Exception {
+public class OpMatchingException extends RuntimeException {
 	
 	private static final long serialVersionUID = 2334342967056340218L;
 	
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/InfoSimplificationGenerator.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/InfoSimplificationGenerator.java
index 1bdb75547..10b687024 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/InfoSimplificationGenerator.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/InfoSimplificationGenerator.java
@@ -14,7 +14,6 @@
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpRef;
 import org.scijava.ops.OpUtils;
-import org.scijava.ops.matcher.OpMatchingException;
 import org.scijava.types.Types;
 
 
@@ -48,7 +47,7 @@ public OpInfo srcInfo() {
 		return info;
 	}
 
-	public OpInfo generateSuitableInfo(OpEnvironment env, OpRef originalRef, Hints hints) throws OpMatchingException {
+	public OpInfo generateSuitableInfo(OpEnvironment env, OpRef originalRef, Hints hints) {
 		SimplifiedOpRef simpleRef = SimplifiedOpRef.simplificationOf(env, originalRef, hints);
 		return generateSuitableInfo(simpleRef);
 	}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java
index e5e5e5f7b..0be15c7e8 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java
@@ -3,20 +3,16 @@
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 import org.scijava.Priority;
+import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.ops.Hints;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.OpHints;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpUtils;
-import org.scijava.ops.BaseOpHints.Adaptation;
-import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.ops.conversionLoss.LossReporter;
 import org.scijava.ops.hint.ImmutableHints;
 import org.scijava.ops.matcher.OpMatchingException;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpRef.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpRef.java
index 2c5e88f98..5667703f7 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpRef.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpRef.java
@@ -78,7 +78,7 @@ public List<OpInfo> outputFocusers() {
 	}
 
 	public static SimplifiedOpRef simplificationOf(OpEnvironment env, OpRef ref,
-		Hints hints) throws OpMatchingException
+		Hints hints)
 	{
 		Class<?> opType = Types.raw(ref.getType());
 		int mutableIndex = SimplificationUtils.findMutableArgIndex(opType);

From 55937a6218a8708e0bc7006b6604b7fd2402cd57 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Tue, 29 Jun 2021 12:51:40 -0500
Subject: [PATCH 50/91] Move OpCandidate to org.scijava.ops

---
 .../net/imagej/ops2/help/AbstractHelp.java    |  2 +-
 .../ops/{matcher => }/OpCandidate.java        | 20 ++---
 .../src/main/java/org/scijava/ops/OpInfo.java |  1 -
 .../main/java/org/scijava/ops/OpUtils.java    | 74 +------------------
 .../ops/impl/DefaultOpEnvironment.java        |  4 +-
 .../scijava/ops/matcher/DefaultOpMatcher.java |  3 +-
 .../scijava/ops/matcher/MatchingResult.java   | 71 +++++++++++++++++-
 .../org/scijava/ops/matcher/OpMatcher.java    |  1 +
 8 files changed, 85 insertions(+), 91 deletions(-)
 rename scijava/scijava-ops/src/main/java/org/scijava/ops/{matcher => }/OpCandidate.java (92%)

diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/AbstractHelp.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/AbstractHelp.java
index ff14d734d..0d90657ab 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/AbstractHelp.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/AbstractHelp.java
@@ -33,9 +33,9 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.scijava.ops.OpCandidate;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpUtils;
-import org.scijava.ops.matcher.OpCandidate;
 
 /**
  * Base class for help operations.
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpCandidate.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpCandidate.java
similarity index 92%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpCandidate.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/OpCandidate.java
index 83eccd7b3..27833ea99 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpCandidate.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpCandidate.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops.matcher;
+package org.scijava.ops;
 
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
@@ -35,10 +35,7 @@
 import java.util.Map;
 
 import org.scijava.log.Logger;
-import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.OpInfo;
-import org.scijava.ops.OpRef;
-import org.scijava.ops.OpUtils;
+import org.scijava.ops.matcher.OpMatcher;
 import org.scijava.param.ValidityProblem;
 import org.scijava.struct.Member;
 import org.scijava.struct.Struct;
@@ -214,19 +211,18 @@ public String toString() {
 		return info.toString();
 	}
 
-	public StructInstance<?> createOpInstance(List<?> dependencies) throws OpMatchingException
+	public StructInstance<?> createOpInstance(List<?> dependencies)
 	{
-		if (!getStatusCode().equals(StatusCode.MATCH)) {
-			throw new OpMatchingException(
-					"Status of candidate to create op from indicates a problem: " + getStatus());
+		if (getStatusCode().equals(StatusCode.MATCH)) {
+			return opInfo().createOpInstance(dependencies);
 		}
 
-		StructInstance<?> inst = opInfo().createOpInstance(dependencies);
-		return inst;
+		throw new IllegalStateException(
+			"Status of candidate to create op from indicates a problem: " +
+				getStatus());
 	}
 
 	public Object createOp(List<?> dependencies)
-		throws OpMatchingException
 	{
 		return createOpInstance(dependencies).object();
 	}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java
index 3f5a6c508..8251c0616 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java
@@ -8,7 +8,6 @@
 import java.util.Map;
 
 import org.scijava.log.Logger;
-import org.scijava.ops.matcher.OpCandidate;
 import org.scijava.param.ValidityException;
 import org.scijava.struct.Member;
 import org.scijava.struct.Struct;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
index 7a73e86a8..5c0494f98 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
@@ -36,10 +36,7 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import org.scijava.ops.matcher.MatchingResult;
-import org.scijava.ops.matcher.OpCandidate;
-import org.scijava.ops.matcher.OpCandidate.StatusCode;
-import org.scijava.ops.matcher.OpMatcher;
+import org.scijava.ops.OpCandidate.StatusCode;
 import org.scijava.param.ParameterMember;
 import org.scijava.param.ParameterStructs;
 import org.scijava.param.ValidityException;
@@ -255,11 +252,10 @@ public static List<Member<?>> injectableMembers(Struct struct) {
 	 * several matches that do not have equal output types, the output type may not
 	 * completely match the request as only raw type assignability will be checked
 	 * at the moment.
-	 * @see OpMatcher#typesMatch(OpCandidate)
 	 * @param matches
 	 * @return
 	 */
-	private static boolean typeCheckingIncomplete(List<OpCandidate> matches) {
+	public static boolean typeCheckingIncomplete(List<OpCandidate> matches) {
 		Type outputType = null;
 		for (OpCandidate match : matches) {
 			Type ts = output(match).getType();
@@ -277,72 +273,6 @@ public static Type[] getTypes(List<Member<?>> members) {
 		return members.stream().map(m -> m.getType()).toArray(Type[]::new);
 	}
 
-	/**
-	 * Gets a string with an analysis of a particular match request failure.
-	 * <p>
-	 * This method is used to generate informative exception messages when no
-	 * matches, or too many matches, are found.
-	 * </p>
-	 * 
-	 * @param res
-	 *            The result of type matching
-	 * @return A multi-line string describing the situation: 1) the type of
-	 *         match failure; 2) the list of matching ops (if any); 3) the
-	 *         request itself; and 4) the list of candidates including status
-	 *         (i.e., whether it matched, and if not, why not).
-	 */
-	public static String matchInfo(final MatchingResult res) {
-		final StringBuilder sb = new StringBuilder();
-
-		List<OpCandidate> candidates = res.getCandidates();
-		List<OpCandidate> matches = res.getMatches();
-
-		final OpRef ref = res.getOriginalQueries().get(0);
-		if (matches.isEmpty()) {
-			// no matches
-			sb.append("No matching '" + ref.getLabel() + "' op\n");
-		} else {
-			// multiple matches
-			final double priority = getPriority(matches.get(0));
-			sb.append("Multiple '" + ref.getLabel() + "' ops of priority " + priority + ":\n");
-			if (typeCheckingIncomplete(matches)) {
-				sb.append("Incomplete output type checking may have occured!\n");
-			}
-			int count = 0;
-			for (final OpCandidate match : matches) {
-				sb.append(++count + ". ");
-				sb.append(match.toString() + "\n");
-			}
-		}
-
-		// fail, with information about the request and candidates
-		sb.append("\n");
-		sb.append("Request:\n");
-		sb.append("-\t" + ref.toString() + "\n");
-		sb.append("\n");
-		sb.append("Candidates:\n");
-		if (candidates.isEmpty()) {
-			sb.append("-\t No candidates found!");
-		}
-		int count = 0;
-		for (final OpCandidate candidate : candidates) {
-			sb.append(++count + ". ");
-			sb.append("\t" + opString(candidate.opInfo(), candidate.getStatusItem()) + "\n");
-			final String status = candidate.getStatus();
-			if (status != null)
-				sb.append("\t" + status + "\n");
-			if (candidate.getStatusCode() == StatusCode.DOES_NOT_CONFORM) {
-				// TODO: Conformity not yet implemented
-				// // show argument values when a contingent op rejects them
-				// for (final ModuleItem<?> item : inputs(info)) {
-				// final Object value = item.getValue(candidate.getModule());
-				// sb.append("\t\t" + item.getName() + " = " + value + "\n");
-				// }
-			}
-		}
-		return sb.toString();
-	}
-
 	public static String opString(final OpInfo info) {
 		return opString(info, null);
 	}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
index cd20048b3..5b6bf3039 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
@@ -56,8 +56,10 @@
 import org.scijava.ops.BaseOpHints.Adaptation;
 import org.scijava.ops.BaseOpHints.DependencyMatching;
 import org.scijava.ops.BaseOpHints.Simplification;
+import org.scijava.ops.OpCandidate.StatusCode;
 import org.scijava.ops.Hints;
 import org.scijava.ops.Op;
+import org.scijava.ops.OpCandidate;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.OpDependencyMember;
@@ -76,8 +78,6 @@
 import org.scijava.ops.matcher.DependencyMatchingException;
 import org.scijava.ops.matcher.MatchingUtils;
 import org.scijava.ops.matcher.OpAdaptationInfo;
-import org.scijava.ops.matcher.OpCandidate;
-import org.scijava.ops.matcher.OpCandidate.StatusCode;
 import org.scijava.ops.matcher.OpClassInfo;
 import org.scijava.ops.matcher.OpFieldInfo;
 import org.scijava.ops.matcher.OpMatcher;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java
index 507201184..d668c09b1 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java
@@ -45,13 +45,14 @@
 
 import org.scijava.log.Logger;
 import org.scijava.ops.Hints;
+import org.scijava.ops.OpCandidate;
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpRef;
 import org.scijava.ops.OpUtils;
 import org.scijava.ops.BaseOpHints.Simplification;
+import org.scijava.ops.OpCandidate.StatusCode;
 import org.scijava.ops.hint.DefaultHints;
-import org.scijava.ops.matcher.OpCandidate.StatusCode;
 import org.scijava.ops.simplify.InfoSimplificationGenerator;
 import org.scijava.service.AbstractService;
 import org.scijava.struct.Member;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingResult.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingResult.java
index 8d088252b..8d7dbfbe0 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingResult.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingResult.java
@@ -3,9 +3,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.scijava.ops.OpCandidate;
+import org.scijava.ops.OpCandidate.StatusCode;
 import org.scijava.ops.OpRef;
 import org.scijava.ops.OpUtils;
-import org.scijava.ops.simplify.SimplifiedOpInfo;
 
 /**
  * Class representing the result from type matching done by the
@@ -60,7 +61,73 @@ public OpCandidate singleMatch() {
 		}
 
 		// There is no clear matching Op
-		final String analysis = OpUtils.matchInfo(this);
+		final String analysis = MatchingResult.matchInfo(this);
 		throw new OpMatchingException(analysis);
 	}
+
+	/**
+	 * Gets a string with an analysis of a particular match request failure.
+	 * <p>
+	 * This method is used to generate informative exception messages when no
+	 * matches, or too many matches, are found.
+	 * </p>
+	 * 
+	 * @param res
+	 *            The result of type matching
+	 * @return A multi-line string describing the situation: 1) the type of
+	 *         match failure; 2) the list of matching ops (if any); 3) the
+	 *         request itself; and 4) the list of candidates including status
+	 *         (i.e., whether it matched, and if not, why not).
+	 */
+	public static String matchInfo(final MatchingResult res) {
+		final StringBuilder sb = new StringBuilder();
+	
+		List<OpCandidate> candidates = res.getCandidates();
+		List<OpCandidate> matches = res.getMatches();
+	
+		final OpRef ref = res.getOriginalQueries().get(0);
+		if (matches.isEmpty()) {
+			// no matches
+			sb.append("No matching '" + ref.getLabel() + "' op\n");
+		} else {
+			// multiple matches
+			final double priority = OpUtils.getPriority(matches.get(0));
+			sb.append("Multiple '" + ref.getLabel() + "' ops of priority " + priority + ":\n");
+			if (OpUtils.typeCheckingIncomplete(matches)) {
+				sb.append("Incomplete output type checking may have occured!\n");
+			}
+			int count = 0;
+			for (final OpCandidate match : matches) {
+				sb.append(++count + ". ");
+				sb.append(match.toString() + "\n");
+			}
+		}
+	
+		// fail, with information about the request and candidates
+		sb.append("\n");
+		sb.append("Request:\n");
+		sb.append("-\t" + ref.toString() + "\n");
+		sb.append("\n");
+		sb.append("Candidates:\n");
+		if (candidates.isEmpty()) {
+			sb.append("-\t No candidates found!");
+		}
+		int count = 0;
+		for (final OpCandidate candidate : candidates) {
+			sb.append(++count + ". ");
+			sb.append("\t" + OpUtils.opString(candidate.opInfo(), candidate.getStatusItem()) + "\n");
+			final String status = candidate.getStatus();
+			if (status != null)
+				sb.append("\t" + status + "\n");
+			if (candidate.getStatusCode() == StatusCode.DOES_NOT_CONFORM) {
+				// TODO: Conformity not yet implemented
+				// // show argument values when a contingent op rejects them
+				// for (final ModuleItem<?> item : inputs(info)) {
+				// final Object value = item.getValue(candidate.getModule());
+				// sb.append("\t\t" + item.getName() + " = " + value + "\n");
+				// }
+			}
+		}
+		return sb.toString();
+	}
 }
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java
index 4d4006c83..c0708145f 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java
@@ -32,6 +32,7 @@
 import java.util.List;
 
 import org.scijava.ops.Hints;
+import org.scijava.ops.OpCandidate;
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.OpRef;
 

From 745f8d7ae9b50130b22a46f86f026650638a97cb Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Tue, 29 Jun 2021 12:56:48 -0500
Subject: [PATCH 51/91] Move util tests from org.scijava.ops to util package

---
 .../test/java/org/scijava/ops/{ => util}/AdaptersTest.java | 3 ++-
 .../java/org/scijava/ops/{ => util}/ComputersTest.java     | 3 ++-
 .../java/org/scijava/ops/{ => util}/FunctionsTest.java     | 3 ++-
 .../test/java/org/scijava/ops/{ => util}/InplacesTest.java | 3 ++-
 .../src/test/java/org/scijava/ops/{ => util}/LiftTest.java | 7 ++-----
 5 files changed, 10 insertions(+), 9 deletions(-)
 rename scijava/scijava-ops/src/test/java/org/scijava/ops/{ => util}/AdaptersTest.java (97%)
 rename scijava/scijava-ops/src/test/java/org/scijava/ops/{ => util}/ComputersTest.java (96%)
 rename scijava/scijava-ops/src/test/java/org/scijava/ops/{ => util}/FunctionsTest.java (96%)
 rename scijava/scijava-ops/src/test/java/org/scijava/ops/{ => util}/InplacesTest.java (96%)
 rename scijava/scijava-ops/src/test/java/org/scijava/ops/{ => util}/LiftTest.java (95%)

diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/AdaptersTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/AdaptersTest.java
similarity index 97%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/AdaptersTest.java
rename to scijava/scijava-ops/src/test/java/org/scijava/ops/util/AdaptersTest.java
index d54d907aa..d558346f5 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/AdaptersTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/AdaptersTest.java
@@ -27,13 +27,14 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.util;
 
 import java.util.function.BiFunction;
 
 import org.junit.Test;
 import org.scijava.types.Nil;
 import org.scijava.function.Computers;
+import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.util.Adapt;
 
 public class AdaptersTest extends AbstractTestEnvironment {
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/ComputersTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/ComputersTest.java
similarity index 96%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/ComputersTest.java
rename to scijava/scijava-ops/src/test/java/org/scijava/ops/util/ComputersTest.java
index 28b665ed7..bd91e7664 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/ComputersTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/ComputersTest.java
@@ -27,10 +27,11 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.util;
 
 import org.junit.Test;
 import org.scijava.function.Computers;
+import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.util.ComputerUtils;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/FunctionsTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/FunctionsTest.java
similarity index 96%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/FunctionsTest.java
rename to scijava/scijava-ops/src/test/java/org/scijava/ops/util/FunctionsTest.java
index 1584e3500..2d5dcac36 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/FunctionsTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/FunctionsTest.java
@@ -27,13 +27,14 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.util;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
 import org.junit.Test;
 import org.scijava.function.Functions;
+import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.util.FunctionUtils;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/InplacesTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/InplacesTest.java
similarity index 96%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/InplacesTest.java
rename to scijava/scijava-ops/src/test/java/org/scijava/ops/util/InplacesTest.java
index be4055298..b106d4b45 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/InplacesTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/InplacesTest.java
@@ -27,10 +27,11 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.util;
 
 import org.junit.Test;
 import org.scijava.function.Inplaces;
+import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.util.InplaceUtils;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/LiftTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/LiftTest.java
similarity index 95%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/LiftTest.java
rename to scijava/scijava-ops/src/test/java/org/scijava/ops/util/LiftTest.java
index 650fe6667..835fd86b5 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/LiftTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/LiftTest.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.util;
 
 import com.google.common.collect.Streams;
 
@@ -39,11 +39,8 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.scijava.function.Computers;
-import org.scijava.function.Functions;
+import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.types.Nil;
-import org.scijava.ops.util.ComputerUtils;
-import org.scijava.ops.util.FunctionUtils;
-import org.scijava.ops.util.Maps;
 
 public class LiftTest extends AbstractTestEnvironment {
 

From d4331491aa72f2ccc4b613fa534128c0772bd6f1 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Tue, 29 Jun 2021 13:37:35 -0500
Subject: [PATCH 52/91] Move OpWrapper to org.scijava.ops package

---
 .../src/main/java/org/scijava/ops/{util => }/OpWrapper.java     | 2 +-
 .../org/scijava/ops/conversionLoss/LossReporterWrapper.java     | 2 +-
 .../main/java/org/scijava/ops/impl/DefaultOpEnvironment.java    | 2 +-
 .../src/main/java/org/scijava/ops/matcher/OpWrappers.java       | 2 +-
 .../templates/main/java/org/scijava/ops/matcher/OpWrappers.vm   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename scijava/scijava-ops/src/main/java/org/scijava/ops/{util => }/OpWrapper.java (95%)

diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpWrapper.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpWrapper.java
similarity index 95%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpWrapper.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/OpWrapper.java
index 810f941b0..56dad4885 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpWrapper.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpWrapper.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.util;
+package org.scijava.ops;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporterWrapper.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporterWrapper.java
index a7b62f51b..abb9071de 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporterWrapper.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporterWrapper.java
@@ -6,9 +6,9 @@
 import org.scijava.ops.BaseOpHints.DependencyMatching;
 import org.scijava.ops.Hints;
 import org.scijava.ops.OpInfo;
+import org.scijava.ops.OpWrapper;
 import org.scijava.ops.provenance.OpExecutionSummary;
 import org.scijava.ops.provenance.OpHistory;
-import org.scijava.ops.util.OpWrapper;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.GenericTyped;
 import org.scijava.types.Nil;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
index 5b6bf3039..6930309ee 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
@@ -70,6 +70,7 @@
 import org.scijava.ops.OpMethod;
 import org.scijava.ops.OpRef;
 import org.scijava.ops.OpUtils;
+import org.scijava.ops.OpWrapper;
 import org.scijava.ops.hint.AdaptationHints;
 import org.scijava.ops.hint.DefaultHints;
 import org.scijava.ops.hint.SimplificationHints;
@@ -85,7 +86,6 @@
 import org.scijava.ops.matcher.OpMethodInfo;
 import org.scijava.ops.provenance.OpHistoryService;
 import org.scijava.ops.simplify.SimplifiedOpInfo;
-import org.scijava.ops.util.OpWrapper;
 import org.scijava.param.FunctionalMethodType;
 import org.scijava.param.ParameterStructs;
 import org.scijava.plugin.Parameter;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpWrappers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpWrappers.java
index 865bfbfbd..d5bd98efa 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpWrappers.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpWrappers.java
@@ -18,9 +18,9 @@
 import org.scijava.ops.BaseOpHints.DependencyMatching;
 import org.scijava.ops.Hints;
 import org.scijava.ops.OpInfo;
+import org.scijava.ops.OpWrapper;
 import org.scijava.ops.provenance.OpExecutionSummary;
 import org.scijava.ops.provenance.OpHistory;
-import org.scijava.ops.util.OpWrapper;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.GenericTyped;
 
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/OpWrappers.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/OpWrappers.vm
index 07e5ee540..ccdba9740 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/OpWrappers.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/OpWrappers.vm
@@ -18,9 +18,9 @@ import org.scijava.function.Producer;
 import org.scijava.ops.BaseOpHints.DependencyMatching;
 import org.scijava.ops.Hints;
 import org.scijava.ops.OpInfo;
+import org.scijava.ops.OpWrapper;
 import org.scijava.ops.provenance.OpExecutionSummary;
 import org.scijava.ops.provenance.OpHistory;
-import org.scijava.ops.util.OpWrapper;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.GenericTyped;
 

From 793f8b68ac497e1e56c3305a4411973daf744d5e Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Tue, 29 Jun 2021 15:00:01 -0500
Subject: [PATCH 53/91] Remove HashMaps from FifaceUtils classes

---
 .../java/org/scijava/function/Computers.java  |  41 ++++
 .../java/org/scijava/function/Functions.java  |  39 ++++
 .../java/org/scijava/function/Inplaces.java   | 189 ++++++++++++++++++
 .../java/org/scijava/function/Computers.vm    |  27 +++
 .../java/org/scijava/function/Functions.vm    |  25 +++
 .../java/org/scijava/function/Inplaces.vm     |  59 ++++++
 .../org/scijava/ops/util/ComputerUtils.java   |  44 ----
 .../org/scijava/ops/util/FunctionUtils.java   |  50 +----
 .../org/scijava/ops/util/InplaceUtils.java    | 175 +---------------
 .../org/scijava/ops/util/ComputerUtils.vm     |  30 ---
 .../org/scijava/ops/util/FunctionUtils.vm     |  36 +---
 .../java/org/scijava/ops/util/InplaceUtils.vm |  45 +----
 12 files changed, 398 insertions(+), 362 deletions(-)

diff --git a/scijava/scijava-function/src/main/java/org/scijava/function/Computers.java b/scijava/scijava-function/src/main/java/org/scijava/function/Computers.java
index 7e5d30b8b..955b509fe 100644
--- a/scijava/scijava-function/src/main/java/org/scijava/function/Computers.java
+++ b/scijava/scijava-function/src/main/java/org/scijava/function/Computers.java
@@ -5,6 +5,7 @@
 
 package org.scijava.function;
 
+import java.util.HashMap;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
@@ -32,6 +33,46 @@ private Computers() {
 		// NB: Prevent instantiation of utility class.
 	}
 
+	// -- Static Utility Methods -- //
+
+	/**
+	 * All known computer types and their arities. The entries are sorted by
+	 * arity, i.e., the {@code i}-th entry has an arity of {@code i}.
+	 */
+	public static final HashMap<Class<?>, Integer> ALL_COMPUTERS;
+
+	static {
+		ALL_COMPUTERS = new HashMap<>();
+		ALL_COMPUTERS.put(Computers.Arity0.class, 0);
+		ALL_COMPUTERS.put(Computers.Arity1.class, 1);
+		ALL_COMPUTERS.put(Computers.Arity2.class, 2);
+		ALL_COMPUTERS.put(Computers.Arity3.class, 3);
+		ALL_COMPUTERS.put(Computers.Arity4.class, 4);
+		ALL_COMPUTERS.put(Computers.Arity5.class, 5);
+		ALL_COMPUTERS.put(Computers.Arity6.class, 6);
+		ALL_COMPUTERS.put(Computers.Arity7.class, 7);
+		ALL_COMPUTERS.put(Computers.Arity8.class, 8);
+		ALL_COMPUTERS.put(Computers.Arity9.class, 9);
+		ALL_COMPUTERS.put(Computers.Arity10.class, 10);
+		ALL_COMPUTERS.put(Computers.Arity11.class, 11);
+		ALL_COMPUTERS.put(Computers.Arity12.class, 12);
+		ALL_COMPUTERS.put(Computers.Arity13.class, 13);
+		ALL_COMPUTERS.put(Computers.Arity14.class, 14);
+		ALL_COMPUTERS.put(Computers.Arity15.class, 15);
+		ALL_COMPUTERS.put(Computers.Arity16.class, 16);
+	}
+
+	/**
+	 * @return {@code true} if the given type is a known
+	 *         computer type, {@code false} otherwise. <br>
+	 *         Note that only the type itself and not its type hierarchy is
+	 *         considered.
+	 * @throws NullPointerException If {@code c} is {@code null}.
+	 */
+	public static boolean isComputer(Class<?> c) {
+		return ALL_COMPUTERS.containsKey(c);
+	}
+
 
 	@FunctionalInterface
 	public interface Arity0<O> extends
diff --git a/scijava/scijava-function/src/main/java/org/scijava/function/Functions.java b/scijava/scijava-function/src/main/java/org/scijava/function/Functions.java
index 679e55189..5a1a6037b 100644
--- a/scijava/scijava-function/src/main/java/org/scijava/function/Functions.java
+++ b/scijava/scijava-function/src/main/java/org/scijava/function/Functions.java
@@ -5,6 +5,7 @@
 
 package org.scijava.function;
 
+import java.util.HashMap;
 import java.util.Objects;
 import java.util.function.BiFunction;
 import java.util.function.Function;
@@ -31,6 +32,44 @@ private Functions() {
 		// NB: Prevent instantiation of utility class.
 	}
 
+	/**
+	 * All known function types and their arities. The entries are sorted by
+	 * arity, i.e., the {@code i}-th entry has an arity of {@code i}.
+	 */
+	public static final HashMap<Integer, Class<?>> ALL_FUNCTIONS;
+
+	static {
+		ALL_FUNCTIONS = new HashMap<>(10);
+		ALL_FUNCTIONS.put(0, Producer.class);
+		ALL_FUNCTIONS.put(1, Function.class);
+		ALL_FUNCTIONS.put(2, BiFunction.class);
+		ALL_FUNCTIONS.put(3, Functions.Arity3.class);
+		ALL_FUNCTIONS.put(4, Functions.Arity4.class);
+		ALL_FUNCTIONS.put(5, Functions.Arity5.class);
+		ALL_FUNCTIONS.put(6, Functions.Arity6.class);
+		ALL_FUNCTIONS.put(7, Functions.Arity7.class);
+		ALL_FUNCTIONS.put(8, Functions.Arity8.class);
+		ALL_FUNCTIONS.put(9, Functions.Arity9.class);
+		ALL_FUNCTIONS.put(10, Functions.Arity10.class);
+		ALL_FUNCTIONS.put(11, Functions.Arity11.class);
+		ALL_FUNCTIONS.put(12, Functions.Arity12.class);
+		ALL_FUNCTIONS.put(13, Functions.Arity13.class);
+		ALL_FUNCTIONS.put(14, Functions.Arity14.class);
+		ALL_FUNCTIONS.put(15, Functions.Arity15.class);
+		ALL_FUNCTIONS.put(16, Functions.Arity16.class);
+	}
+
+	/**
+	 * @return {@code true} if the given type is a known
+	 *         function type, {@code false} otherwise.<br>
+	 *         Note that only the type itself and not its type hierarchy is
+	 *         considered.
+	 * @throws NullPointerException If {@code c} is {@code null}.
+	 */
+	public static boolean isFunction(Class<?> c) {
+		return ALL_FUNCTIONS.containsValue(c);
+	}
+
 	/**
 	 * A 3-arity specialization of {@link Function}.
 	 *
diff --git a/scijava/scijava-function/src/main/java/org/scijava/function/Inplaces.java b/scijava/scijava-function/src/main/java/org/scijava/function/Inplaces.java
index a02159d31..9cfcb9277 100644
--- a/scijava/scijava-function/src/main/java/org/scijava/function/Inplaces.java
+++ b/scijava/scijava-function/src/main/java/org/scijava/function/Inplaces.java
@@ -5,8 +5,14 @@
 
 package org.scijava.function;
 
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 /**
  * Container class for inplace-style functional interfaces at various
@@ -43,6 +49,171 @@ private Inplaces() {
 		// NB: Prevent instantiation of container class.
 	}
 
+	/**
+	 * All known inplace types and their arities and mutable positions. The
+	 * entries are sorted by arity and mutable position.
+	 */
+	public static final Map<Class<?>, InplaceInfo> ALL_INPLACES;
+
+	static {
+		final Map<Class<?>, InplaceInfo> inplaces = new LinkedHashMap<>(22);
+		inplaces.put(Inplaces.Arity1.class, new InplaceInfo(1, 0));
+		inplaces.put(Inplaces.Arity2_1.class, new InplaceInfo(2, 0));
+		inplaces.put(Inplaces.Arity2_2.class, new InplaceInfo(2, 1));
+		inplaces.put(Inplaces.Arity3_1.class, new InplaceInfo(3, 0));
+		inplaces.put(Inplaces.Arity3_2.class, new InplaceInfo(3, 1));
+		inplaces.put(Inplaces.Arity3_3.class, new InplaceInfo(3, 2));
+		inplaces.put(Inplaces.Arity4_1.class, new InplaceInfo(4, 0));
+		inplaces.put(Inplaces.Arity4_2.class, new InplaceInfo(4, 1));
+		inplaces.put(Inplaces.Arity4_3.class, new InplaceInfo(4, 2));
+		inplaces.put(Inplaces.Arity4_4.class, new InplaceInfo(4, 3));
+		inplaces.put(Inplaces.Arity5_1.class, new InplaceInfo(5, 0));
+		inplaces.put(Inplaces.Arity5_2.class, new InplaceInfo(5, 1));
+		inplaces.put(Inplaces.Arity5_3.class, new InplaceInfo(5, 2));
+		inplaces.put(Inplaces.Arity5_4.class, new InplaceInfo(5, 3));
+		inplaces.put(Inplaces.Arity5_5.class, new InplaceInfo(5, 4));
+		inplaces.put(Inplaces.Arity6_1.class, new InplaceInfo(6, 0));
+		inplaces.put(Inplaces.Arity6_2.class, new InplaceInfo(6, 1));
+		inplaces.put(Inplaces.Arity6_3.class, new InplaceInfo(6, 2));
+		inplaces.put(Inplaces.Arity6_4.class, new InplaceInfo(6, 3));
+		inplaces.put(Inplaces.Arity6_5.class, new InplaceInfo(6, 4));
+		inplaces.put(Inplaces.Arity6_6.class, new InplaceInfo(6, 5));
+		inplaces.put(Inplaces.Arity7_1.class, new InplaceInfo(7, 0));
+		inplaces.put(Inplaces.Arity7_2.class, new InplaceInfo(7, 1));
+		inplaces.put(Inplaces.Arity7_3.class, new InplaceInfo(7, 2));
+		inplaces.put(Inplaces.Arity7_4.class, new InplaceInfo(7, 3));
+		inplaces.put(Inplaces.Arity7_5.class, new InplaceInfo(7, 4));
+		inplaces.put(Inplaces.Arity7_6.class, new InplaceInfo(7, 5));
+		inplaces.put(Inplaces.Arity7_7.class, new InplaceInfo(7, 6));
+		inplaces.put(Inplaces.Arity8_1.class, new InplaceInfo(8, 0));
+		inplaces.put(Inplaces.Arity8_2.class, new InplaceInfo(8, 1));
+		inplaces.put(Inplaces.Arity8_3.class, new InplaceInfo(8, 2));
+		inplaces.put(Inplaces.Arity8_4.class, new InplaceInfo(8, 3));
+		inplaces.put(Inplaces.Arity8_5.class, new InplaceInfo(8, 4));
+		inplaces.put(Inplaces.Arity8_6.class, new InplaceInfo(8, 5));
+		inplaces.put(Inplaces.Arity8_7.class, new InplaceInfo(8, 6));
+		inplaces.put(Inplaces.Arity8_8.class, new InplaceInfo(8, 7));
+		inplaces.put(Inplaces.Arity9_1.class, new InplaceInfo(9, 0));
+		inplaces.put(Inplaces.Arity9_2.class, new InplaceInfo(9, 1));
+		inplaces.put(Inplaces.Arity9_3.class, new InplaceInfo(9, 2));
+		inplaces.put(Inplaces.Arity9_4.class, new InplaceInfo(9, 3));
+		inplaces.put(Inplaces.Arity9_5.class, new InplaceInfo(9, 4));
+		inplaces.put(Inplaces.Arity9_6.class, new InplaceInfo(9, 5));
+		inplaces.put(Inplaces.Arity9_7.class, new InplaceInfo(9, 6));
+		inplaces.put(Inplaces.Arity9_8.class, new InplaceInfo(9, 7));
+		inplaces.put(Inplaces.Arity9_9.class, new InplaceInfo(9, 8));
+		inplaces.put(Inplaces.Arity10_1.class, new InplaceInfo(10, 0));
+		inplaces.put(Inplaces.Arity10_2.class, new InplaceInfo(10, 1));
+		inplaces.put(Inplaces.Arity10_3.class, new InplaceInfo(10, 2));
+		inplaces.put(Inplaces.Arity10_4.class, new InplaceInfo(10, 3));
+		inplaces.put(Inplaces.Arity10_5.class, new InplaceInfo(10, 4));
+		inplaces.put(Inplaces.Arity10_6.class, new InplaceInfo(10, 5));
+		inplaces.put(Inplaces.Arity10_7.class, new InplaceInfo(10, 6));
+		inplaces.put(Inplaces.Arity10_8.class, new InplaceInfo(10, 7));
+		inplaces.put(Inplaces.Arity10_9.class, new InplaceInfo(10, 8));
+		inplaces.put(Inplaces.Arity10_10.class, new InplaceInfo(10, 9));
+		inplaces.put(Inplaces.Arity11_1.class, new InplaceInfo(11, 0));
+		inplaces.put(Inplaces.Arity11_2.class, new InplaceInfo(11, 1));
+		inplaces.put(Inplaces.Arity11_3.class, new InplaceInfo(11, 2));
+		inplaces.put(Inplaces.Arity11_4.class, new InplaceInfo(11, 3));
+		inplaces.put(Inplaces.Arity11_5.class, new InplaceInfo(11, 4));
+		inplaces.put(Inplaces.Arity11_6.class, new InplaceInfo(11, 5));
+		inplaces.put(Inplaces.Arity11_7.class, new InplaceInfo(11, 6));
+		inplaces.put(Inplaces.Arity11_8.class, new InplaceInfo(11, 7));
+		inplaces.put(Inplaces.Arity11_9.class, new InplaceInfo(11, 8));
+		inplaces.put(Inplaces.Arity11_10.class, new InplaceInfo(11, 9));
+		inplaces.put(Inplaces.Arity11_11.class, new InplaceInfo(11, 10));
+		inplaces.put(Inplaces.Arity12_1.class, new InplaceInfo(12, 0));
+		inplaces.put(Inplaces.Arity12_2.class, new InplaceInfo(12, 1));
+		inplaces.put(Inplaces.Arity12_3.class, new InplaceInfo(12, 2));
+		inplaces.put(Inplaces.Arity12_4.class, new InplaceInfo(12, 3));
+		inplaces.put(Inplaces.Arity12_5.class, new InplaceInfo(12, 4));
+		inplaces.put(Inplaces.Arity12_6.class, new InplaceInfo(12, 5));
+		inplaces.put(Inplaces.Arity12_7.class, new InplaceInfo(12, 6));
+		inplaces.put(Inplaces.Arity12_8.class, new InplaceInfo(12, 7));
+		inplaces.put(Inplaces.Arity12_9.class, new InplaceInfo(12, 8));
+		inplaces.put(Inplaces.Arity12_10.class, new InplaceInfo(12, 9));
+		inplaces.put(Inplaces.Arity12_11.class, new InplaceInfo(12, 10));
+		inplaces.put(Inplaces.Arity12_12.class, new InplaceInfo(12, 11));
+		inplaces.put(Inplaces.Arity13_1.class, new InplaceInfo(13, 0));
+		inplaces.put(Inplaces.Arity13_2.class, new InplaceInfo(13, 1));
+		inplaces.put(Inplaces.Arity13_3.class, new InplaceInfo(13, 2));
+		inplaces.put(Inplaces.Arity13_4.class, new InplaceInfo(13, 3));
+		inplaces.put(Inplaces.Arity13_5.class, new InplaceInfo(13, 4));
+		inplaces.put(Inplaces.Arity13_6.class, new InplaceInfo(13, 5));
+		inplaces.put(Inplaces.Arity13_7.class, new InplaceInfo(13, 6));
+		inplaces.put(Inplaces.Arity13_8.class, new InplaceInfo(13, 7));
+		inplaces.put(Inplaces.Arity13_9.class, new InplaceInfo(13, 8));
+		inplaces.put(Inplaces.Arity13_10.class, new InplaceInfo(13, 9));
+		inplaces.put(Inplaces.Arity13_11.class, new InplaceInfo(13, 10));
+		inplaces.put(Inplaces.Arity13_12.class, new InplaceInfo(13, 11));
+		inplaces.put(Inplaces.Arity13_13.class, new InplaceInfo(13, 12));
+		inplaces.put(Inplaces.Arity14_1.class, new InplaceInfo(14, 0));
+		inplaces.put(Inplaces.Arity14_2.class, new InplaceInfo(14, 1));
+		inplaces.put(Inplaces.Arity14_3.class, new InplaceInfo(14, 2));
+		inplaces.put(Inplaces.Arity14_4.class, new InplaceInfo(14, 3));
+		inplaces.put(Inplaces.Arity14_5.class, new InplaceInfo(14, 4));
+		inplaces.put(Inplaces.Arity14_6.class, new InplaceInfo(14, 5));
+		inplaces.put(Inplaces.Arity14_7.class, new InplaceInfo(14, 6));
+		inplaces.put(Inplaces.Arity14_8.class, new InplaceInfo(14, 7));
+		inplaces.put(Inplaces.Arity14_9.class, new InplaceInfo(14, 8));
+		inplaces.put(Inplaces.Arity14_10.class, new InplaceInfo(14, 9));
+		inplaces.put(Inplaces.Arity14_11.class, new InplaceInfo(14, 10));
+		inplaces.put(Inplaces.Arity14_12.class, new InplaceInfo(14, 11));
+		inplaces.put(Inplaces.Arity14_13.class, new InplaceInfo(14, 12));
+		inplaces.put(Inplaces.Arity14_14.class, new InplaceInfo(14, 13));
+		inplaces.put(Inplaces.Arity15_1.class, new InplaceInfo(15, 0));
+		inplaces.put(Inplaces.Arity15_2.class, new InplaceInfo(15, 1));
+		inplaces.put(Inplaces.Arity15_3.class, new InplaceInfo(15, 2));
+		inplaces.put(Inplaces.Arity15_4.class, new InplaceInfo(15, 3));
+		inplaces.put(Inplaces.Arity15_5.class, new InplaceInfo(15, 4));
+		inplaces.put(Inplaces.Arity15_6.class, new InplaceInfo(15, 5));
+		inplaces.put(Inplaces.Arity15_7.class, new InplaceInfo(15, 6));
+		inplaces.put(Inplaces.Arity15_8.class, new InplaceInfo(15, 7));
+		inplaces.put(Inplaces.Arity15_9.class, new InplaceInfo(15, 8));
+		inplaces.put(Inplaces.Arity15_10.class, new InplaceInfo(15, 9));
+		inplaces.put(Inplaces.Arity15_11.class, new InplaceInfo(15, 10));
+		inplaces.put(Inplaces.Arity15_12.class, new InplaceInfo(15, 11));
+		inplaces.put(Inplaces.Arity15_13.class, new InplaceInfo(15, 12));
+		inplaces.put(Inplaces.Arity15_14.class, new InplaceInfo(15, 13));
+		inplaces.put(Inplaces.Arity15_15.class, new InplaceInfo(15, 14));
+		inplaces.put(Inplaces.Arity16_1.class, new InplaceInfo(16, 0));
+		inplaces.put(Inplaces.Arity16_2.class, new InplaceInfo(16, 1));
+		inplaces.put(Inplaces.Arity16_3.class, new InplaceInfo(16, 2));
+		inplaces.put(Inplaces.Arity16_4.class, new InplaceInfo(16, 3));
+		inplaces.put(Inplaces.Arity16_5.class, new InplaceInfo(16, 4));
+		inplaces.put(Inplaces.Arity16_6.class, new InplaceInfo(16, 5));
+		inplaces.put(Inplaces.Arity16_7.class, new InplaceInfo(16, 6));
+		inplaces.put(Inplaces.Arity16_8.class, new InplaceInfo(16, 7));
+		inplaces.put(Inplaces.Arity16_9.class, new InplaceInfo(16, 8));
+		inplaces.put(Inplaces.Arity16_10.class, new InplaceInfo(16, 9));
+		inplaces.put(Inplaces.Arity16_11.class, new InplaceInfo(16, 10));
+		inplaces.put(Inplaces.Arity16_12.class, new InplaceInfo(16, 11));
+		inplaces.put(Inplaces.Arity16_13.class, new InplaceInfo(16, 12));
+		inplaces.put(Inplaces.Arity16_14.class, new InplaceInfo(16, 13));
+		inplaces.put(Inplaces.Arity16_15.class, new InplaceInfo(16, 14));
+		inplaces.put(Inplaces.Arity16_16.class, new InplaceInfo(16, 15));
+		ALL_INPLACES = Collections.unmodifiableMap(inplaces);
+	}
+
+	/**
+	 * @return {@code true} if the given type is a known
+	 *         inplace type, {@code false} otherwise. <br>
+	 *         Note that only the type itself and not its type hierarchy is
+	 *         considered.
+	 * @throws NullPointerException If {@code c} is {@code null}.
+	 */
+	public static boolean isInplace(Class<?> c) {
+		return ALL_INPLACES.containsKey(c);
+	}
+
+	public static List<Class<?>> getInplacesOfArity(final int arity) {
+		return ALL_INPLACES.entrySet().stream() //
+			.filter(e -> e.getValue().arity() == arity) //
+			.map(Entry<Class<?>, InplaceInfo>::getKey) //
+			.collect(Collectors.toList());
+	}
+
 	@FunctionalInterface
 	public interface Arity1<IO> extends Consumer<IO> {
 
@@ -1329,4 +1500,22 @@ public interface Arity16_16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I
 		void mutate(I1 in1, I2 in2, I3 in3, I4 in4, I5 in5, I6 in6, I7 in7, I8 in8, I9 in9, I10 in10, I11 in11, I12 in12, I13 in13, I14 in14, I15 in15, @Mutable IO io);
 	}
 
+	public static class InplaceInfo {
+
+		private final int arity;
+		private final int mutablePosition;
+
+		public InplaceInfo(final int arity, final int mutablePosition) {
+			this.arity = arity;
+			this.mutablePosition = mutablePosition;
+		}
+
+		public int arity() {
+			return arity;
+		}
+
+		public int mutablePosition() {
+			return mutablePosition;
+		}
+	}
 }
diff --git a/scijava/scijava-function/templates/main/java/org/scijava/function/Computers.vm b/scijava/scijava-function/templates/main/java/org/scijava/function/Computers.vm
index bdf6a1343..491aa5518 100644
--- a/scijava/scijava-function/templates/main/java/org/scijava/function/Computers.vm
+++ b/scijava/scijava-function/templates/main/java/org/scijava/function/Computers.vm
@@ -5,6 +5,7 @@
 
 package org.scijava.function;
 
+import java.util.HashMap;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
@@ -32,6 +33,32 @@ public final class Computers {
 		// NB: Prevent instantiation of utility class.
 	}
 
+	// -- Static Utility Methods -- //
+
+	/**
+	 * All known computer types and their arities. The entries are sorted by
+	 * arity, i.e., the {@code i}-th entry has an arity of {@code i}.
+	 */
+	public static final HashMap<Class<?>, Integer> ALL_COMPUTERS;
+
+	static {
+		ALL_COMPUTERS = new HashMap<>();
+#foreach($arity in $arities)
+		ALL_COMPUTERS.put(Computers.Arity${arity}.class, $arity);
+#end
+	}
+
+	/**
+	 * @return {@code true} if the given type is a known
+	 *         computer type, {@code false} otherwise. <br>
+	 *         Note that only the type itself and not its type hierarchy is
+	 *         considered.
+	 * @throws NullPointerException If {@code c} is {@code null}.
+	 */
+	public static boolean isComputer(Class<?> c) {
+		return ALL_COMPUTERS.containsKey(c);
+	}
+
 #foreach($arity in $arities)
 #set($rawClass = "Arity$arity")
 #set($genericParams = $generics.call($arity))
diff --git a/scijava/scijava-function/templates/main/java/org/scijava/function/Functions.vm b/scijava/scijava-function/templates/main/java/org/scijava/function/Functions.vm
index 4121de4a8..321a7e627 100644
--- a/scijava/scijava-function/templates/main/java/org/scijava/function/Functions.vm
+++ b/scijava/scijava-function/templates/main/java/org/scijava/function/Functions.vm
@@ -5,6 +5,7 @@
 
 package org.scijava.function;
 
+import java.util.HashMap;
 import java.util.Objects;
 import java.util.function.BiFunction;
 import java.util.function.Function;
@@ -32,6 +33,30 @@ public final class Functions {
 		// NB: Prevent instantiation of utility class.
 	}
 
+	/**
+	 * All known function types and their arities. The entries are sorted by
+	 * arity, i.e., the {@code i}-th entry has an arity of {@code i}.
+	 */
+	public static final HashMap<Integer, Class<?>> ALL_FUNCTIONS;
+
+	static {
+		ALL_FUNCTIONS = new HashMap<>(10);
+#foreach($arity in [0..$maxArity])
+		ALL_FUNCTIONS.put($arity, ${functionArity.call($arity)}.class);
+#end
+	}
+
+	/**
+	 * @return {@code true} if the given type is a known
+	 *         function type, {@code false} otherwise.<br>
+	 *         Note that only the type itself and not its type hierarchy is
+	 *         considered.
+	 * @throws NullPointerException If {@code c} is {@code null}.
+	 */
+	public static boolean isFunction(Class<?> c) {
+		return ALL_FUNCTIONS.containsValue(c);
+	}
+
 #foreach($arity in $arities)
 	/**
 	 * A ${arity}-arity specialization of {@link Function}.
diff --git a/scijava/scijava-function/templates/main/java/org/scijava/function/Inplaces.vm b/scijava/scijava-function/templates/main/java/org/scijava/function/Inplaces.vm
index 8a06d9074..bd9e47a7b 100644
--- a/scijava/scijava-function/templates/main/java/org/scijava/function/Inplaces.vm
+++ b/scijava/scijava-function/templates/main/java/org/scijava/function/Inplaces.vm
@@ -5,8 +5,14 @@
 
 package org.scijava.function;
 
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 /**
  * Container class for inplace-style functional interfaces at various
@@ -43,6 +49,41 @@ public final class Inplaces {
 		// NB: Prevent instantiation of container class.
 	}
 
+	/**
+	 * All known inplace types and their arities and mutable positions. The
+	 * entries are sorted by arity and mutable position.
+	 */
+	public static final Map<Class<?>, InplaceInfo> ALL_INPLACES;
+
+	static {
+		final Map<Class<?>, InplaceInfo> inplaces = new LinkedHashMap<>(22);
+#foreach($arity in $arities)
+#foreach($a in [1..$arity])
+#set($inplaceIndex = $a - 1)
+		inplaces.put($inplaceClass.call($arity, $a), new InplaceInfo(${arity}, $inplaceIndex));
+#end
+#end
+		ALL_INPLACES = Collections.unmodifiableMap(inplaces);
+	}
+
+	/**
+	 * @return {@code true} if the given type is a known
+	 *         inplace type, {@code false} otherwise. <br>
+	 *         Note that only the type itself and not its type hierarchy is
+	 *         considered.
+	 * @throws NullPointerException If {@code c} is {@code null}.
+	 */
+	public static boolean isInplace(Class<?> c) {
+		return ALL_INPLACES.containsKey(c);
+	}
+
+	public static List<Class<?>> getInplacesOfArity(final int arity) {
+		return ALL_INPLACES.entrySet().stream() //
+			.filter(e -> e.getValue().arity() == arity) //
+			.map(Entry<Class<?>, InplaceInfo>::getKey) //
+			.collect(Collectors.toList());
+	}
+
 	@FunctionalInterface
 	public interface Arity1<IO> extends Consumer<IO> {
 
@@ -80,4 +121,22 @@ public final class Inplaces {
 
 #end
 #end
+	public static class InplaceInfo {
+
+		private final int arity;
+		private final int mutablePosition;
+
+		public InplaceInfo(final int arity, final int mutablePosition) {
+			this.arity = arity;
+			this.mutablePosition = mutablePosition;
+		}
+
+		public int arity() {
+			return arity;
+		}
+
+		public int mutablePosition() {
+			return mutablePosition;
+		}
+	}
 }
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/ComputerUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/ComputerUtils.java
index 2f64c817a..1fb5af9be 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/ComputerUtils.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/ComputerUtils.java
@@ -5,12 +5,7 @@
 
 package org.scijava.ops.util;
 
-import com.google.common.collect.BiMap;
-import com.google.common.collect.ImmutableBiMap;
-
 import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.function.Consumer;
 
 import org.scijava.function.Computers;
@@ -43,45 +38,6 @@ private ComputerUtils() {
 		// NB: Prevent instantiation of utility class.
 	}
 
-	/**
-	 * All known computer types and their arities. The entries are sorted by
-	 * arity, i.e., the {@code i}-th entry has an arity of {@code i}.
-	 */
-	public static final BiMap<Class<?>, Integer> ALL_COMPUTERS;
-
-	static {
-		final Map<Class<?>, Integer> computers = new HashMap<>();
-		computers.put(Computers.Arity0.class, 0);
-		computers.put(Computers.Arity1.class, 1);
-		computers.put(Computers.Arity2.class, 2);
-		computers.put(Computers.Arity3.class, 3);
-		computers.put(Computers.Arity4.class, 4);
-		computers.put(Computers.Arity5.class, 5);
-		computers.put(Computers.Arity6.class, 6);
-		computers.put(Computers.Arity7.class, 7);
-		computers.put(Computers.Arity8.class, 8);
-		computers.put(Computers.Arity9.class, 9);
-		computers.put(Computers.Arity10.class, 10);
-		computers.put(Computers.Arity11.class, 11);
-		computers.put(Computers.Arity12.class, 12);
-		computers.put(Computers.Arity13.class, 13);
-		computers.put(Computers.Arity14.class, 14);
-		computers.put(Computers.Arity15.class, 15);
-		computers.put(Computers.Arity16.class, 16);
-		ALL_COMPUTERS = ImmutableBiMap.copyOf(computers);
-	}
-
-	/**
-	 * @return {@code true} if the given type is a {@link #ALL_COMPUTERS known}
-	 *         computer type, {@code false} otherwise. <br>
-	 *         Note that only the type itself and not its type hierarchy is
-	 *         considered.
-	 * @throws NullPointerException If {@code type} is {@code null}.
-	 */
-	public static boolean isComputer(Type type) {
-		return ALL_COMPUTERS.containsKey(Types.raw(type));
-	}
-
 	@SuppressWarnings("unchecked")
 	public static <O> Computers.Arity0<O> match(final OpEnvironment env, final String opName, final Nil<O> outType)
 	{
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/FunctionUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/FunctionUtils.java
index 60eaed736..f2c02f715 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/FunctionUtils.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/FunctionUtils.java
@@ -5,11 +5,7 @@
 
 package org.scijava.ops.util;
 
-import com.google.common.collect.BiMap;
-import com.google.common.collect.ImmutableBiMap;
-
 import java.lang.reflect.Type;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.function.BiFunction;
 import java.util.function.Function;
@@ -33,45 +29,6 @@ private FunctionUtils() {
 		// NB: Prevent instantiation of utility class.
 	}
 
-	/**
-	 * All known function types and their arities. The entries are sorted by
-	 * arity, i.e., the {@code i}-th entry has an arity of {@code i}.
-	 */
-	public static final BiMap<Integer, Class<?>> ALL_FUNCTIONS;
-
-	static {
-		final Map<Integer, Class<?>> functions = new HashMap<>(10);
-		functions.put(0, Producer.class);
-		functions.put(1, Function.class);
-		functions.put(2, BiFunction.class);
-		functions.put(3, Functions.Arity3.class);
-		functions.put(4, Functions.Arity4.class);
-		functions.put(5, Functions.Arity5.class);
-		functions.put(6, Functions.Arity6.class);
-		functions.put(7, Functions.Arity7.class);
-		functions.put(8, Functions.Arity8.class);
-		functions.put(9, Functions.Arity9.class);
-		functions.put(10, Functions.Arity10.class);
-		functions.put(11, Functions.Arity11.class);
-		functions.put(12, Functions.Arity12.class);
-		functions.put(13, Functions.Arity13.class);
-		functions.put(14, Functions.Arity14.class);
-		functions.put(15, Functions.Arity15.class);
-		functions.put(16, Functions.Arity16.class);
-		ALL_FUNCTIONS = ImmutableBiMap.copyOf(functions);
-	}
-
-	/**
-	 * @return {@code true} if the given type is a {@link #ALL_FUNCTIONS known}
-	 *         function type, {@code false} otherwise.<br>
-	 *         Note that only the type itself and not its type hierarchy is
-	 *         considered.
-	 * @throws NullPointerException If {@code type} is {@code null}.
-	 */
-	public static boolean isFunction(Type type) {
-		return ALL_FUNCTIONS.containsValue(Types.raw(type));
-	}
-
 	@SuppressWarnings({ "unchecked" })
 	public static <O> Producer<O> match(final OpEnvironment env, final String opName, final Nil<O> outType)
 	{
@@ -280,8 +237,11 @@ public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15,
 	public static <O, T> Functions.ArityN<O> matchN(final OpEnvironment env,
 		final String opName, final Nil<O> outType, final Nil<?>... inTypes)
 	{
-		Object op = matchHelper(env, opName, ALL_FUNCTIONS.get(inTypes.length),
-			outType, inTypes);
+		Map.Entry<Integer, Class<?>> c = Functions.ALL_FUNCTIONS //
+			.entrySet().stream() //
+			.filter(e -> e.getKey() == inTypes.length) //
+			.findAny().get();
+		Object op = matchHelper(env, opName, c.getValue(), outType, inTypes);
 		if (op instanceof Producer) {
 			return Functions.nary((Producer<O>) op);
 		}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java
index 40dc9b1ee..01a8be4e2 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java
@@ -6,18 +6,15 @@
 package org.scijava.ops.util;
 
 import java.lang.reflect.Type;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 
+import org.scijava.function.Computers;
+import org.scijava.function.Consumers;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Mutable;
-import org.scijava.ops.OpEnvironment;
+import org.scijava.function.Producer;
 import org.scijava.ops.Hints;
+import org.scijava.ops.OpEnvironment;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
 
@@ -56,170 +53,6 @@ private InplaceUtils() {
 		// NB: Prevent instantiation of container class.
 	}
 
-	/**
-	 * All known inplace types and their arities and mutable positions. The
-	 * entries are sorted by arity and mutable position.
-	 */
-	public static final Map<Class<?>, InplaceInfo> ALL_INPLACES;
-
-	static {
-		final Map<Class<?>, InplaceInfo> inplaces = new LinkedHashMap<>(22);
-		inplaces.put(Inplaces.Arity1.class, new InplaceInfo(1, 0));
-		inplaces.put(Inplaces.Arity2_1.class, new InplaceInfo(2, 0));
-		inplaces.put(Inplaces.Arity2_2.class, new InplaceInfo(2, 1));
-		inplaces.put(Inplaces.Arity3_1.class, new InplaceInfo(3, 0));
-		inplaces.put(Inplaces.Arity3_2.class, new InplaceInfo(3, 1));
-		inplaces.put(Inplaces.Arity3_3.class, new InplaceInfo(3, 2));
-		inplaces.put(Inplaces.Arity4_1.class, new InplaceInfo(4, 0));
-		inplaces.put(Inplaces.Arity4_2.class, new InplaceInfo(4, 1));
-		inplaces.put(Inplaces.Arity4_3.class, new InplaceInfo(4, 2));
-		inplaces.put(Inplaces.Arity4_4.class, new InplaceInfo(4, 3));
-		inplaces.put(Inplaces.Arity5_1.class, new InplaceInfo(5, 0));
-		inplaces.put(Inplaces.Arity5_2.class, new InplaceInfo(5, 1));
-		inplaces.put(Inplaces.Arity5_3.class, new InplaceInfo(5, 2));
-		inplaces.put(Inplaces.Arity5_4.class, new InplaceInfo(5, 3));
-		inplaces.put(Inplaces.Arity5_5.class, new InplaceInfo(5, 4));
-		inplaces.put(Inplaces.Arity6_1.class, new InplaceInfo(6, 0));
-		inplaces.put(Inplaces.Arity6_2.class, new InplaceInfo(6, 1));
-		inplaces.put(Inplaces.Arity6_3.class, new InplaceInfo(6, 2));
-		inplaces.put(Inplaces.Arity6_4.class, new InplaceInfo(6, 3));
-		inplaces.put(Inplaces.Arity6_5.class, new InplaceInfo(6, 4));
-		inplaces.put(Inplaces.Arity6_6.class, new InplaceInfo(6, 5));
-		inplaces.put(Inplaces.Arity7_1.class, new InplaceInfo(7, 0));
-		inplaces.put(Inplaces.Arity7_2.class, new InplaceInfo(7, 1));
-		inplaces.put(Inplaces.Arity7_3.class, new InplaceInfo(7, 2));
-		inplaces.put(Inplaces.Arity7_4.class, new InplaceInfo(7, 3));
-		inplaces.put(Inplaces.Arity7_5.class, new InplaceInfo(7, 4));
-		inplaces.put(Inplaces.Arity7_6.class, new InplaceInfo(7, 5));
-		inplaces.put(Inplaces.Arity7_7.class, new InplaceInfo(7, 6));
-		inplaces.put(Inplaces.Arity8_1.class, new InplaceInfo(8, 0));
-		inplaces.put(Inplaces.Arity8_2.class, new InplaceInfo(8, 1));
-		inplaces.put(Inplaces.Arity8_3.class, new InplaceInfo(8, 2));
-		inplaces.put(Inplaces.Arity8_4.class, new InplaceInfo(8, 3));
-		inplaces.put(Inplaces.Arity8_5.class, new InplaceInfo(8, 4));
-		inplaces.put(Inplaces.Arity8_6.class, new InplaceInfo(8, 5));
-		inplaces.put(Inplaces.Arity8_7.class, new InplaceInfo(8, 6));
-		inplaces.put(Inplaces.Arity8_8.class, new InplaceInfo(8, 7));
-		inplaces.put(Inplaces.Arity9_1.class, new InplaceInfo(9, 0));
-		inplaces.put(Inplaces.Arity9_2.class, new InplaceInfo(9, 1));
-		inplaces.put(Inplaces.Arity9_3.class, new InplaceInfo(9, 2));
-		inplaces.put(Inplaces.Arity9_4.class, new InplaceInfo(9, 3));
-		inplaces.put(Inplaces.Arity9_5.class, new InplaceInfo(9, 4));
-		inplaces.put(Inplaces.Arity9_6.class, new InplaceInfo(9, 5));
-		inplaces.put(Inplaces.Arity9_7.class, new InplaceInfo(9, 6));
-		inplaces.put(Inplaces.Arity9_8.class, new InplaceInfo(9, 7));
-		inplaces.put(Inplaces.Arity9_9.class, new InplaceInfo(9, 8));
-		inplaces.put(Inplaces.Arity10_1.class, new InplaceInfo(10, 0));
-		inplaces.put(Inplaces.Arity10_2.class, new InplaceInfo(10, 1));
-		inplaces.put(Inplaces.Arity10_3.class, new InplaceInfo(10, 2));
-		inplaces.put(Inplaces.Arity10_4.class, new InplaceInfo(10, 3));
-		inplaces.put(Inplaces.Arity10_5.class, new InplaceInfo(10, 4));
-		inplaces.put(Inplaces.Arity10_6.class, new InplaceInfo(10, 5));
-		inplaces.put(Inplaces.Arity10_7.class, new InplaceInfo(10, 6));
-		inplaces.put(Inplaces.Arity10_8.class, new InplaceInfo(10, 7));
-		inplaces.put(Inplaces.Arity10_9.class, new InplaceInfo(10, 8));
-		inplaces.put(Inplaces.Arity10_10.class, new InplaceInfo(10, 9));
-		inplaces.put(Inplaces.Arity11_1.class, new InplaceInfo(11, 0));
-		inplaces.put(Inplaces.Arity11_2.class, new InplaceInfo(11, 1));
-		inplaces.put(Inplaces.Arity11_3.class, new InplaceInfo(11, 2));
-		inplaces.put(Inplaces.Arity11_4.class, new InplaceInfo(11, 3));
-		inplaces.put(Inplaces.Arity11_5.class, new InplaceInfo(11, 4));
-		inplaces.put(Inplaces.Arity11_6.class, new InplaceInfo(11, 5));
-		inplaces.put(Inplaces.Arity11_7.class, new InplaceInfo(11, 6));
-		inplaces.put(Inplaces.Arity11_8.class, new InplaceInfo(11, 7));
-		inplaces.put(Inplaces.Arity11_9.class, new InplaceInfo(11, 8));
-		inplaces.put(Inplaces.Arity11_10.class, new InplaceInfo(11, 9));
-		inplaces.put(Inplaces.Arity11_11.class, new InplaceInfo(11, 10));
-		inplaces.put(Inplaces.Arity12_1.class, new InplaceInfo(12, 0));
-		inplaces.put(Inplaces.Arity12_2.class, new InplaceInfo(12, 1));
-		inplaces.put(Inplaces.Arity12_3.class, new InplaceInfo(12, 2));
-		inplaces.put(Inplaces.Arity12_4.class, new InplaceInfo(12, 3));
-		inplaces.put(Inplaces.Arity12_5.class, new InplaceInfo(12, 4));
-		inplaces.put(Inplaces.Arity12_6.class, new InplaceInfo(12, 5));
-		inplaces.put(Inplaces.Arity12_7.class, new InplaceInfo(12, 6));
-		inplaces.put(Inplaces.Arity12_8.class, new InplaceInfo(12, 7));
-		inplaces.put(Inplaces.Arity12_9.class, new InplaceInfo(12, 8));
-		inplaces.put(Inplaces.Arity12_10.class, new InplaceInfo(12, 9));
-		inplaces.put(Inplaces.Arity12_11.class, new InplaceInfo(12, 10));
-		inplaces.put(Inplaces.Arity12_12.class, new InplaceInfo(12, 11));
-		inplaces.put(Inplaces.Arity13_1.class, new InplaceInfo(13, 0));
-		inplaces.put(Inplaces.Arity13_2.class, new InplaceInfo(13, 1));
-		inplaces.put(Inplaces.Arity13_3.class, new InplaceInfo(13, 2));
-		inplaces.put(Inplaces.Arity13_4.class, new InplaceInfo(13, 3));
-		inplaces.put(Inplaces.Arity13_5.class, new InplaceInfo(13, 4));
-		inplaces.put(Inplaces.Arity13_6.class, new InplaceInfo(13, 5));
-		inplaces.put(Inplaces.Arity13_7.class, new InplaceInfo(13, 6));
-		inplaces.put(Inplaces.Arity13_8.class, new InplaceInfo(13, 7));
-		inplaces.put(Inplaces.Arity13_9.class, new InplaceInfo(13, 8));
-		inplaces.put(Inplaces.Arity13_10.class, new InplaceInfo(13, 9));
-		inplaces.put(Inplaces.Arity13_11.class, new InplaceInfo(13, 10));
-		inplaces.put(Inplaces.Arity13_12.class, new InplaceInfo(13, 11));
-		inplaces.put(Inplaces.Arity13_13.class, new InplaceInfo(13, 12));
-		inplaces.put(Inplaces.Arity14_1.class, new InplaceInfo(14, 0));
-		inplaces.put(Inplaces.Arity14_2.class, new InplaceInfo(14, 1));
-		inplaces.put(Inplaces.Arity14_3.class, new InplaceInfo(14, 2));
-		inplaces.put(Inplaces.Arity14_4.class, new InplaceInfo(14, 3));
-		inplaces.put(Inplaces.Arity14_5.class, new InplaceInfo(14, 4));
-		inplaces.put(Inplaces.Arity14_6.class, new InplaceInfo(14, 5));
-		inplaces.put(Inplaces.Arity14_7.class, new InplaceInfo(14, 6));
-		inplaces.put(Inplaces.Arity14_8.class, new InplaceInfo(14, 7));
-		inplaces.put(Inplaces.Arity14_9.class, new InplaceInfo(14, 8));
-		inplaces.put(Inplaces.Arity14_10.class, new InplaceInfo(14, 9));
-		inplaces.put(Inplaces.Arity14_11.class, new InplaceInfo(14, 10));
-		inplaces.put(Inplaces.Arity14_12.class, new InplaceInfo(14, 11));
-		inplaces.put(Inplaces.Arity14_13.class, new InplaceInfo(14, 12));
-		inplaces.put(Inplaces.Arity14_14.class, new InplaceInfo(14, 13));
-		inplaces.put(Inplaces.Arity15_1.class, new InplaceInfo(15, 0));
-		inplaces.put(Inplaces.Arity15_2.class, new InplaceInfo(15, 1));
-		inplaces.put(Inplaces.Arity15_3.class, new InplaceInfo(15, 2));
-		inplaces.put(Inplaces.Arity15_4.class, new InplaceInfo(15, 3));
-		inplaces.put(Inplaces.Arity15_5.class, new InplaceInfo(15, 4));
-		inplaces.put(Inplaces.Arity15_6.class, new InplaceInfo(15, 5));
-		inplaces.put(Inplaces.Arity15_7.class, new InplaceInfo(15, 6));
-		inplaces.put(Inplaces.Arity15_8.class, new InplaceInfo(15, 7));
-		inplaces.put(Inplaces.Arity15_9.class, new InplaceInfo(15, 8));
-		inplaces.put(Inplaces.Arity15_10.class, new InplaceInfo(15, 9));
-		inplaces.put(Inplaces.Arity15_11.class, new InplaceInfo(15, 10));
-		inplaces.put(Inplaces.Arity15_12.class, new InplaceInfo(15, 11));
-		inplaces.put(Inplaces.Arity15_13.class, new InplaceInfo(15, 12));
-		inplaces.put(Inplaces.Arity15_14.class, new InplaceInfo(15, 13));
-		inplaces.put(Inplaces.Arity15_15.class, new InplaceInfo(15, 14));
-		inplaces.put(Inplaces.Arity16_1.class, new InplaceInfo(16, 0));
-		inplaces.put(Inplaces.Arity16_2.class, new InplaceInfo(16, 1));
-		inplaces.put(Inplaces.Arity16_3.class, new InplaceInfo(16, 2));
-		inplaces.put(Inplaces.Arity16_4.class, new InplaceInfo(16, 3));
-		inplaces.put(Inplaces.Arity16_5.class, new InplaceInfo(16, 4));
-		inplaces.put(Inplaces.Arity16_6.class, new InplaceInfo(16, 5));
-		inplaces.put(Inplaces.Arity16_7.class, new InplaceInfo(16, 6));
-		inplaces.put(Inplaces.Arity16_8.class, new InplaceInfo(16, 7));
-		inplaces.put(Inplaces.Arity16_9.class, new InplaceInfo(16, 8));
-		inplaces.put(Inplaces.Arity16_10.class, new InplaceInfo(16, 9));
-		inplaces.put(Inplaces.Arity16_11.class, new InplaceInfo(16, 10));
-		inplaces.put(Inplaces.Arity16_12.class, new InplaceInfo(16, 11));
-		inplaces.put(Inplaces.Arity16_13.class, new InplaceInfo(16, 12));
-		inplaces.put(Inplaces.Arity16_14.class, new InplaceInfo(16, 13));
-		inplaces.put(Inplaces.Arity16_15.class, new InplaceInfo(16, 14));
-		inplaces.put(Inplaces.Arity16_16.class, new InplaceInfo(16, 15));
-		ALL_INPLACES = Collections.unmodifiableMap(inplaces);
-	}
-
-	/**
-	 * @return {@code true} if the given type is a {@link #ALL_INPLACES known}
-	 *         inplace type, {@code false} otherwise. <br>
-	 *         Note that only the type itself and not its type hierarchy is
-	 *         considered.
-	 * @throws NullPointerException If {@code type} is {@code null}.
-	 */
-	public static boolean isInplace(Type type) {
-		return ALL_INPLACES.containsKey(Types.raw(type));
-	}
-
-	public static List<Class<?>> getInplacesOfArity(final int arity) {
-		return ALL_INPLACES.entrySet().stream() //
-			.filter(e -> e.getValue().arity() == arity) //
-			.map(Entry<Class<?>, InplaceInfo>::getKey) //
-			.collect(Collectors.toList());
-	}
 
 	@SuppressWarnings({ "unchecked" })
 	public static <IO> Inplaces.Arity1<IO> match(final OpEnvironment env, final String opName, final Nil<IO> ioType)
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.vm
index d01e5ef63..d72c8b4ac 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.vm
@@ -5,12 +5,7 @@
 
 package org.scijava.ops.util;
 
-import com.google.common.collect.BiMap;
-import com.google.common.collect.ImmutableBiMap;
-
 import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.function.Consumer;
 
 import org.scijava.function.Computers;
@@ -43,31 +38,6 @@ public final class ComputerUtils {
 		// NB: Prevent instantiation of utility class.
 	}
 
-	/**
-	 * All known computer types and their arities. The entries are sorted by
-	 * arity, i.e., the {@code i}-th entry has an arity of {@code i}.
-	 */
-	public static final BiMap<Class<?>, Integer> ALL_COMPUTERS;
-
-	static {
-		final Map<Class<?>, Integer> computers = new HashMap<>();
-#foreach($arity in $arities)
-		computers.put(Computers.Arity${arity}.class, $arity);
-#end
-		ALL_COMPUTERS = ImmutableBiMap.copyOf(computers);
-	}
-
-	/**
-	 * @return {@code true} if the given type is a {@link #ALL_COMPUTERS known}
-	 *         computer type, {@code false} otherwise. <br>
-	 *         Note that only the type itself and not its type hierarchy is
-	 *         considered.
-	 * @throws NullPointerException If {@code type} is {@code null}.
-	 */
-	public static boolean isComputer(Type type) {
-		return ALL_COMPUTERS.containsKey(Types.raw(type));
-	}
-
 #foreach($arity in [0..$maxArity])
 	@SuppressWarnings("unchecked")
 	public static $generics.call($arity) $computerArity.call($arity)$generics.call($arity) match(final OpEnvironment env, final String opName, $matchParams.call($arity))
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.vm
index fb28b968e..f0c4061fa 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.vm
@@ -5,11 +5,7 @@
 
 package org.scijava.ops.util;
 
-import com.google.common.collect.BiMap;
-import com.google.common.collect.ImmutableBiMap;
-
 import java.lang.reflect.Type;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.function.BiFunction;
 import java.util.function.Function;
@@ -33,31 +29,6 @@ public final class FunctionUtils {
 		// NB: Prevent instantiation of utility class.
 	}
 
-	/**
-	 * All known function types and their arities. The entries are sorted by
-	 * arity, i.e., the {@code i}-th entry has an arity of {@code i}.
-	 */
-	public static final BiMap<Integer, Class<?>> ALL_FUNCTIONS;
-
-	static {
-		final Map<Integer, Class<?>> functions = new HashMap<>(10);
-#foreach($arity in [0..$maxArity])
-		functions.put($arity, ${functionArity.call($arity)}.class);
-#end
-		ALL_FUNCTIONS = ImmutableBiMap.copyOf(functions);
-	}
-
-	/**
-	 * @return {@code true} if the given type is a {@link #ALL_FUNCTIONS known}
-	 *         function type, {@code false} otherwise.<br>
-	 *         Note that only the type itself and not its type hierarchy is
-	 *         considered.
-	 * @throws NullPointerException If {@code type} is {@code null}.
-	 */
-	public static boolean isFunction(Type type) {
-		return ALL_FUNCTIONS.containsValue(Types.raw(type));
-	}
-
 #foreach($arity in [0..$maxArity])
 	@SuppressWarnings({ "unchecked" })
 	public static $generics.call($arity) $functionArity.call($arity)$generics.call($arity) match(final OpEnvironment env, final String opName, $matchParams.call($arity))
@@ -78,8 +49,11 @@ public final class FunctionUtils {
 	public static <O, T> Functions.ArityN<O> matchN(final OpEnvironment env,
 		final String opName, final Nil<O> outType, final Nil<?>... inTypes)
 	{
-		Object op = matchHelper(env, opName, ALL_FUNCTIONS.get(inTypes.length),
-			outType, inTypes);
+		Map.Entry<Integer, Class<?>> c = Functions.ALL_FUNCTIONS //
+			.entrySet().stream() //
+			.filter(e -> e.getKey() == inTypes.length) //
+			.findAny().get();
+		Object op = matchHelper(env, opName, c.getValue(), outType, inTypes);
 		if (op instanceof Producer) {
 			return Functions.nary((Producer<O>) op);
 		}
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.vm
index 7bacb1459..c3a28c725 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.vm
@@ -6,18 +6,15 @@
 package org.scijava.ops.util;
 
 import java.lang.reflect.Type;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 
+import org.scijava.function.Computers;
+import org.scijava.function.Consumers;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Mutable;
-import org.scijava.ops.OpEnvironment;
+import org.scijava.function.Producer;
 import org.scijava.ops.Hints;
+import org.scijava.ops.OpEnvironment;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
 
@@ -56,40 +53,6 @@ public final class InplaceUtils {
 		// NB: Prevent instantiation of container class.
 	}
 
-	/**
-	 * All known inplace types and their arities and mutable positions. The
-	 * entries are sorted by arity and mutable position.
-	 */
-	public static final Map<Class<?>, InplaceInfo> ALL_INPLACES;
-
-	static {
-		final Map<Class<?>, InplaceInfo> inplaces = new LinkedHashMap<>(22);
-#foreach($arity in $arities)
-#foreach($a in [1..$arity])
-#set($inplaceIndex = $a - 1)
-		inplaces.put($inplaceClass.call($arity, $a), new InplaceInfo(${arity}, $inplaceIndex));
-#end
-#end
-		ALL_INPLACES = Collections.unmodifiableMap(inplaces);
-	}
-
-	/**
-	 * @return {@code true} if the given type is a {@link #ALL_INPLACES known}
-	 *         inplace type, {@code false} otherwise. <br>
-	 *         Note that only the type itself and not its type hierarchy is
-	 *         considered.
-	 * @throws NullPointerException If {@code type} is {@code null}.
-	 */
-	public static boolean isInplace(Type type) {
-		return ALL_INPLACES.containsKey(Types.raw(type));
-	}
-
-	public static List<Class<?>> getInplacesOfArity(final int arity) {
-		return ALL_INPLACES.entrySet().stream() //
-			.filter(e -> e.getValue().arity() == arity) //
-			.map(Entry<Class<?>, InplaceInfo>::getKey) //
-			.collect(Collectors.toList());
-	}
 
 #foreach($arity in $arities)
 #foreach($a in [1..$arity])

From d14c3a67dfb08991f06a339b3741ec1d9cd297a2 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Tue, 29 Jun 2021 15:55:44 -0500
Subject: [PATCH 54/91] WIP: Move fiface utility methods to OpBuilder

---
 .../main/java/org/scijava/ops/OpBuilder.java  | 3678 +++++++++++++----
 .../org/scijava/ops/util/InplaceUtils.java    |  544 +--
 .../scijava/ops/matcher/OpWrappersTest.java   |  342 +-
 .../org/scijava/ops/util/InplacesTest.java    |    6 +-
 .../main/java/org/scijava/ops/OpBuilder.list  |   58 +
 .../main/java/org/scijava/ops/OpBuilder.vm    |  175 +-
 .../org/scijava/ops/util/InplaceUtils.list    |    4 +-
 .../scijava/ops/matcher/OpWrappersTest.list   |    4 +-
 .../org/scijava/ops/matcher/OpWrappersTest.vm |   12 +-
 9 files changed, 3546 insertions(+), 1277 deletions(-)

diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpBuilder.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpBuilder.java
index 141183305..413b5eee5 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpBuilder.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpBuilder.java
@@ -42,11 +42,6 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.Hints;
-import org.scijava.ops.util.ComputerUtils;
-import org.scijava.ops.util.FunctionUtils;
-import org.scijava.ops.util.InplaceUtils;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
 
@@ -508,7 +503,7 @@ public Type getType() {
 		}
 
 		public Computers.Arity0<O> computer() {
-			return ComputerUtils.match(env, opName, outType);
+			return matchComputer(env, opName, outType);
 		}
 
 		public O create() {
@@ -516,7 +511,7 @@ public O create() {
 		}
 
 		public Computers.Arity0<O> computer(Hints hints) {
-			return ComputerUtils.match(env, opName, outType, hints);
+			return matchComputer(env, opName, outType, hints);
 		}
 
 		public O create(Hints hints) {
@@ -540,7 +535,7 @@ public Arity0_OV(final O out) {
 		}
 
 		public Computers.Arity0<O> computer() {
-			return ComputerUtils.match(env, opName, type(out));
+			return matchComputer(env, opName, type(out));
 		}
 
 		public void compute() {
@@ -548,7 +543,7 @@ public void compute() {
 		}
 
 		public Computers.Arity0<O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(out), hints);
+			return matchComputer(env, opName, type(out), hints);
 		}
 
 		public void compute(final Hints hints) {
@@ -576,23 +571,23 @@ public Arity1_IT_OT(final Nil<I1> in1Type, final Nil<O> outType)
 		}
 
 		public Function<I1, O> function() {
-			return FunctionUtils.match(env, opName, in1Type, outType);
+			return matchFunction(env, opName, in1Type, outType);
 		}
 
 		public Function<I1, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, outType, hints);
+			return matchFunction(env, opName, in1Type, outType, hints);
 		}
 
 		public Computers.Arity1<I1, O> computer() {
-			return ComputerUtils.match(env, opName, in1Type, outType);
+			return matchComputer(env, opName, in1Type, outType);
 		}
 
 		public Computers.Arity1<I1, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, in1Type, outType, hints);
+			return matchComputer(env, opName, in1Type, outType, hints);
 		}
 
 		public Inplaces.Arity1<I1> inplace() {
-			return InplaceUtils.match(env, opName, in1Type);
+			return matchInplace(env, opName, in1Type);
 		}
 
 	}
@@ -621,15 +616,15 @@ public <O> Arity1_IT_OT<I1, O> outType(final Nil<O> outType) {
 		}
 
 		public Function<I1, ?> function() {
-			return FunctionUtils.match(env, opName, in1Type, Nil.of(Object.class));
+			return matchFunction(env, opName, in1Type, Nil.of(Object.class));
 		}
 
 		public Function<I1, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, Nil.of(Object.class), hints);
+			return matchFunction(env, opName, in1Type, Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity1<I1> inplace() {
-			return InplaceUtils.match(env, opName, in1Type);
+			return matchInplace(env, opName, in1Type);
 		}
 
 	}
@@ -653,19 +648,19 @@ public Arity1_IV_OT(final I1 in1, final Nil<O> outType)
 		}
 
 		public Function<I1, O> function() {
-			return FunctionUtils.match(env, opName, type(in1), outType);
+			return matchFunction(env, opName, type(in1), outType);
 		}
 	
 		public Function<I1, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), outType, hints);
+			return matchFunction(env, opName, type(in1), outType, hints);
 		}
 	
 		public Computers.Arity1<I1, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), outType);
+			return matchComputer(env, opName, type(in1), outType);
 		}
 
 		public Computers.Arity1<I1, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), outType, hints);
+			return matchComputer(env, opName, type(in1), outType, hints);
 		}
 	
 		public O apply() {
@@ -706,21 +701,21 @@ public <O> Arity1_IV_OT<I1, O> outType(final Nil<O> outType) {
 		}
 
 		public Function<I1, ?> function() {
-			return FunctionUtils.match(env, opName, type(in1), Nil.of(Object.class));
+			return matchFunction(env, opName, type(in1), Nil.of(Object.class));
 		}
 
 		public Function<I1, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), Nil.of(Object.class), hints);
+			return matchFunction(env, opName, type(in1), Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity1<I1> inplace() {
 			checkInplaceRefs(1, in1);
-			return InplaceUtils.match(env, opName, type(in1));
+			return matchInplace(env, opName, type(in1));
 		}
 
 		public Inplaces.Arity1<I1> inplace(final Hints hints) {
 			checkInplaceRefs(1, in1);
-			return InplaceUtils.match(env, opName, type(in1), hints);
+			return matchInplace(env, opName, type(in1), hints);
 		}
 
 		public Object apply() {
@@ -759,7 +754,7 @@ public Arity1_IV_OV(final I1 in1, final O out)
 		}
 
 		public Computers.Arity1<I1, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(out));
+			return matchComputer(env, opName, type(in1), type(out));
 		}
 
 		public void compute() {
@@ -767,7 +762,7 @@ public void compute() {
 		}
 
 		public Computers.Arity1<I1, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(out), hints);
+			return matchComputer(env, opName, type(in1), type(out), hints);
 		}
 
 		public void compute(final Hints hints) {
@@ -775,7 +770,6 @@ public void compute(final Hints hints) {
 		}
 
 	}
-
 	/**
 	 * Builder with arity 2, input type given, output type given.
 	 *
@@ -798,27 +792,27 @@ public Arity2_IT_OT(final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<O> o
 		}
 
 		public BiFunction<I1, I2, O> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, outType);
+			return matchFunction(env, opName, in1Type, in2Type, outType);
 		}
 
 		public BiFunction<I1, I2, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, outType, hints);
+			return matchFunction(env, opName, in1Type, in2Type, outType, hints);
 		}
 
 		public Computers.Arity2<I1, I2, O> computer() {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, outType);
+			return matchComputer(env, opName, in1Type, in2Type, outType);
 		}
 
 		public Computers.Arity2<I1, I2, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, outType, hints);
+			return matchComputer(env, opName, in1Type, in2Type, outType, hints);
 		}
 
 		public Inplaces.Arity2_1<I1, I2> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type);
+			return matchInplace1(env, opName, in1Type, in2Type);
 		}
 
 		public Inplaces.Arity2_2<I1, I2> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type);
+			return matchInplace2(env, opName, in1Type, in2Type);
 		}
 
 	}
@@ -850,19 +844,19 @@ public <O> Arity2_IT_OT<I1, I2, O> outType(final Nil<O> outType) {
 		}
 
 		public BiFunction<I1, I2, ?> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, Nil.of(Object.class));
+			return matchFunction(env, opName, in1Type, in2Type, Nil.of(Object.class));
 		}
 
 		public BiFunction<I1, I2, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, Nil.of(Object.class), hints);
+			return matchFunction(env, opName, in1Type, in2Type, Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity2_1<I1, I2> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type);
+			return matchInplace1(env, opName, in1Type, in2Type);
 		}
 
 		public Inplaces.Arity2_2<I1, I2> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type);
+			return matchInplace2(env, opName, in1Type, in2Type);
 		}
 
 	}
@@ -889,19 +883,19 @@ public Arity2_IV_OT(final I1 in1, final I2 in2, final Nil<O> outType)
 		}
 
 		public BiFunction<I1, I2, O> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), outType);
+			return matchFunction(env, opName, type(in1), type(in2), outType);
 		}
 	
 		public BiFunction<I1, I2, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), outType, hints);
+			return matchFunction(env, opName, type(in1), type(in2), outType, hints);
 		}
 	
 		public Computers.Arity2<I1, I2, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), outType);
+			return matchComputer(env, opName, type(in1), type(in2), outType);
 		}
 
 		public Computers.Arity2<I1, I2, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), outType, hints);
+			return matchComputer(env, opName, type(in1), type(in2), outType, hints);
 		}
 	
 		public O apply() {
@@ -945,31 +939,31 @@ public <O> Arity2_IV_OT<I1, I2, O> outType(final Nil<O> outType) {
 		}
 
 		public BiFunction<I1, I2, ?> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), Nil.of(Object.class));
+			return matchFunction(env, opName, type(in1), type(in2), Nil.of(Object.class));
 		}
 
 		public BiFunction<I1, I2, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), Nil.of(Object.class), hints);
+			return matchFunction(env, opName, type(in1), type(in2), Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity2_1<I1, I2> inplace1() {
 			checkInplaceRefs(1, in1, in2);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2));
+			return matchInplace1(env, opName, type(in1), type(in2));
 		}
 
 		public Inplaces.Arity2_2<I1, I2> inplace2() {
 			checkInplaceRefs(2, in1, in2);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2));
+			return matchInplace2(env, opName, type(in1), type(in2));
 		}
 
 		public Inplaces.Arity2_1<I1, I2> inplace1(final Hints hints) {
 			checkInplaceRefs(1, in1, in2);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), hints);
+			return matchInplace1(env, opName, type(in1), type(in2), hints);
 		}
 
 		public Inplaces.Arity2_2<I1, I2> inplace2(final Hints hints) {
 			checkInplaceRefs(2, in1, in2);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), hints);
+			return matchInplace2(env, opName, type(in1), type(in2), hints);
 		}
 
 		public Object apply() {
@@ -1019,7 +1013,7 @@ public Arity2_IV_OV(final I1 in1, final I2 in2, final O out)
 		}
 
 		public Computers.Arity2<I1, I2, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(out));
+			return matchComputer(env, opName, type(in1), type(in2), type(out));
 		}
 
 		public void compute() {
@@ -1027,7 +1021,7 @@ public void compute() {
 		}
 
 		public Computers.Arity2<I1, I2, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(out), hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(out), hints);
 		}
 
 		public void compute(final Hints hints) {
@@ -1035,7 +1029,6 @@ public void compute(final Hints hints) {
 		}
 
 	}
-
 	/**
 	 * Builder with arity 3, input type given, output type given.
 	 *
@@ -1061,31 +1054,31 @@ public Arity3_IT_OT(final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3>
 		}
 
 		public Functions.Arity3<I1, I2, I3, O> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, outType);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, outType);
 		}
 
 		public Functions.Arity3<I1, I2, I3, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, outType, hints);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, outType, hints);
 		}
 
 		public Computers.Arity3<I1, I2, I3, O> computer() {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, outType);
+			return matchComputer(env, opName, in1Type, in2Type, in3Type, outType);
 		}
 
 		public Computers.Arity3<I1, I2, I3, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, outType, hints);
+			return matchComputer(env, opName, in1Type, in2Type, in3Type, outType, hints);
 		}
 
 		public Inplaces.Arity3_1<I1, I2, I3> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type);
+			return matchInplace1(env, opName, in1Type, in2Type, in3Type);
 		}
 
 		public Inplaces.Arity3_2<I1, I2, I3> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type);
+			return matchInplace2(env, opName, in1Type, in2Type, in3Type);
 		}
 
 		public Inplaces.Arity3_3<I1, I2, I3> inplace3() {
-			return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type);
+			return matchInplace3(env, opName, in1Type, in2Type, in3Type);
 		}
 
 	}
@@ -1120,23 +1113,23 @@ public <O> Arity3_IT_OT<I1, I2, I3, O> outType(final Nil<O> outType) {
 		}
 
 		public Functions.Arity3<I1, I2, I3, ?> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, Nil.of(Object.class));
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, Nil.of(Object.class));
 		}
 
 		public Functions.Arity3<I1, I2, I3, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, Nil.of(Object.class), hints);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity3_1<I1, I2, I3> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type);
+			return matchInplace1(env, opName, in1Type, in2Type, in3Type);
 		}
 
 		public Inplaces.Arity3_2<I1, I2, I3> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type);
+			return matchInplace2(env, opName, in1Type, in2Type, in3Type);
 		}
 
 		public Inplaces.Arity3_3<I1, I2, I3> inplace3() {
-			return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type);
+			return matchInplace3(env, opName, in1Type, in2Type, in3Type);
 		}
 
 	}
@@ -1166,19 +1159,19 @@ public Arity3_IV_OT(final I1 in1, final I2 in2, final I3 in3, final Nil<O> outTy
 		}
 
 		public Functions.Arity3<I1, I2, I3, O> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), outType);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), outType);
 		}
 	
 		public Functions.Arity3<I1, I2, I3, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), outType, hints);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), outType, hints);
 		}
 	
 		public Computers.Arity3<I1, I2, I3, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), outType);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), outType);
 		}
 
 		public Computers.Arity3<I1, I2, I3, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), outType, hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), outType, hints);
 		}
 	
 		public O apply() {
@@ -1225,41 +1218,41 @@ public <O> Arity3_IV_OT<I1, I2, I3, O> outType(final Nil<O> outType) {
 		}
 
 		public Functions.Arity3<I1, I2, I3, ?> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), Nil.of(Object.class));
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), Nil.of(Object.class));
 		}
 
 		public Functions.Arity3<I1, I2, I3, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), Nil.of(Object.class), hints);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity3_1<I1, I2, I3> inplace1() {
 			checkInplaceRefs(1, in1, in2, in3);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3));
+			return matchInplace1(env, opName, type(in1), type(in2), type(in3));
 		}
 
 		public Inplaces.Arity3_2<I1, I2, I3> inplace2() {
 			checkInplaceRefs(2, in1, in2, in3);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3));
+			return matchInplace2(env, opName, type(in1), type(in2), type(in3));
 		}
 
 		public Inplaces.Arity3_3<I1, I2, I3> inplace3() {
 			checkInplaceRefs(3, in1, in2, in3);
-			return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3));
+			return matchInplace3(env, opName, type(in1), type(in2), type(in3));
 		}
 
 		public Inplaces.Arity3_1<I1, I2, I3> inplace1(final Hints hints) {
 			checkInplaceRefs(1, in1, in2, in3);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), hints);
+			return matchInplace1(env, opName, type(in1), type(in2), type(in3), hints);
 		}
 
 		public Inplaces.Arity3_2<I1, I2, I3> inplace2(final Hints hints) {
 			checkInplaceRefs(2, in1, in2, in3);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), hints);
+			return matchInplace2(env, opName, type(in1), type(in2), type(in3), hints);
 		}
 
 		public Inplaces.Arity3_3<I1, I2, I3> inplace3(final Hints hints) {
 			checkInplaceRefs(3, in1, in2, in3);
-			return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), hints);
+			return matchInplace3(env, opName, type(in1), type(in2), type(in3), hints);
 		}
 
 		public Object apply() {
@@ -1320,7 +1313,7 @@ public Arity3_IV_OV(final I1 in1, final I2 in2, final I3 in3, final O out)
 		}
 
 		public Computers.Arity3<I1, I2, I3, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(out));
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(out));
 		}
 
 		public void compute() {
@@ -1328,7 +1321,7 @@ public void compute() {
 		}
 
 		public Computers.Arity3<I1, I2, I3, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(out), hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(out), hints);
 		}
 
 		public void compute(final Hints hints) {
@@ -1336,7 +1329,6 @@ public void compute(final Hints hints) {
 		}
 
 	}
-
 	/**
 	 * Builder with arity 4, input type given, output type given.
 	 *
@@ -1365,35 +1357,35 @@ public Arity4_IT_OT(final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3>
 		}
 
 		public Functions.Arity4<I1, I2, I3, I4, O> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, outType);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, outType);
 		}
 
 		public Functions.Arity4<I1, I2, I3, I4, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, outType, hints);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, outType, hints);
 		}
 
 		public Computers.Arity4<I1, I2, I3, I4, O> computer() {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, outType);
+			return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, outType);
 		}
 
 		public Computers.Arity4<I1, I2, I3, I4, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, outType, hints);
+			return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, outType, hints);
 		}
 
 		public Inplaces.Arity4_1<I1, I2, I3, I4> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type);
+			return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type);
 		}
 
 		public Inplaces.Arity4_2<I1, I2, I3, I4> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type);
+			return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type);
 		}
 
 		public Inplaces.Arity4_3<I1, I2, I3, I4> inplace3() {
-			return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type);
+			return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type);
 		}
 
 		public Inplaces.Arity4_4<I1, I2, I3, I4> inplace4() {
-			return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type);
+			return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type);
 		}
 
 	}
@@ -1431,27 +1423,27 @@ public <O> Arity4_IT_OT<I1, I2, I3, I4, O> outType(final Nil<O> outType) {
 		}
 
 		public Functions.Arity4<I1, I2, I3, I4, ?> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, Nil.of(Object.class));
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, Nil.of(Object.class));
 		}
 
 		public Functions.Arity4<I1, I2, I3, I4, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, Nil.of(Object.class), hints);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity4_1<I1, I2, I3, I4> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type);
+			return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type);
 		}
 
 		public Inplaces.Arity4_2<I1, I2, I3, I4> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type);
+			return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type);
 		}
 
 		public Inplaces.Arity4_3<I1, I2, I3, I4> inplace3() {
-			return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type);
+			return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type);
 		}
 
 		public Inplaces.Arity4_4<I1, I2, I3, I4> inplace4() {
-			return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type);
+			return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type);
 		}
 
 	}
@@ -1484,19 +1476,19 @@ public Arity4_IV_OT(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fina
 		}
 
 		public Functions.Arity4<I1, I2, I3, I4, O> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), outType);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), outType);
 		}
 	
 		public Functions.Arity4<I1, I2, I3, I4, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), outType, hints);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), outType, hints);
 		}
 	
 		public Computers.Arity4<I1, I2, I3, I4, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), outType);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), outType);
 		}
 
 		public Computers.Arity4<I1, I2, I3, I4, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), outType, hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), outType, hints);
 		}
 	
 		public O apply() {
@@ -1546,51 +1538,51 @@ public <O> Arity4_IV_OT<I1, I2, I3, I4, O> outType(final Nil<O> outType) {
 		}
 
 		public Functions.Arity4<I1, I2, I3, I4, ?> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), Nil.of(Object.class));
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), Nil.of(Object.class));
 		}
 
 		public Functions.Arity4<I1, I2, I3, I4, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), Nil.of(Object.class), hints);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity4_1<I1, I2, I3, I4> inplace1() {
 			checkInplaceRefs(1, in1, in2, in3, in4);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4));
+			return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4));
 		}
 
 		public Inplaces.Arity4_2<I1, I2, I3, I4> inplace2() {
 			checkInplaceRefs(2, in1, in2, in3, in4);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4));
+			return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4));
 		}
 
 		public Inplaces.Arity4_3<I1, I2, I3, I4> inplace3() {
 			checkInplaceRefs(3, in1, in2, in3, in4);
-			return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4));
+			return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4));
 		}
 
 		public Inplaces.Arity4_4<I1, I2, I3, I4> inplace4() {
 			checkInplaceRefs(4, in1, in2, in3, in4);
-			return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4));
+			return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4));
 		}
 
 		public Inplaces.Arity4_1<I1, I2, I3, I4> inplace1(final Hints hints) {
 			checkInplaceRefs(1, in1, in2, in3, in4);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), hints);
+			return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), hints);
 		}
 
 		public Inplaces.Arity4_2<I1, I2, I3, I4> inplace2(final Hints hints) {
 			checkInplaceRefs(2, in1, in2, in3, in4);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), hints);
+			return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), hints);
 		}
 
 		public Inplaces.Arity4_3<I1, I2, I3, I4> inplace3(final Hints hints) {
 			checkInplaceRefs(3, in1, in2, in3, in4);
-			return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), hints);
+			return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), hints);
 		}
 
 		public Inplaces.Arity4_4<I1, I2, I3, I4> inplace4(final Hints hints) {
 			checkInplaceRefs(4, in1, in2, in3, in4);
-			return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), hints);
+			return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), hints);
 		}
 
 		public Object apply() {
@@ -1662,7 +1654,7 @@ public Arity4_IV_OV(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fina
 		}
 
 		public Computers.Arity4<I1, I2, I3, I4, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(out));
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(out));
 		}
 
 		public void compute() {
@@ -1670,7 +1662,7 @@ public void compute() {
 		}
 
 		public Computers.Arity4<I1, I2, I3, I4, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(out), hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(out), hints);
 		}
 
 		public void compute(final Hints hints) {
@@ -1678,7 +1670,6 @@ public void compute(final Hints hints) {
 		}
 
 	}
-
 	/**
 	 * Builder with arity 5, input type given, output type given.
 	 *
@@ -1710,39 +1701,39 @@ public Arity5_IT_OT(final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3>
 		}
 
 		public Functions.Arity5<I1, I2, I3, I4, I5, O> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, outType);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, outType);
 		}
 
 		public Functions.Arity5<I1, I2, I3, I4, I5, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, outType, hints);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, outType, hints);
 		}
 
 		public Computers.Arity5<I1, I2, I3, I4, I5, O> computer() {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, outType);
+			return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, outType);
 		}
 
 		public Computers.Arity5<I1, I2, I3, I4, I5, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, outType, hints);
+			return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, outType, hints);
 		}
 
 		public Inplaces.Arity5_1<I1, I2, I3, I4, I5> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type);
+			return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type);
 		}
 
 		public Inplaces.Arity5_2<I1, I2, I3, I4, I5> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type);
+			return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type);
 		}
 
 		public Inplaces.Arity5_3<I1, I2, I3, I4, I5> inplace3() {
-			return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type);
+			return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type);
 		}
 
 		public Inplaces.Arity5_4<I1, I2, I3, I4, I5> inplace4() {
-			return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type);
+			return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type);
 		}
 
 		public Inplaces.Arity5_5<I1, I2, I3, I4, I5> inplace5() {
-			return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type);
+			return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type);
 		}
 
 	}
@@ -1783,31 +1774,31 @@ public <O> Arity5_IT_OT<I1, I2, I3, I4, I5, O> outType(final Nil<O> outType) {
 		}
 
 		public Functions.Arity5<I1, I2, I3, I4, I5, ?> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, Nil.of(Object.class));
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, Nil.of(Object.class));
 		}
 
 		public Functions.Arity5<I1, I2, I3, I4, I5, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, Nil.of(Object.class), hints);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity5_1<I1, I2, I3, I4, I5> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type);
+			return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type);
 		}
 
 		public Inplaces.Arity5_2<I1, I2, I3, I4, I5> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type);
+			return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type);
 		}
 
 		public Inplaces.Arity5_3<I1, I2, I3, I4, I5> inplace3() {
-			return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type);
+			return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type);
 		}
 
 		public Inplaces.Arity5_4<I1, I2, I3, I4, I5> inplace4() {
-			return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type);
+			return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type);
 		}
 
 		public Inplaces.Arity5_5<I1, I2, I3, I4, I5> inplace5() {
-			return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type);
+			return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type);
 		}
 
 	}
@@ -1843,19 +1834,19 @@ public Arity5_IV_OT(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fina
 		}
 
 		public Functions.Arity5<I1, I2, I3, I4, I5, O> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), outType);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), outType);
 		}
 	
 		public Functions.Arity5<I1, I2, I3, I4, I5, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), outType, hints);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), outType, hints);
 		}
 	
 		public Computers.Arity5<I1, I2, I3, I4, I5, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), outType);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), outType);
 		}
 
 		public Computers.Arity5<I1, I2, I3, I4, I5, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), outType, hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), outType, hints);
 		}
 	
 		public O apply() {
@@ -1908,61 +1899,61 @@ public <O> Arity5_IV_OT<I1, I2, I3, I4, I5, O> outType(final Nil<O> outType) {
 		}
 
 		public Functions.Arity5<I1, I2, I3, I4, I5, ?> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), Nil.of(Object.class));
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), Nil.of(Object.class));
 		}
 
 		public Functions.Arity5<I1, I2, I3, I4, I5, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), Nil.of(Object.class), hints);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity5_1<I1, I2, I3, I4, I5> inplace1() {
 			checkInplaceRefs(1, in1, in2, in3, in4, in5);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5));
+			return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5));
 		}
 
 		public Inplaces.Arity5_2<I1, I2, I3, I4, I5> inplace2() {
 			checkInplaceRefs(2, in1, in2, in3, in4, in5);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5));
+			return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5));
 		}
 
 		public Inplaces.Arity5_3<I1, I2, I3, I4, I5> inplace3() {
 			checkInplaceRefs(3, in1, in2, in3, in4, in5);
-			return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5));
+			return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5));
 		}
 
 		public Inplaces.Arity5_4<I1, I2, I3, I4, I5> inplace4() {
 			checkInplaceRefs(4, in1, in2, in3, in4, in5);
-			return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5));
+			return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5));
 		}
 
 		public Inplaces.Arity5_5<I1, I2, I3, I4, I5> inplace5() {
 			checkInplaceRefs(5, in1, in2, in3, in4, in5);
-			return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5));
+			return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5));
 		}
 
 		public Inplaces.Arity5_1<I1, I2, I3, I4, I5> inplace1(final Hints hints) {
 			checkInplaceRefs(1, in1, in2, in3, in4, in5);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), hints);
+			return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), hints);
 		}
 
 		public Inplaces.Arity5_2<I1, I2, I3, I4, I5> inplace2(final Hints hints) {
 			checkInplaceRefs(2, in1, in2, in3, in4, in5);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), hints);
+			return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), hints);
 		}
 
 		public Inplaces.Arity5_3<I1, I2, I3, I4, I5> inplace3(final Hints hints) {
 			checkInplaceRefs(3, in1, in2, in3, in4, in5);
-			return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), hints);
+			return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), hints);
 		}
 
 		public Inplaces.Arity5_4<I1, I2, I3, I4, I5> inplace4(final Hints hints) {
 			checkInplaceRefs(4, in1, in2, in3, in4, in5);
-			return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), hints);
+			return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), hints);
 		}
 
 		public Inplaces.Arity5_5<I1, I2, I3, I4, I5> inplace5(final Hints hints) {
 			checkInplaceRefs(5, in1, in2, in3, in4, in5);
-			return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), hints);
+			return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), hints);
 		}
 
 		public Object apply() {
@@ -2045,7 +2036,7 @@ public Arity5_IV_OV(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fina
 		}
 
 		public Computers.Arity5<I1, I2, I3, I4, I5, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(out));
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(out));
 		}
 
 		public void compute() {
@@ -2053,7 +2044,7 @@ public void compute() {
 		}
 
 		public Computers.Arity5<I1, I2, I3, I4, I5, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(out), hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(out), hints);
 		}
 
 		public void compute(final Hints hints) {
@@ -2061,7 +2052,6 @@ public void compute(final Hints hints) {
 		}
 
 	}
-
 	/**
 	 * Builder with arity 6, input type given, output type given.
 	 *
@@ -2096,43 +2086,43 @@ public Arity6_IT_OT(final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3>
 		}
 
 		public Functions.Arity6<I1, I2, I3, I4, I5, I6, O> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, outType);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, outType);
 		}
 
 		public Functions.Arity6<I1, I2, I3, I4, I5, I6, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, outType, hints);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, outType, hints);
 		}
 
 		public Computers.Arity6<I1, I2, I3, I4, I5, I6, O> computer() {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, outType);
+			return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, outType);
 		}
 
 		public Computers.Arity6<I1, I2, I3, I4, I5, I6, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, outType, hints);
+			return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, outType, hints);
 		}
 
 		public Inplaces.Arity6_1<I1, I2, I3, I4, I5, I6> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
+			return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
 		}
 
 		public Inplaces.Arity6_2<I1, I2, I3, I4, I5, I6> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
+			return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
 		}
 
 		public Inplaces.Arity6_3<I1, I2, I3, I4, I5, I6> inplace3() {
-			return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
+			return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
 		}
 
 		public Inplaces.Arity6_4<I1, I2, I3, I4, I5, I6> inplace4() {
-			return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
+			return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
 		}
 
 		public Inplaces.Arity6_5<I1, I2, I3, I4, I5, I6> inplace5() {
-			return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
+			return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
 		}
 
 		public Inplaces.Arity6_6<I1, I2, I3, I4, I5, I6> inplace6() {
-			return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
+			return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
 		}
 
 	}
@@ -2176,35 +2166,35 @@ public <O> Arity6_IT_OT<I1, I2, I3, I4, I5, I6, O> outType(final Nil<O> outType)
 		}
 
 		public Functions.Arity6<I1, I2, I3, I4, I5, I6, ?> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, Nil.of(Object.class));
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, Nil.of(Object.class));
 		}
 
 		public Functions.Arity6<I1, I2, I3, I4, I5, I6, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, Nil.of(Object.class), hints);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity6_1<I1, I2, I3, I4, I5, I6> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
+			return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
 		}
 
 		public Inplaces.Arity6_2<I1, I2, I3, I4, I5, I6> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
+			return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
 		}
 
 		public Inplaces.Arity6_3<I1, I2, I3, I4, I5, I6> inplace3() {
-			return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
+			return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
 		}
 
 		public Inplaces.Arity6_4<I1, I2, I3, I4, I5, I6> inplace4() {
-			return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
+			return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
 		}
 
 		public Inplaces.Arity6_5<I1, I2, I3, I4, I5, I6> inplace5() {
-			return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
+			return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
 		}
 
 		public Inplaces.Arity6_6<I1, I2, I3, I4, I5, I6> inplace6() {
-			return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
+			return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
 		}
 
 	}
@@ -2243,19 +2233,19 @@ public Arity6_IV_OT(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fina
 		}
 
 		public Functions.Arity6<I1, I2, I3, I4, I5, I6, O> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), outType);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), outType);
 		}
 	
 		public Functions.Arity6<I1, I2, I3, I4, I5, I6, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), outType, hints);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), outType, hints);
 		}
 	
 		public Computers.Arity6<I1, I2, I3, I4, I5, I6, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), outType);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), outType);
 		}
 
 		public Computers.Arity6<I1, I2, I3, I4, I5, I6, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), outType, hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), outType, hints);
 		}
 	
 		public O apply() {
@@ -2311,71 +2301,71 @@ public <O> Arity6_IV_OT<I1, I2, I3, I4, I5, I6, O> outType(final Nil<O> outType)
 		}
 
 		public Functions.Arity6<I1, I2, I3, I4, I5, I6, ?> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), Nil.of(Object.class));
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), Nil.of(Object.class));
 		}
 
 		public Functions.Arity6<I1, I2, I3, I4, I5, I6, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), Nil.of(Object.class), hints);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity6_1<I1, I2, I3, I4, I5, I6> inplace1() {
 			checkInplaceRefs(1, in1, in2, in3, in4, in5, in6);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6));
+			return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6));
 		}
 
 		public Inplaces.Arity6_2<I1, I2, I3, I4, I5, I6> inplace2() {
 			checkInplaceRefs(2, in1, in2, in3, in4, in5, in6);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6));
+			return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6));
 		}
 
 		public Inplaces.Arity6_3<I1, I2, I3, I4, I5, I6> inplace3() {
 			checkInplaceRefs(3, in1, in2, in3, in4, in5, in6);
-			return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6));
+			return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6));
 		}
 
 		public Inplaces.Arity6_4<I1, I2, I3, I4, I5, I6> inplace4() {
 			checkInplaceRefs(4, in1, in2, in3, in4, in5, in6);
-			return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6));
+			return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6));
 		}
 
 		public Inplaces.Arity6_5<I1, I2, I3, I4, I5, I6> inplace5() {
 			checkInplaceRefs(5, in1, in2, in3, in4, in5, in6);
-			return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6));
+			return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6));
 		}
 
 		public Inplaces.Arity6_6<I1, I2, I3, I4, I5, I6> inplace6() {
 			checkInplaceRefs(6, in1, in2, in3, in4, in5, in6);
-			return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6));
+			return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6));
 		}
 
 		public Inplaces.Arity6_1<I1, I2, I3, I4, I5, I6> inplace1(final Hints hints) {
 			checkInplaceRefs(1, in1, in2, in3, in4, in5, in6);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), hints);
+			return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), hints);
 		}
 
 		public Inplaces.Arity6_2<I1, I2, I3, I4, I5, I6> inplace2(final Hints hints) {
 			checkInplaceRefs(2, in1, in2, in3, in4, in5, in6);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), hints);
+			return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), hints);
 		}
 
 		public Inplaces.Arity6_3<I1, I2, I3, I4, I5, I6> inplace3(final Hints hints) {
 			checkInplaceRefs(3, in1, in2, in3, in4, in5, in6);
-			return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), hints);
+			return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), hints);
 		}
 
 		public Inplaces.Arity6_4<I1, I2, I3, I4, I5, I6> inplace4(final Hints hints) {
 			checkInplaceRefs(4, in1, in2, in3, in4, in5, in6);
-			return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), hints);
+			return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), hints);
 		}
 
 		public Inplaces.Arity6_5<I1, I2, I3, I4, I5, I6> inplace5(final Hints hints) {
 			checkInplaceRefs(5, in1, in2, in3, in4, in5, in6);
-			return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), hints);
+			return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), hints);
 		}
 
 		public Inplaces.Arity6_6<I1, I2, I3, I4, I5, I6> inplace6(final Hints hints) {
 			checkInplaceRefs(6, in1, in2, in3, in4, in5, in6);
-			return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), hints);
+			return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), hints);
 		}
 
 		public Object apply() {
@@ -2469,7 +2459,7 @@ public Arity6_IV_OV(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fina
 		}
 
 		public Computers.Arity6<I1, I2, I3, I4, I5, I6, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(out));
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(out));
 		}
 
 		public void compute() {
@@ -2477,7 +2467,7 @@ public void compute() {
 		}
 
 		public Computers.Arity6<I1, I2, I3, I4, I5, I6, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(out), hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(out), hints);
 		}
 
 		public void compute(final Hints hints) {
@@ -2485,7 +2475,6 @@ public void compute(final Hints hints) {
 		}
 
 	}
-
 	/**
 	 * Builder with arity 7, input type given, output type given.
 	 *
@@ -2523,47 +2512,47 @@ public Arity7_IT_OT(final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3>
 		}
 
 		public Functions.Arity7<I1, I2, I3, I4, I5, I6, I7, O> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, outType);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, outType);
 		}
 
 		public Functions.Arity7<I1, I2, I3, I4, I5, I6, I7, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, outType, hints);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, outType, hints);
 		}
 
 		public Computers.Arity7<I1, I2, I3, I4, I5, I6, I7, O> computer() {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, outType);
+			return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, outType);
 		}
 
 		public Computers.Arity7<I1, I2, I3, I4, I5, I6, I7, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, outType, hints);
+			return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, outType, hints);
 		}
 
 		public Inplaces.Arity7_1<I1, I2, I3, I4, I5, I6, I7> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
+			return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
 		}
 
 		public Inplaces.Arity7_2<I1, I2, I3, I4, I5, I6, I7> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
+			return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
 		}
 
 		public Inplaces.Arity7_3<I1, I2, I3, I4, I5, I6, I7> inplace3() {
-			return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
+			return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
 		}
 
 		public Inplaces.Arity7_4<I1, I2, I3, I4, I5, I6, I7> inplace4() {
-			return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
+			return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
 		}
 
 		public Inplaces.Arity7_5<I1, I2, I3, I4, I5, I6, I7> inplace5() {
-			return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
+			return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
 		}
 
 		public Inplaces.Arity7_6<I1, I2, I3, I4, I5, I6, I7> inplace6() {
-			return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
+			return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
 		}
 
 		public Inplaces.Arity7_7<I1, I2, I3, I4, I5, I6, I7> inplace7() {
-			return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
+			return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
 		}
 
 	}
@@ -2610,39 +2599,39 @@ public <O> Arity7_IT_OT<I1, I2, I3, I4, I5, I6, I7, O> outType(final Nil<O> outT
 		}
 
 		public Functions.Arity7<I1, I2, I3, I4, I5, I6, I7, ?> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, Nil.of(Object.class));
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, Nil.of(Object.class));
 		}
 
 		public Functions.Arity7<I1, I2, I3, I4, I5, I6, I7, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, Nil.of(Object.class), hints);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity7_1<I1, I2, I3, I4, I5, I6, I7> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
+			return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
 		}
 
 		public Inplaces.Arity7_2<I1, I2, I3, I4, I5, I6, I7> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
+			return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
 		}
 
 		public Inplaces.Arity7_3<I1, I2, I3, I4, I5, I6, I7> inplace3() {
-			return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
+			return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
 		}
 
 		public Inplaces.Arity7_4<I1, I2, I3, I4, I5, I6, I7> inplace4() {
-			return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
+			return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
 		}
 
 		public Inplaces.Arity7_5<I1, I2, I3, I4, I5, I6, I7> inplace5() {
-			return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
+			return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
 		}
 
 		public Inplaces.Arity7_6<I1, I2, I3, I4, I5, I6, I7> inplace6() {
-			return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
+			return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
 		}
 
 		public Inplaces.Arity7_7<I1, I2, I3, I4, I5, I6, I7> inplace7() {
-			return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
+			return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
 		}
 
 	}
@@ -2684,19 +2673,19 @@ public Arity7_IV_OT(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fina
 		}
 
 		public Functions.Arity7<I1, I2, I3, I4, I5, I6, I7, O> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), outType);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), outType);
 		}
 	
 		public Functions.Arity7<I1, I2, I3, I4, I5, I6, I7, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), outType, hints);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), outType, hints);
 		}
 	
 		public Computers.Arity7<I1, I2, I3, I4, I5, I6, I7, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), outType);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), outType);
 		}
 
 		public Computers.Arity7<I1, I2, I3, I4, I5, I6, I7, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), outType, hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), outType, hints);
 		}
 	
 		public O apply() {
@@ -2755,81 +2744,81 @@ public <O> Arity7_IV_OT<I1, I2, I3, I4, I5, I6, I7, O> outType(final Nil<O> outT
 		}
 
 		public Functions.Arity7<I1, I2, I3, I4, I5, I6, I7, ?> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), Nil.of(Object.class));
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), Nil.of(Object.class));
 		}
 
 		public Functions.Arity7<I1, I2, I3, I4, I5, I6, I7, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), Nil.of(Object.class), hints);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity7_1<I1, I2, I3, I4, I5, I6, I7> inplace1() {
 			checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7));
+			return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7));
 		}
 
 		public Inplaces.Arity7_2<I1, I2, I3, I4, I5, I6, I7> inplace2() {
 			checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7));
+			return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7));
 		}
 
 		public Inplaces.Arity7_3<I1, I2, I3, I4, I5, I6, I7> inplace3() {
 			checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7);
-			return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7));
+			return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7));
 		}
 
 		public Inplaces.Arity7_4<I1, I2, I3, I4, I5, I6, I7> inplace4() {
 			checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7);
-			return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7));
+			return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7));
 		}
 
 		public Inplaces.Arity7_5<I1, I2, I3, I4, I5, I6, I7> inplace5() {
 			checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7);
-			return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7));
+			return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7));
 		}
 
 		public Inplaces.Arity7_6<I1, I2, I3, I4, I5, I6, I7> inplace6() {
 			checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7);
-			return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7));
+			return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7));
 		}
 
 		public Inplaces.Arity7_7<I1, I2, I3, I4, I5, I6, I7> inplace7() {
 			checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7);
-			return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7));
+			return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7));
 		}
 
 		public Inplaces.Arity7_1<I1, I2, I3, I4, I5, I6, I7> inplace1(final Hints hints) {
 			checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), hints);
+			return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), hints);
 		}
 
 		public Inplaces.Arity7_2<I1, I2, I3, I4, I5, I6, I7> inplace2(final Hints hints) {
 			checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), hints);
+			return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), hints);
 		}
 
 		public Inplaces.Arity7_3<I1, I2, I3, I4, I5, I6, I7> inplace3(final Hints hints) {
 			checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7);
-			return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), hints);
+			return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), hints);
 		}
 
 		public Inplaces.Arity7_4<I1, I2, I3, I4, I5, I6, I7> inplace4(final Hints hints) {
 			checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7);
-			return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), hints);
+			return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), hints);
 		}
 
 		public Inplaces.Arity7_5<I1, I2, I3, I4, I5, I6, I7> inplace5(final Hints hints) {
 			checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7);
-			return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), hints);
+			return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), hints);
 		}
 
 		public Inplaces.Arity7_6<I1, I2, I3, I4, I5, I6, I7> inplace6(final Hints hints) {
 			checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7);
-			return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), hints);
+			return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), hints);
 		}
 
 		public Inplaces.Arity7_7<I1, I2, I3, I4, I5, I6, I7> inplace7(final Hints hints) {
 			checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7);
-			return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), hints);
+			return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), hints);
 		}
 
 		public Object apply() {
@@ -2934,7 +2923,7 @@ public Arity7_IV_OV(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fina
 		}
 
 		public Computers.Arity7<I1, I2, I3, I4, I5, I6, I7, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(out));
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(out));
 		}
 
 		public void compute() {
@@ -2942,7 +2931,7 @@ public void compute() {
 		}
 
 		public Computers.Arity7<I1, I2, I3, I4, I5, I6, I7, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(out), hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(out), hints);
 		}
 
 		public void compute(final Hints hints) {
@@ -2950,7 +2939,6 @@ public void compute(final Hints hints) {
 		}
 
 	}
-
 	/**
 	 * Builder with arity 8, input type given, output type given.
 	 *
@@ -2991,51 +2979,51 @@ public Arity8_IT_OT(final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3>
 		}
 
 		public Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, outType);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, outType);
 		}
 
 		public Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, outType, hints);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, outType, hints);
 		}
 
 		public Computers.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> computer() {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, outType);
+			return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, outType);
 		}
 
 		public Computers.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, outType, hints);
+			return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, outType, hints);
 		}
 
 		public Inplaces.Arity8_1<I1, I2, I3, I4, I5, I6, I7, I8> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
+			return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
 		}
 
 		public Inplaces.Arity8_2<I1, I2, I3, I4, I5, I6, I7, I8> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
+			return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
 		}
 
 		public Inplaces.Arity8_3<I1, I2, I3, I4, I5, I6, I7, I8> inplace3() {
-			return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
+			return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
 		}
 
 		public Inplaces.Arity8_4<I1, I2, I3, I4, I5, I6, I7, I8> inplace4() {
-			return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
+			return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
 		}
 
 		public Inplaces.Arity8_5<I1, I2, I3, I4, I5, I6, I7, I8> inplace5() {
-			return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
+			return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
 		}
 
 		public Inplaces.Arity8_6<I1, I2, I3, I4, I5, I6, I7, I8> inplace6() {
-			return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
+			return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
 		}
 
 		public Inplaces.Arity8_7<I1, I2, I3, I4, I5, I6, I7, I8> inplace7() {
-			return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
+			return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
 		}
 
 		public Inplaces.Arity8_8<I1, I2, I3, I4, I5, I6, I7, I8> inplace8() {
-			return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
+			return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
 		}
 
 	}
@@ -3085,43 +3073,43 @@ public <O> Arity8_IT_OT<I1, I2, I3, I4, I5, I6, I7, I8, O> outType(final Nil<O>
 		}
 
 		public Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, ?> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, Nil.of(Object.class));
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, Nil.of(Object.class));
 		}
 
 		public Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, Nil.of(Object.class), hints);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity8_1<I1, I2, I3, I4, I5, I6, I7, I8> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
+			return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
 		}
 
 		public Inplaces.Arity8_2<I1, I2, I3, I4, I5, I6, I7, I8> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
+			return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
 		}
 
 		public Inplaces.Arity8_3<I1, I2, I3, I4, I5, I6, I7, I8> inplace3() {
-			return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
+			return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
 		}
 
 		public Inplaces.Arity8_4<I1, I2, I3, I4, I5, I6, I7, I8> inplace4() {
-			return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
+			return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
 		}
 
 		public Inplaces.Arity8_5<I1, I2, I3, I4, I5, I6, I7, I8> inplace5() {
-			return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
+			return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
 		}
 
 		public Inplaces.Arity8_6<I1, I2, I3, I4, I5, I6, I7, I8> inplace6() {
-			return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
+			return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
 		}
 
 		public Inplaces.Arity8_7<I1, I2, I3, I4, I5, I6, I7, I8> inplace7() {
-			return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
+			return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
 		}
 
 		public Inplaces.Arity8_8<I1, I2, I3, I4, I5, I6, I7, I8> inplace8() {
-			return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
+			return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
 		}
 
 	}
@@ -3166,19 +3154,19 @@ public Arity8_IV_OT(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fina
 		}
 
 		public Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), outType);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), outType);
 		}
 	
 		public Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), outType, hints);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), outType, hints);
 		}
 	
 		public Computers.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), outType);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), outType);
 		}
 
 		public Computers.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), outType, hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), outType, hints);
 		}
 	
 		public O apply() {
@@ -3240,91 +3228,91 @@ public <O> Arity8_IV_OT<I1, I2, I3, I4, I5, I6, I7, I8, O> outType(final Nil<O>
 		}
 
 		public Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, ?> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), Nil.of(Object.class));
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), Nil.of(Object.class));
 		}
 
 		public Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), Nil.of(Object.class), hints);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity8_1<I1, I2, I3, I4, I5, I6, I7, I8> inplace1() {
 			checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8));
+			return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8));
 		}
 
 		public Inplaces.Arity8_2<I1, I2, I3, I4, I5, I6, I7, I8> inplace2() {
 			checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8));
+			return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8));
 		}
 
 		public Inplaces.Arity8_3<I1, I2, I3, I4, I5, I6, I7, I8> inplace3() {
 			checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8);
-			return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8));
+			return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8));
 		}
 
 		public Inplaces.Arity8_4<I1, I2, I3, I4, I5, I6, I7, I8> inplace4() {
 			checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8);
-			return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8));
+			return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8));
 		}
 
 		public Inplaces.Arity8_5<I1, I2, I3, I4, I5, I6, I7, I8> inplace5() {
 			checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8);
-			return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8));
+			return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8));
 		}
 
 		public Inplaces.Arity8_6<I1, I2, I3, I4, I5, I6, I7, I8> inplace6() {
 			checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8);
-			return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8));
+			return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8));
 		}
 
 		public Inplaces.Arity8_7<I1, I2, I3, I4, I5, I6, I7, I8> inplace7() {
 			checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8);
-			return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8));
+			return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8));
 		}
 
 		public Inplaces.Arity8_8<I1, I2, I3, I4, I5, I6, I7, I8> inplace8() {
 			checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8);
-			return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8));
+			return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8));
 		}
 
 		public Inplaces.Arity8_1<I1, I2, I3, I4, I5, I6, I7, I8> inplace1(final Hints hints) {
 			checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints);
+			return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints);
 		}
 
 		public Inplaces.Arity8_2<I1, I2, I3, I4, I5, I6, I7, I8> inplace2(final Hints hints) {
 			checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints);
+			return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints);
 		}
 
 		public Inplaces.Arity8_3<I1, I2, I3, I4, I5, I6, I7, I8> inplace3(final Hints hints) {
 			checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8);
-			return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints);
+			return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints);
 		}
 
 		public Inplaces.Arity8_4<I1, I2, I3, I4, I5, I6, I7, I8> inplace4(final Hints hints) {
 			checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8);
-			return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints);
+			return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints);
 		}
 
 		public Inplaces.Arity8_5<I1, I2, I3, I4, I5, I6, I7, I8> inplace5(final Hints hints) {
 			checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8);
-			return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints);
+			return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints);
 		}
 
 		public Inplaces.Arity8_6<I1, I2, I3, I4, I5, I6, I7, I8> inplace6(final Hints hints) {
 			checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8);
-			return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints);
+			return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints);
 		}
 
 		public Inplaces.Arity8_7<I1, I2, I3, I4, I5, I6, I7, I8> inplace7(final Hints hints) {
 			checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8);
-			return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints);
+			return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints);
 		}
 
 		public Inplaces.Arity8_8<I1, I2, I3, I4, I5, I6, I7, I8> inplace8(final Hints hints) {
 			checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8);
-			return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints);
+			return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints);
 		}
 
 		public Object apply() {
@@ -3440,7 +3428,7 @@ public Arity8_IV_OV(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fina
 		}
 
 		public Computers.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(out));
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(out));
 		}
 
 		public void compute() {
@@ -3448,7 +3436,7 @@ public void compute() {
 		}
 
 		public Computers.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(out), hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(out), hints);
 		}
 
 		public void compute(final Hints hints) {
@@ -3456,7 +3444,6 @@ public void compute(final Hints hints) {
 		}
 
 	}
-
 	/**
 	 * Builder with arity 9, input type given, output type given.
 	 *
@@ -3500,55 +3487,55 @@ public Arity9_IT_OT(final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3>
 		}
 
 		public Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, outType);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, outType);
 		}
 
 		public Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, outType, hints);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, outType, hints);
 		}
 
 		public Computers.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> computer() {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, outType);
+			return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, outType);
 		}
 
 		public Computers.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, outType, hints);
+			return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, outType, hints);
 		}
 
 		public Inplaces.Arity9_1<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
+			return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
 		}
 
 		public Inplaces.Arity9_2<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
+			return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
 		}
 
 		public Inplaces.Arity9_3<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace3() {
-			return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
+			return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
 		}
 
 		public Inplaces.Arity9_4<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace4() {
-			return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
+			return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
 		}
 
 		public Inplaces.Arity9_5<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace5() {
-			return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
+			return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
 		}
 
 		public Inplaces.Arity9_6<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace6() {
-			return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
+			return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
 		}
 
 		public Inplaces.Arity9_7<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace7() {
-			return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
+			return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
 		}
 
 		public Inplaces.Arity9_8<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace8() {
-			return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
+			return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
 		}
 
 		public Inplaces.Arity9_9<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace9() {
-			return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
+			return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
 		}
 
 	}
@@ -3601,47 +3588,47 @@ public <O> Arity9_IT_OT<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> outType(final Nil
 		}
 
 		public Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, ?> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, Nil.of(Object.class));
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, Nil.of(Object.class));
 		}
 
 		public Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, Nil.of(Object.class), hints);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity9_1<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
+			return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
 		}
 
 		public Inplaces.Arity9_2<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
+			return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
 		}
 
 		public Inplaces.Arity9_3<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace3() {
-			return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
+			return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
 		}
 
 		public Inplaces.Arity9_4<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace4() {
-			return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
+			return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
 		}
 
 		public Inplaces.Arity9_5<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace5() {
-			return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
+			return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
 		}
 
 		public Inplaces.Arity9_6<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace6() {
-			return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
+			return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
 		}
 
 		public Inplaces.Arity9_7<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace7() {
-			return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
+			return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
 		}
 
 		public Inplaces.Arity9_8<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace8() {
-			return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
+			return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
 		}
 
 		public Inplaces.Arity9_9<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace9() {
-			return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
+			return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
 		}
 
 	}
@@ -3689,19 +3676,19 @@ public Arity9_IV_OT(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fina
 		}
 
 		public Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), outType);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), outType);
 		}
 	
 		public Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), outType, hints);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), outType, hints);
 		}
 	
 		public Computers.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), outType);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), outType);
 		}
 
 		public Computers.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), outType, hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), outType, hints);
 		}
 	
 		public O apply() {
@@ -3766,101 +3753,101 @@ public <O> Arity9_IV_OT<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> outType(final Nil
 		}
 
 		public Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, ?> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), Nil.of(Object.class));
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), Nil.of(Object.class));
 		}
 
 		public Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), Nil.of(Object.class), hints);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity9_1<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace1() {
 			checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9));
+			return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9));
 		}
 
 		public Inplaces.Arity9_2<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace2() {
 			checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9));
+			return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9));
 		}
 
 		public Inplaces.Arity9_3<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace3() {
 			checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9);
-			return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9));
+			return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9));
 		}
 
 		public Inplaces.Arity9_4<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace4() {
 			checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9);
-			return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9));
+			return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9));
 		}
 
 		public Inplaces.Arity9_5<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace5() {
 			checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9);
-			return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9));
+			return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9));
 		}
 
 		public Inplaces.Arity9_6<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace6() {
 			checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9);
-			return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9));
+			return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9));
 		}
 
 		public Inplaces.Arity9_7<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace7() {
 			checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9);
-			return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9));
+			return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9));
 		}
 
 		public Inplaces.Arity9_8<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace8() {
 			checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9);
-			return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9));
+			return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9));
 		}
 
 		public Inplaces.Arity9_9<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace9() {
 			checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9);
-			return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9));
+			return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9));
 		}
 
 		public Inplaces.Arity9_1<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace1(final Hints hints) {
 			checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints);
+			return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints);
 		}
 
 		public Inplaces.Arity9_2<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace2(final Hints hints) {
 			checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints);
+			return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints);
 		}
 
 		public Inplaces.Arity9_3<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace3(final Hints hints) {
 			checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9);
-			return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints);
+			return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints);
 		}
 
 		public Inplaces.Arity9_4<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace4(final Hints hints) {
 			checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9);
-			return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints);
+			return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints);
 		}
 
 		public Inplaces.Arity9_5<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace5(final Hints hints) {
 			checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9);
-			return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints);
+			return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints);
 		}
 
 		public Inplaces.Arity9_6<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace6(final Hints hints) {
 			checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9);
-			return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints);
+			return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints);
 		}
 
 		public Inplaces.Arity9_7<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace7(final Hints hints) {
 			checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9);
-			return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints);
+			return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints);
 		}
 
 		public Inplaces.Arity9_8<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace8(final Hints hints) {
 			checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9);
-			return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints);
+			return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints);
 		}
 
 		public Inplaces.Arity9_9<I1, I2, I3, I4, I5, I6, I7, I8, I9> inplace9(final Hints hints) {
 			checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9);
-			return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints);
+			return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints);
 		}
 
 		public Object apply() {
@@ -3987,7 +3974,7 @@ public Arity9_IV_OV(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fina
 		}
 
 		public Computers.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(out));
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(out));
 		}
 
 		public void compute() {
@@ -3995,7 +3982,7 @@ public void compute() {
 		}
 
 		public Computers.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(out), hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(out), hints);
 		}
 
 		public void compute(final Hints hints) {
@@ -4003,7 +3990,6 @@ public void compute(final Hints hints) {
 		}
 
 	}
-
 	/**
 	 * Builder with arity 10, input type given, output type given.
 	 *
@@ -4050,59 +4036,59 @@ public Arity10_IT_OT(final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3>
 		}
 
 		public Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, outType);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, outType);
 		}
 
 		public Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, outType, hints);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, outType, hints);
 		}
 
 		public Computers.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> computer() {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, outType);
+			return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, outType);
 		}
 
 		public Computers.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, outType, hints);
+			return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, outType, hints);
 		}
 
 		public Inplaces.Arity10_1<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
+			return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
 		}
 
 		public Inplaces.Arity10_2<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
+			return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
 		}
 
 		public Inplaces.Arity10_3<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace3() {
-			return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
+			return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
 		}
 
 		public Inplaces.Arity10_4<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace4() {
-			return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
+			return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
 		}
 
 		public Inplaces.Arity10_5<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace5() {
-			return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
+			return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
 		}
 
 		public Inplaces.Arity10_6<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace6() {
-			return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
+			return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
 		}
 
 		public Inplaces.Arity10_7<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace7() {
-			return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
+			return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
 		}
 
 		public Inplaces.Arity10_8<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace8() {
-			return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
+			return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
 		}
 
 		public Inplaces.Arity10_9<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace9() {
-			return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
+			return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
 		}
 
 		public Inplaces.Arity10_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace10() {
-			return InplaceUtils.match10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
+			return matchInplace10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
 		}
 
 	}
@@ -4158,51 +4144,51 @@ public <O> Arity10_IT_OT<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> outType(fin
 		}
 
 		public Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, ?> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, Nil.of(Object.class));
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, Nil.of(Object.class));
 		}
 
 		public Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, Nil.of(Object.class), hints);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity10_1<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
+			return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
 		}
 
 		public Inplaces.Arity10_2<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
+			return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
 		}
 
 		public Inplaces.Arity10_3<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace3() {
-			return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
+			return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
 		}
 
 		public Inplaces.Arity10_4<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace4() {
-			return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
+			return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
 		}
 
 		public Inplaces.Arity10_5<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace5() {
-			return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
+			return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
 		}
 
 		public Inplaces.Arity10_6<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace6() {
-			return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
+			return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
 		}
 
 		public Inplaces.Arity10_7<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace7() {
-			return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
+			return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
 		}
 
 		public Inplaces.Arity10_8<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace8() {
-			return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
+			return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
 		}
 
 		public Inplaces.Arity10_9<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace9() {
-			return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
+			return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
 		}
 
 		public Inplaces.Arity10_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace10() {
-			return InplaceUtils.match10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
+			return matchInplace10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
 		}
 
 	}
@@ -4253,19 +4239,19 @@ public Arity10_IV_OT(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fin
 		}
 
 		public Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), outType);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), outType);
 		}
 	
 		public Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), outType, hints);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), outType, hints);
 		}
 	
 		public Computers.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), outType);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), outType);
 		}
 
 		public Computers.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), outType, hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), outType, hints);
 		}
 	
 		public O apply() {
@@ -4333,111 +4319,111 @@ public <O> Arity10_IV_OT<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> outType(fin
 		}
 
 		public Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, ?> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), Nil.of(Object.class));
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), Nil.of(Object.class));
 		}
 
 		public Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), Nil.of(Object.class), hints);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity10_1<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace1() {
 			checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10));
+			return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10));
 		}
 
 		public Inplaces.Arity10_2<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace2() {
 			checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10));
+			return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10));
 		}
 
 		public Inplaces.Arity10_3<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace3() {
 			checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10);
-			return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10));
+			return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10));
 		}
 
 		public Inplaces.Arity10_4<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace4() {
 			checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10);
-			return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10));
+			return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10));
 		}
 
 		public Inplaces.Arity10_5<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace5() {
 			checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10);
-			return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10));
+			return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10));
 		}
 
 		public Inplaces.Arity10_6<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace6() {
 			checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10);
-			return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10));
+			return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10));
 		}
 
 		public Inplaces.Arity10_7<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace7() {
 			checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10);
-			return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10));
+			return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10));
 		}
 
 		public Inplaces.Arity10_8<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace8() {
 			checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10);
-			return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10));
+			return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10));
 		}
 
 		public Inplaces.Arity10_9<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace9() {
 			checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10);
-			return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10));
+			return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10));
 		}
 
 		public Inplaces.Arity10_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace10() {
 			checkInplaceRefs(10, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10);
-			return InplaceUtils.match10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10));
+			return matchInplace10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10));
 		}
 
 		public Inplaces.Arity10_1<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace1(final Hints hints) {
 			checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints);
+			return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints);
 		}
 
 		public Inplaces.Arity10_2<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace2(final Hints hints) {
 			checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints);
+			return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints);
 		}
 
 		public Inplaces.Arity10_3<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace3(final Hints hints) {
 			checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10);
-			return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints);
+			return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints);
 		}
 
 		public Inplaces.Arity10_4<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace4(final Hints hints) {
 			checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10);
-			return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints);
+			return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints);
 		}
 
 		public Inplaces.Arity10_5<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace5(final Hints hints) {
 			checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10);
-			return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints);
+			return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints);
 		}
 
 		public Inplaces.Arity10_6<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace6(final Hints hints) {
 			checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10);
-			return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints);
+			return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints);
 		}
 
 		public Inplaces.Arity10_7<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace7(final Hints hints) {
 			checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10);
-			return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints);
+			return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints);
 		}
 
 		public Inplaces.Arity10_8<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace8(final Hints hints) {
 			checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10);
-			return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints);
+			return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints);
 		}
 
 		public Inplaces.Arity10_9<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace9(final Hints hints) {
 			checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10);
-			return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints);
+			return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints);
 		}
 
 		public Inplaces.Arity10_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10> inplace10(final Hints hints) {
 			checkInplaceRefs(10, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10);
-			return InplaceUtils.match10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints);
+			return matchInplace10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints);
 		}
 
 		public Object apply() {
@@ -4575,7 +4561,7 @@ public Arity10_IV_OV(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fin
 		}
 
 		public Computers.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(out));
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(out));
 		}
 
 		public void compute() {
@@ -4583,7 +4569,7 @@ public void compute() {
 		}
 
 		public Computers.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(out), hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(out), hints);
 		}
 
 		public void compute(final Hints hints) {
@@ -4591,7 +4577,6 @@ public void compute(final Hints hints) {
 		}
 
 	}
-
 	/**
 	 * Builder with arity 11, input type given, output type given.
 	 *
@@ -4641,63 +4626,63 @@ public Arity11_IT_OT(final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3>
 		}
 
 		public Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, outType);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, outType);
 		}
 
 		public Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, outType, hints);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, outType, hints);
 		}
 
 		public Computers.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> computer() {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, outType);
+			return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, outType);
 		}
 
 		public Computers.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, outType, hints);
+			return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, outType, hints);
 		}
 
 		public Inplaces.Arity11_1<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
+			return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
 		}
 
 		public Inplaces.Arity11_2<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
+			return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
 		}
 
 		public Inplaces.Arity11_3<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace3() {
-			return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
+			return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
 		}
 
 		public Inplaces.Arity11_4<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace4() {
-			return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
+			return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
 		}
 
 		public Inplaces.Arity11_5<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace5() {
-			return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
+			return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
 		}
 
 		public Inplaces.Arity11_6<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace6() {
-			return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
+			return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
 		}
 
 		public Inplaces.Arity11_7<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace7() {
-			return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
+			return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
 		}
 
 		public Inplaces.Arity11_8<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace8() {
-			return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
+			return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
 		}
 
 		public Inplaces.Arity11_9<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace9() {
-			return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
+			return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
 		}
 
 		public Inplaces.Arity11_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace10() {
-			return InplaceUtils.match10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
+			return matchInplace10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
 		}
 
 		public Inplaces.Arity11_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace11() {
-			return InplaceUtils.match11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
+			return matchInplace11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
 		}
 
 	}
@@ -4756,55 +4741,55 @@ public <O> Arity11_IT_OT<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> outTyp
 		}
 
 		public Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, ?> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, Nil.of(Object.class));
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, Nil.of(Object.class));
 		}
 
 		public Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, Nil.of(Object.class), hints);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity11_1<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
+			return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
 		}
 
 		public Inplaces.Arity11_2<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
+			return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
 		}
 
 		public Inplaces.Arity11_3<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace3() {
-			return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
+			return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
 		}
 
 		public Inplaces.Arity11_4<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace4() {
-			return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
+			return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
 		}
 
 		public Inplaces.Arity11_5<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace5() {
-			return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
+			return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
 		}
 
 		public Inplaces.Arity11_6<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace6() {
-			return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
+			return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
 		}
 
 		public Inplaces.Arity11_7<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace7() {
-			return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
+			return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
 		}
 
 		public Inplaces.Arity11_8<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace8() {
-			return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
+			return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
 		}
 
 		public Inplaces.Arity11_9<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace9() {
-			return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
+			return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
 		}
 
 		public Inplaces.Arity11_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace10() {
-			return InplaceUtils.match10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
+			return matchInplace10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
 		}
 
 		public Inplaces.Arity11_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace11() {
-			return InplaceUtils.match11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
+			return matchInplace11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
 		}
 
 	}
@@ -4858,19 +4843,19 @@ public Arity11_IV_OT(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fin
 		}
 
 		public Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), outType);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), outType);
 		}
 	
 		public Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), outType, hints);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), outType, hints);
 		}
 	
 		public Computers.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), outType);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), outType);
 		}
 
 		public Computers.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), outType, hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), outType, hints);
 		}
 	
 		public O apply() {
@@ -4941,121 +4926,121 @@ public <O> Arity11_IV_OT<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> outTyp
 		}
 
 		public Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, ?> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), Nil.of(Object.class));
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), Nil.of(Object.class));
 		}
 
 		public Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), Nil.of(Object.class), hints);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity11_1<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace1() {
 			checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11));
+			return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11));
 		}
 
 		public Inplaces.Arity11_2<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace2() {
 			checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11));
+			return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11));
 		}
 
 		public Inplaces.Arity11_3<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace3() {
 			checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11);
-			return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11));
+			return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11));
 		}
 
 		public Inplaces.Arity11_4<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace4() {
 			checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11);
-			return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11));
+			return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11));
 		}
 
 		public Inplaces.Arity11_5<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace5() {
 			checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11);
-			return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11));
+			return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11));
 		}
 
 		public Inplaces.Arity11_6<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace6() {
 			checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11);
-			return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11));
+			return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11));
 		}
 
 		public Inplaces.Arity11_7<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace7() {
 			checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11);
-			return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11));
+			return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11));
 		}
 
 		public Inplaces.Arity11_8<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace8() {
 			checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11);
-			return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11));
+			return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11));
 		}
 
 		public Inplaces.Arity11_9<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace9() {
 			checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11);
-			return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11));
+			return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11));
 		}
 
 		public Inplaces.Arity11_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace10() {
 			checkInplaceRefs(10, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11);
-			return InplaceUtils.match10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11));
+			return matchInplace10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11));
 		}
 
 		public Inplaces.Arity11_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace11() {
 			checkInplaceRefs(11, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11);
-			return InplaceUtils.match11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11));
+			return matchInplace11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11));
 		}
 
 		public Inplaces.Arity11_1<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace1(final Hints hints) {
 			checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints);
+			return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints);
 		}
 
 		public Inplaces.Arity11_2<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace2(final Hints hints) {
 			checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints);
+			return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints);
 		}
 
 		public Inplaces.Arity11_3<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace3(final Hints hints) {
 			checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11);
-			return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints);
+			return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints);
 		}
 
 		public Inplaces.Arity11_4<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace4(final Hints hints) {
 			checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11);
-			return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints);
+			return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints);
 		}
 
 		public Inplaces.Arity11_5<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace5(final Hints hints) {
 			checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11);
-			return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints);
+			return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints);
 		}
 
 		public Inplaces.Arity11_6<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace6(final Hints hints) {
 			checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11);
-			return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints);
+			return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints);
 		}
 
 		public Inplaces.Arity11_7<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace7(final Hints hints) {
 			checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11);
-			return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints);
+			return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints);
 		}
 
 		public Inplaces.Arity11_8<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace8(final Hints hints) {
 			checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11);
-			return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints);
+			return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints);
 		}
 
 		public Inplaces.Arity11_9<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace9(final Hints hints) {
 			checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11);
-			return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints);
+			return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints);
 		}
 
 		public Inplaces.Arity11_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace10(final Hints hints) {
 			checkInplaceRefs(10, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11);
-			return InplaceUtils.match10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints);
+			return matchInplace10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints);
 		}
 
 		public Inplaces.Arity11_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> inplace11(final Hints hints) {
 			checkInplaceRefs(11, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11);
-			return InplaceUtils.match11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints);
+			return matchInplace11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints);
 		}
 
 		public Object apply() {
@@ -5204,7 +5189,7 @@ public Arity11_IV_OV(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fin
 		}
 
 		public Computers.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(out));
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(out));
 		}
 
 		public void compute() {
@@ -5212,7 +5197,7 @@ public void compute() {
 		}
 
 		public Computers.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(out), hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(out), hints);
 		}
 
 		public void compute(final Hints hints) {
@@ -5220,7 +5205,6 @@ public void compute(final Hints hints) {
 		}
 
 	}
-
 	/**
 	 * Builder with arity 12, input type given, output type given.
 	 *
@@ -5273,67 +5257,67 @@ public Arity12_IT_OT(final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3>
 		}
 
 		public Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, outType);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, outType);
 		}
 
 		public Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, outType, hints);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, outType, hints);
 		}
 
 		public Computers.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> computer() {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, outType);
+			return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, outType);
 		}
 
 		public Computers.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, outType, hints);
+			return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, outType, hints);
 		}
 
 		public Inplaces.Arity12_1<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
+			return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
 		}
 
 		public Inplaces.Arity12_2<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
+			return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
 		}
 
 		public Inplaces.Arity12_3<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace3() {
-			return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
+			return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
 		}
 
 		public Inplaces.Arity12_4<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace4() {
-			return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
+			return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
 		}
 
 		public Inplaces.Arity12_5<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace5() {
-			return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
+			return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
 		}
 
 		public Inplaces.Arity12_6<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace6() {
-			return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
+			return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
 		}
 
 		public Inplaces.Arity12_7<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace7() {
-			return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
+			return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
 		}
 
 		public Inplaces.Arity12_8<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace8() {
-			return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
+			return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
 		}
 
 		public Inplaces.Arity12_9<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace9() {
-			return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
+			return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
 		}
 
 		public Inplaces.Arity12_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace10() {
-			return InplaceUtils.match10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
+			return matchInplace10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
 		}
 
 		public Inplaces.Arity12_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace11() {
-			return InplaceUtils.match11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
+			return matchInplace11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
 		}
 
 		public Inplaces.Arity12_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace12() {
-			return InplaceUtils.match12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
+			return matchInplace12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
 		}
 
 	}
@@ -5395,59 +5379,59 @@ public <O> Arity12_IT_OT<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> o
 		}
 
 		public Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, ?> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, Nil.of(Object.class));
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, Nil.of(Object.class));
 		}
 
 		public Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, Nil.of(Object.class), hints);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity12_1<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
+			return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
 		}
 
 		public Inplaces.Arity12_2<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
+			return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
 		}
 
 		public Inplaces.Arity12_3<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace3() {
-			return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
+			return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
 		}
 
 		public Inplaces.Arity12_4<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace4() {
-			return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
+			return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
 		}
 
 		public Inplaces.Arity12_5<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace5() {
-			return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
+			return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
 		}
 
 		public Inplaces.Arity12_6<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace6() {
-			return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
+			return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
 		}
 
 		public Inplaces.Arity12_7<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace7() {
-			return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
+			return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
 		}
 
 		public Inplaces.Arity12_8<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace8() {
-			return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
+			return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
 		}
 
 		public Inplaces.Arity12_9<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace9() {
-			return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
+			return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
 		}
 
 		public Inplaces.Arity12_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace10() {
-			return InplaceUtils.match10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
+			return matchInplace10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
 		}
 
 		public Inplaces.Arity12_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace11() {
-			return InplaceUtils.match11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
+			return matchInplace11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
 		}
 
 		public Inplaces.Arity12_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace12() {
-			return InplaceUtils.match12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
+			return matchInplace12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
 		}
 
 	}
@@ -5504,19 +5488,19 @@ public Arity12_IV_OT(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fin
 		}
 
 		public Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), outType);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), outType);
 		}
 	
 		public Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), outType, hints);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), outType, hints);
 		}
 	
 		public Computers.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), outType);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), outType);
 		}
 
 		public Computers.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), outType, hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), outType, hints);
 		}
 	
 		public O apply() {
@@ -5590,131 +5574,131 @@ public <O> Arity12_IV_OT<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> o
 		}
 
 		public Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, ?> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), Nil.of(Object.class));
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), Nil.of(Object.class));
 		}
 
 		public Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), Nil.of(Object.class), hints);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity12_1<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace1() {
 			checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12));
+			return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12));
 		}
 
 		public Inplaces.Arity12_2<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace2() {
 			checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12));
+			return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12));
 		}
 
 		public Inplaces.Arity12_3<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace3() {
 			checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12);
-			return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12));
+			return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12));
 		}
 
 		public Inplaces.Arity12_4<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace4() {
 			checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12);
-			return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12));
+			return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12));
 		}
 
 		public Inplaces.Arity12_5<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace5() {
 			checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12);
-			return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12));
+			return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12));
 		}
 
 		public Inplaces.Arity12_6<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace6() {
 			checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12);
-			return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12));
+			return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12));
 		}
 
 		public Inplaces.Arity12_7<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace7() {
 			checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12);
-			return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12));
+			return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12));
 		}
 
 		public Inplaces.Arity12_8<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace8() {
 			checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12);
-			return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12));
+			return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12));
 		}
 
 		public Inplaces.Arity12_9<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace9() {
 			checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12);
-			return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12));
+			return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12));
 		}
 
 		public Inplaces.Arity12_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace10() {
 			checkInplaceRefs(10, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12);
-			return InplaceUtils.match10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12));
+			return matchInplace10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12));
 		}
 
 		public Inplaces.Arity12_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace11() {
 			checkInplaceRefs(11, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12);
-			return InplaceUtils.match11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12));
+			return matchInplace11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12));
 		}
 
 		public Inplaces.Arity12_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace12() {
 			checkInplaceRefs(12, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12);
-			return InplaceUtils.match12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12));
+			return matchInplace12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12));
 		}
 
 		public Inplaces.Arity12_1<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace1(final Hints hints) {
 			checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints);
+			return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints);
 		}
 
 		public Inplaces.Arity12_2<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace2(final Hints hints) {
 			checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints);
+			return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints);
 		}
 
 		public Inplaces.Arity12_3<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace3(final Hints hints) {
 			checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12);
-			return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints);
+			return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints);
 		}
 
 		public Inplaces.Arity12_4<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace4(final Hints hints) {
 			checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12);
-			return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints);
+			return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints);
 		}
 
 		public Inplaces.Arity12_5<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace5(final Hints hints) {
 			checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12);
-			return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints);
+			return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints);
 		}
 
 		public Inplaces.Arity12_6<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace6(final Hints hints) {
 			checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12);
-			return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints);
+			return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints);
 		}
 
 		public Inplaces.Arity12_7<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace7(final Hints hints) {
 			checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12);
-			return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints);
+			return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints);
 		}
 
 		public Inplaces.Arity12_8<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace8(final Hints hints) {
 			checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12);
-			return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints);
+			return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints);
 		}
 
 		public Inplaces.Arity12_9<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace9(final Hints hints) {
 			checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12);
-			return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints);
+			return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints);
 		}
 
 		public Inplaces.Arity12_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace10(final Hints hints) {
 			checkInplaceRefs(10, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12);
-			return InplaceUtils.match10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints);
+			return matchInplace10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints);
 		}
 
 		public Inplaces.Arity12_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace11(final Hints hints) {
 			checkInplaceRefs(11, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12);
-			return InplaceUtils.match11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints);
+			return matchInplace11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints);
 		}
 
 		public Inplaces.Arity12_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> inplace12(final Hints hints) {
 			checkInplaceRefs(12, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12);
-			return InplaceUtils.match12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints);
+			return matchInplace12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints);
 		}
 
 		public Object apply() {
@@ -5874,7 +5858,7 @@ public Arity12_IV_OV(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fin
 		}
 
 		public Computers.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(out));
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(out));
 		}
 
 		public void compute() {
@@ -5882,7 +5866,7 @@ public void compute() {
 		}
 
 		public Computers.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(out), hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(out), hints);
 		}
 
 		public void compute(final Hints hints) {
@@ -5890,7 +5874,6 @@ public void compute(final Hints hints) {
 		}
 
 	}
-
 	/**
 	 * Builder with arity 13, input type given, output type given.
 	 *
@@ -5946,71 +5929,71 @@ public Arity13_IT_OT(final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3>
 		}
 
 		public Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, outType);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, outType);
 		}
 
 		public Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, outType, hints);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, outType, hints);
 		}
 
 		public Computers.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> computer() {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, outType);
+			return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, outType);
 		}
 
 		public Computers.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, outType, hints);
+			return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, outType, hints);
 		}
 
 		public Inplaces.Arity13_1<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+			return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
 		}
 
 		public Inplaces.Arity13_2<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+			return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
 		}
 
 		public Inplaces.Arity13_3<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace3() {
-			return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+			return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
 		}
 
 		public Inplaces.Arity13_4<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace4() {
-			return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+			return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
 		}
 
 		public Inplaces.Arity13_5<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace5() {
-			return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+			return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
 		}
 
 		public Inplaces.Arity13_6<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace6() {
-			return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+			return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
 		}
 
 		public Inplaces.Arity13_7<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace7() {
-			return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+			return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
 		}
 
 		public Inplaces.Arity13_8<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace8() {
-			return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+			return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
 		}
 
 		public Inplaces.Arity13_9<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace9() {
-			return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+			return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
 		}
 
 		public Inplaces.Arity13_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace10() {
-			return InplaceUtils.match10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+			return matchInplace10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
 		}
 
 		public Inplaces.Arity13_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace11() {
-			return InplaceUtils.match11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+			return matchInplace11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
 		}
 
 		public Inplaces.Arity13_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace12() {
-			return InplaceUtils.match12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+			return matchInplace12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
 		}
 
 		public Inplaces.Arity13_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace13() {
-			return InplaceUtils.match13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+			return matchInplace13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
 		}
 
 	}
@@ -6075,63 +6058,63 @@ public <O> Arity13_IT_OT<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 		}
 
 		public Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, ?> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, Nil.of(Object.class));
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, Nil.of(Object.class));
 		}
 
 		public Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, Nil.of(Object.class), hints);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity13_1<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+			return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
 		}
 
 		public Inplaces.Arity13_2<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+			return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
 		}
 
 		public Inplaces.Arity13_3<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace3() {
-			return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+			return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
 		}
 
 		public Inplaces.Arity13_4<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace4() {
-			return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+			return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
 		}
 
 		public Inplaces.Arity13_5<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace5() {
-			return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+			return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
 		}
 
 		public Inplaces.Arity13_6<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace6() {
-			return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+			return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
 		}
 
 		public Inplaces.Arity13_7<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace7() {
-			return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+			return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
 		}
 
 		public Inplaces.Arity13_8<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace8() {
-			return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+			return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
 		}
 
 		public Inplaces.Arity13_9<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace9() {
-			return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+			return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
 		}
 
 		public Inplaces.Arity13_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace10() {
-			return InplaceUtils.match10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+			return matchInplace10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
 		}
 
 		public Inplaces.Arity13_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace11() {
-			return InplaceUtils.match11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+			return matchInplace11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
 		}
 
 		public Inplaces.Arity13_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace12() {
-			return InplaceUtils.match12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+			return matchInplace12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
 		}
 
 		public Inplaces.Arity13_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace13() {
-			return InplaceUtils.match13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+			return matchInplace13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
 		}
 
 	}
@@ -6191,19 +6174,19 @@ public Arity13_IV_OT(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fin
 		}
 
 		public Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), outType);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), outType);
 		}
 	
 		public Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), outType, hints);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), outType, hints);
 		}
 	
 		public Computers.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), outType);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), outType);
 		}
 
 		public Computers.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), outType, hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), outType, hints);
 		}
 	
 		public O apply() {
@@ -6280,141 +6263,141 @@ public <O> Arity13_IV_OT<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 		}
 
 		public Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, ?> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), Nil.of(Object.class));
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), Nil.of(Object.class));
 		}
 
 		public Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), Nil.of(Object.class), hints);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity13_1<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace1() {
 			checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13));
+			return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13));
 		}
 
 		public Inplaces.Arity13_2<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace2() {
 			checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13));
+			return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13));
 		}
 
 		public Inplaces.Arity13_3<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace3() {
 			checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13);
-			return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13));
+			return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13));
 		}
 
 		public Inplaces.Arity13_4<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace4() {
 			checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13);
-			return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13));
+			return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13));
 		}
 
 		public Inplaces.Arity13_5<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace5() {
 			checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13);
-			return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13));
+			return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13));
 		}
 
 		public Inplaces.Arity13_6<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace6() {
 			checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13);
-			return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13));
+			return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13));
 		}
 
 		public Inplaces.Arity13_7<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace7() {
 			checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13);
-			return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13));
+			return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13));
 		}
 
 		public Inplaces.Arity13_8<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace8() {
 			checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13);
-			return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13));
+			return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13));
 		}
 
 		public Inplaces.Arity13_9<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace9() {
 			checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13);
-			return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13));
+			return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13));
 		}
 
 		public Inplaces.Arity13_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace10() {
 			checkInplaceRefs(10, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13);
-			return InplaceUtils.match10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13));
+			return matchInplace10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13));
 		}
 
 		public Inplaces.Arity13_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace11() {
 			checkInplaceRefs(11, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13);
-			return InplaceUtils.match11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13));
+			return matchInplace11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13));
 		}
 
 		public Inplaces.Arity13_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace12() {
 			checkInplaceRefs(12, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13);
-			return InplaceUtils.match12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13));
+			return matchInplace12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13));
 		}
 
 		public Inplaces.Arity13_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace13() {
 			checkInplaceRefs(13, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13);
-			return InplaceUtils.match13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13));
+			return matchInplace13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13));
 		}
 
 		public Inplaces.Arity13_1<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace1(final Hints hints) {
 			checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints);
+			return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints);
 		}
 
 		public Inplaces.Arity13_2<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace2(final Hints hints) {
 			checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints);
+			return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints);
 		}
 
 		public Inplaces.Arity13_3<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace3(final Hints hints) {
 			checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13);
-			return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints);
+			return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints);
 		}
 
 		public Inplaces.Arity13_4<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace4(final Hints hints) {
 			checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13);
-			return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints);
+			return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints);
 		}
 
 		public Inplaces.Arity13_5<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace5(final Hints hints) {
 			checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13);
-			return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints);
+			return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints);
 		}
 
 		public Inplaces.Arity13_6<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace6(final Hints hints) {
 			checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13);
-			return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints);
+			return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints);
 		}
 
 		public Inplaces.Arity13_7<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace7(final Hints hints) {
 			checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13);
-			return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints);
+			return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints);
 		}
 
 		public Inplaces.Arity13_8<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace8(final Hints hints) {
 			checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13);
-			return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints);
+			return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints);
 		}
 
 		public Inplaces.Arity13_9<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace9(final Hints hints) {
 			checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13);
-			return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints);
+			return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints);
 		}
 
 		public Inplaces.Arity13_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace10(final Hints hints) {
 			checkInplaceRefs(10, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13);
-			return InplaceUtils.match10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints);
+			return matchInplace10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints);
 		}
 
 		public Inplaces.Arity13_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace11(final Hints hints) {
 			checkInplaceRefs(11, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13);
-			return InplaceUtils.match11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints);
+			return matchInplace11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints);
 		}
 
 		public Inplaces.Arity13_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace12(final Hints hints) {
 			checkInplaceRefs(12, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13);
-			return InplaceUtils.match12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints);
+			return matchInplace12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints);
 		}
 
 		public Inplaces.Arity13_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> inplace13(final Hints hints) {
 			checkInplaceRefs(13, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13);
-			return InplaceUtils.match13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints);
+			return matchInplace13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints);
 		}
 
 		public Object apply() {
@@ -6585,7 +6568,7 @@ public Arity13_IV_OV(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fin
 		}
 
 		public Computers.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(out));
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(out));
 		}
 
 		public void compute() {
@@ -6593,7 +6576,7 @@ public void compute() {
 		}
 
 		public Computers.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(out), hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(out), hints);
 		}
 
 		public void compute(final Hints hints) {
@@ -6601,7 +6584,6 @@ public void compute(final Hints hints) {
 		}
 
 	}
-
 	/**
 	 * Builder with arity 14, input type given, output type given.
 	 *
@@ -6660,75 +6642,75 @@ public Arity14_IT_OT(final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3>
 		}
 
 		public Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, outType);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, outType);
 		}
 
 		public Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, outType, hints);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, outType, hints);
 		}
 
 		public Computers.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> computer() {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, outType);
+			return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, outType);
 		}
 
 		public Computers.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, outType, hints);
+			return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, outType, hints);
 		}
 
 		public Inplaces.Arity14_1<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+			return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
 		}
 
 		public Inplaces.Arity14_2<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+			return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
 		}
 
 		public Inplaces.Arity14_3<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace3() {
-			return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+			return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
 		}
 
 		public Inplaces.Arity14_4<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace4() {
-			return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+			return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
 		}
 
 		public Inplaces.Arity14_5<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace5() {
-			return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+			return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
 		}
 
 		public Inplaces.Arity14_6<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace6() {
-			return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+			return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
 		}
 
 		public Inplaces.Arity14_7<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace7() {
-			return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+			return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
 		}
 
 		public Inplaces.Arity14_8<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace8() {
-			return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+			return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
 		}
 
 		public Inplaces.Arity14_9<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace9() {
-			return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+			return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
 		}
 
 		public Inplaces.Arity14_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace10() {
-			return InplaceUtils.match10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+			return matchInplace10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
 		}
 
 		public Inplaces.Arity14_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace11() {
-			return InplaceUtils.match11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+			return matchInplace11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
 		}
 
 		public Inplaces.Arity14_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace12() {
-			return InplaceUtils.match12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+			return matchInplace12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
 		}
 
 		public Inplaces.Arity14_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace13() {
-			return InplaceUtils.match13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+			return matchInplace13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
 		}
 
 		public Inplaces.Arity14_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace14() {
-			return InplaceUtils.match14(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+			return matchInplace14(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
 		}
 
 	}
@@ -6796,67 +6778,67 @@ public <O> Arity14_IT_OT<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 		}
 
 		public Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, ?> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, Nil.of(Object.class));
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, Nil.of(Object.class));
 		}
 
 		public Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, Nil.of(Object.class), hints);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity14_1<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+			return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
 		}
 
 		public Inplaces.Arity14_2<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+			return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
 		}
 
 		public Inplaces.Arity14_3<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace3() {
-			return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+			return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
 		}
 
 		public Inplaces.Arity14_4<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace4() {
-			return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+			return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
 		}
 
 		public Inplaces.Arity14_5<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace5() {
-			return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+			return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
 		}
 
 		public Inplaces.Arity14_6<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace6() {
-			return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+			return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
 		}
 
 		public Inplaces.Arity14_7<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace7() {
-			return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+			return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
 		}
 
 		public Inplaces.Arity14_8<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace8() {
-			return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+			return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
 		}
 
 		public Inplaces.Arity14_9<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace9() {
-			return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+			return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
 		}
 
 		public Inplaces.Arity14_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace10() {
-			return InplaceUtils.match10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+			return matchInplace10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
 		}
 
 		public Inplaces.Arity14_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace11() {
-			return InplaceUtils.match11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+			return matchInplace11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
 		}
 
 		public Inplaces.Arity14_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace12() {
-			return InplaceUtils.match12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+			return matchInplace12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
 		}
 
 		public Inplaces.Arity14_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace13() {
-			return InplaceUtils.match13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+			return matchInplace13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
 		}
 
 		public Inplaces.Arity14_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace14() {
-			return InplaceUtils.match14(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+			return matchInplace14(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
 		}
 
 	}
@@ -6919,19 +6901,19 @@ public Arity14_IV_OT(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fin
 		}
 
 		public Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), outType);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), outType);
 		}
 	
 		public Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), outType, hints);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), outType, hints);
 		}
 	
 		public Computers.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), outType);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), outType);
 		}
 
 		public Computers.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), outType, hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), outType, hints);
 		}
 	
 		public O apply() {
@@ -7011,151 +6993,151 @@ public <O> Arity14_IV_OT<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 		}
 
 		public Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, ?> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), Nil.of(Object.class));
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), Nil.of(Object.class));
 		}
 
 		public Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), Nil.of(Object.class), hints);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity14_1<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace1() {
 			checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14));
+			return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14));
 		}
 
 		public Inplaces.Arity14_2<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace2() {
 			checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14));
+			return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14));
 		}
 
 		public Inplaces.Arity14_3<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace3() {
 			checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
-			return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14));
+			return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14));
 		}
 
 		public Inplaces.Arity14_4<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace4() {
 			checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
-			return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14));
+			return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14));
 		}
 
 		public Inplaces.Arity14_5<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace5() {
 			checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
-			return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14));
+			return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14));
 		}
 
 		public Inplaces.Arity14_6<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace6() {
 			checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
-			return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14));
+			return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14));
 		}
 
 		public Inplaces.Arity14_7<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace7() {
 			checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
-			return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14));
+			return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14));
 		}
 
 		public Inplaces.Arity14_8<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace8() {
 			checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
-			return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14));
+			return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14));
 		}
 
 		public Inplaces.Arity14_9<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace9() {
 			checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
-			return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14));
+			return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14));
 		}
 
 		public Inplaces.Arity14_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace10() {
 			checkInplaceRefs(10, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
-			return InplaceUtils.match10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14));
+			return matchInplace10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14));
 		}
 
 		public Inplaces.Arity14_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace11() {
 			checkInplaceRefs(11, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
-			return InplaceUtils.match11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14));
+			return matchInplace11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14));
 		}
 
 		public Inplaces.Arity14_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace12() {
 			checkInplaceRefs(12, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
-			return InplaceUtils.match12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14));
+			return matchInplace12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14));
 		}
 
 		public Inplaces.Arity14_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace13() {
 			checkInplaceRefs(13, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
-			return InplaceUtils.match13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14));
+			return matchInplace13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14));
 		}
 
 		public Inplaces.Arity14_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace14() {
 			checkInplaceRefs(14, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
-			return InplaceUtils.match14(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14));
+			return matchInplace14(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14));
 		}
 
 		public Inplaces.Arity14_1<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace1(final Hints hints) {
 			checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints);
+			return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints);
 		}
 
 		public Inplaces.Arity14_2<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace2(final Hints hints) {
 			checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints);
+			return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints);
 		}
 
 		public Inplaces.Arity14_3<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace3(final Hints hints) {
 			checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
-			return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints);
+			return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints);
 		}
 
 		public Inplaces.Arity14_4<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace4(final Hints hints) {
 			checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
-			return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints);
+			return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints);
 		}
 
 		public Inplaces.Arity14_5<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace5(final Hints hints) {
 			checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
-			return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints);
+			return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints);
 		}
 
 		public Inplaces.Arity14_6<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace6(final Hints hints) {
 			checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
-			return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints);
+			return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints);
 		}
 
 		public Inplaces.Arity14_7<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace7(final Hints hints) {
 			checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
-			return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints);
+			return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints);
 		}
 
 		public Inplaces.Arity14_8<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace8(final Hints hints) {
 			checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
-			return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints);
+			return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints);
 		}
 
 		public Inplaces.Arity14_9<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace9(final Hints hints) {
 			checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
-			return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints);
+			return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints);
 		}
 
 		public Inplaces.Arity14_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace10(final Hints hints) {
 			checkInplaceRefs(10, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
-			return InplaceUtils.match10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints);
+			return matchInplace10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints);
 		}
 
 		public Inplaces.Arity14_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace11(final Hints hints) {
 			checkInplaceRefs(11, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
-			return InplaceUtils.match11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints);
+			return matchInplace11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints);
 		}
 
 		public Inplaces.Arity14_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace12(final Hints hints) {
 			checkInplaceRefs(12, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
-			return InplaceUtils.match12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints);
+			return matchInplace12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints);
 		}
 
 		public Inplaces.Arity14_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace13(final Hints hints) {
 			checkInplaceRefs(13, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
-			return InplaceUtils.match13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints);
+			return matchInplace13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints);
 		}
 
 		public Inplaces.Arity14_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> inplace14(final Hints hints) {
 			checkInplaceRefs(14, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14);
-			return InplaceUtils.match14(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints);
+			return matchInplace14(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints);
 		}
 
 		public Object apply() {
@@ -7337,7 +7319,7 @@ public Arity14_IV_OV(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fin
 		}
 
 		public Computers.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(out));
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(out));
 		}
 
 		public void compute() {
@@ -7345,7 +7327,7 @@ public void compute() {
 		}
 
 		public Computers.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(out), hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(out), hints);
 		}
 
 		public void compute(final Hints hints) {
@@ -7353,7 +7335,6 @@ public void compute(final Hints hints) {
 		}
 
 	}
-
 	/**
 	 * Builder with arity 15, input type given, output type given.
 	 *
@@ -7415,79 +7396,79 @@ public Arity15_IT_OT(final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3>
 		}
 
 		public Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, outType);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, outType);
 		}
 
 		public Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, outType, hints);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, outType, hints);
 		}
 
 		public Computers.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> computer() {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, outType);
+			return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, outType);
 		}
 
 		public Computers.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, outType, hints);
+			return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, outType, hints);
 		}
 
 		public Inplaces.Arity15_1<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 		public Inplaces.Arity15_2<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 		public Inplaces.Arity15_3<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace3() {
-			return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 		public Inplaces.Arity15_4<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace4() {
-			return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 		public Inplaces.Arity15_5<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace5() {
-			return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 		public Inplaces.Arity15_6<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace6() {
-			return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 		public Inplaces.Arity15_7<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace7() {
-			return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 		public Inplaces.Arity15_8<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace8() {
-			return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 		public Inplaces.Arity15_9<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace9() {
-			return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 		public Inplaces.Arity15_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace10() {
-			return InplaceUtils.match10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 		public Inplaces.Arity15_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace11() {
-			return InplaceUtils.match11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 		public Inplaces.Arity15_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace12() {
-			return InplaceUtils.match12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 		public Inplaces.Arity15_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace13() {
-			return InplaceUtils.match13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 		public Inplaces.Arity15_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace14() {
-			return InplaceUtils.match14(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace14(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 		public Inplaces.Arity15_15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace15() {
-			return InplaceUtils.match15(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace15(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 	}
@@ -7558,71 +7539,71 @@ public <O> Arity15_IT_OT<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 		}
 
 		public Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, ?> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, Nil.of(Object.class));
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, Nil.of(Object.class));
 		}
 
 		public Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, Nil.of(Object.class), hints);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity15_1<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 		public Inplaces.Arity15_2<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 		public Inplaces.Arity15_3<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace3() {
-			return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 		public Inplaces.Arity15_4<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace4() {
-			return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 		public Inplaces.Arity15_5<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace5() {
-			return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 		public Inplaces.Arity15_6<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace6() {
-			return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 		public Inplaces.Arity15_7<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace7() {
-			return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 		public Inplaces.Arity15_8<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace8() {
-			return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 		public Inplaces.Arity15_9<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace9() {
-			return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 		public Inplaces.Arity15_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace10() {
-			return InplaceUtils.match10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 		public Inplaces.Arity15_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace11() {
-			return InplaceUtils.match11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 		public Inplaces.Arity15_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace12() {
-			return InplaceUtils.match12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 		public Inplaces.Arity15_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace13() {
-			return InplaceUtils.match13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 		public Inplaces.Arity15_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace14() {
-			return InplaceUtils.match14(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace14(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 		public Inplaces.Arity15_15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace15() {
-			return InplaceUtils.match15(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+			return matchInplace15(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
 		}
 
 	}
@@ -7688,19 +7669,19 @@ public Arity15_IV_OT(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fin
 		}
 
 		public Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), outType);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), outType);
 		}
 	
 		public Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), outType, hints);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), outType, hints);
 		}
 	
 		public Computers.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), outType);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), outType);
 		}
 
 		public Computers.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), outType, hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), outType, hints);
 		}
 	
 		public O apply() {
@@ -7783,161 +7764,161 @@ public <O> Arity15_IV_OT<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 		}
 
 		public Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, ?> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), Nil.of(Object.class));
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), Nil.of(Object.class));
 		}
 
 		public Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), Nil.of(Object.class), hints);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity15_1<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace1() {
 			checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
+			return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
 		}
 
 		public Inplaces.Arity15_2<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace2() {
 			checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
+			return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
 		}
 
 		public Inplaces.Arity15_3<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace3() {
 			checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
+			return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
 		}
 
 		public Inplaces.Arity15_4<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace4() {
 			checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
+			return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
 		}
 
 		public Inplaces.Arity15_5<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace5() {
 			checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
+			return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
 		}
 
 		public Inplaces.Arity15_6<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace6() {
 			checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
+			return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
 		}
 
 		public Inplaces.Arity15_7<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace7() {
 			checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
+			return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
 		}
 
 		public Inplaces.Arity15_8<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace8() {
 			checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
+			return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
 		}
 
 		public Inplaces.Arity15_9<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace9() {
 			checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
+			return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
 		}
 
 		public Inplaces.Arity15_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace10() {
 			checkInplaceRefs(10, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
+			return matchInplace10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
 		}
 
 		public Inplaces.Arity15_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace11() {
 			checkInplaceRefs(11, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
+			return matchInplace11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
 		}
 
 		public Inplaces.Arity15_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace12() {
 			checkInplaceRefs(12, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
+			return matchInplace12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
 		}
 
 		public Inplaces.Arity15_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace13() {
 			checkInplaceRefs(13, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
+			return matchInplace13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
 		}
 
 		public Inplaces.Arity15_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace14() {
 			checkInplaceRefs(14, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match14(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
+			return matchInplace14(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
 		}
 
 		public Inplaces.Arity15_15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace15() {
 			checkInplaceRefs(15, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match15(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
+			return matchInplace15(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15));
 		}
 
 		public Inplaces.Arity15_1<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace1(final Hints hints) {
 			checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
+			return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
 		}
 
 		public Inplaces.Arity15_2<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace2(final Hints hints) {
 			checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
+			return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
 		}
 
 		public Inplaces.Arity15_3<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace3(final Hints hints) {
 			checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
+			return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
 		}
 
 		public Inplaces.Arity15_4<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace4(final Hints hints) {
 			checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
+			return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
 		}
 
 		public Inplaces.Arity15_5<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace5(final Hints hints) {
 			checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
+			return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
 		}
 
 		public Inplaces.Arity15_6<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace6(final Hints hints) {
 			checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
+			return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
 		}
 
 		public Inplaces.Arity15_7<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace7(final Hints hints) {
 			checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
+			return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
 		}
 
 		public Inplaces.Arity15_8<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace8(final Hints hints) {
 			checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
+			return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
 		}
 
 		public Inplaces.Arity15_9<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace9(final Hints hints) {
 			checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
+			return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
 		}
 
 		public Inplaces.Arity15_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace10(final Hints hints) {
 			checkInplaceRefs(10, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
+			return matchInplace10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
 		}
 
 		public Inplaces.Arity15_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace11(final Hints hints) {
 			checkInplaceRefs(11, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
+			return matchInplace11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
 		}
 
 		public Inplaces.Arity15_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace12(final Hints hints) {
 			checkInplaceRefs(12, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
+			return matchInplace12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
 		}
 
 		public Inplaces.Arity15_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace13(final Hints hints) {
 			checkInplaceRefs(13, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
+			return matchInplace13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
 		}
 
 		public Inplaces.Arity15_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace14(final Hints hints) {
 			checkInplaceRefs(14, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match14(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
+			return matchInplace14(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
 		}
 
 		public Inplaces.Arity15_15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> inplace15(final Hints hints) {
 			checkInplaceRefs(15, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15);
-			return InplaceUtils.match15(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
+			return matchInplace15(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints);
 		}
 
 		public Object apply() {
@@ -8130,7 +8111,7 @@ public Arity15_IV_OV(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fin
 		}
 
 		public Computers.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(out));
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(out));
 		}
 
 		public void compute() {
@@ -8138,7 +8119,7 @@ public void compute() {
 		}
 
 		public Computers.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(out), hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(out), hints);
 		}
 
 		public void compute(final Hints hints) {
@@ -8146,7 +8127,6 @@ public void compute(final Hints hints) {
 		}
 
 	}
-
 	/**
 	 * Builder with arity 16, input type given, output type given.
 	 *
@@ -8211,83 +8191,83 @@ public Arity16_IT_OT(final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3>
 		}
 
 		public Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type, outType);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type, outType);
 		}
 
 		public Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type, outType, hints);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type, outType, hints);
 		}
 
 		public Computers.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> computer() {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type, outType);
+			return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type, outType);
 		}
 
 		public Computers.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type, outType, hints);
+			return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type, outType, hints);
 		}
 
 		public Inplaces.Arity16_1<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_2<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_3<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace3() {
-			return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_4<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace4() {
-			return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_5<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace5() {
-			return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_6<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace6() {
-			return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_7<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace7() {
-			return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_8<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace8() {
-			return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_9<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace9() {
-			return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace10() {
-			return InplaceUtils.match10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace11() {
-			return InplaceUtils.match11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace12() {
-			return InplaceUtils.match12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace13() {
-			return InplaceUtils.match13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace14() {
-			return InplaceUtils.match14(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace14(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace15() {
-			return InplaceUtils.match15(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace15(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace16() {
-			return InplaceUtils.match16(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace16(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 	}
@@ -8361,75 +8341,75 @@ public <O> Arity16_IT_OT<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 		}
 
 		public Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, ?> function() {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type, Nil.of(Object.class));
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type, Nil.of(Object.class));
 		}
 
 		public Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type, Nil.of(Object.class), hints);
+			return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type, Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity16_1<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace1() {
-			return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_2<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace2() {
-			return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_3<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace3() {
-			return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_4<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace4() {
-			return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_5<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace5() {
-			return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_6<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace6() {
-			return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_7<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace7() {
-			return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_8<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace8() {
-			return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_9<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace9() {
-			return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace10() {
-			return InplaceUtils.match10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace11() {
-			return InplaceUtils.match11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace12() {
-			return InplaceUtils.match12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace13() {
-			return InplaceUtils.match13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace14() {
-			return InplaceUtils.match14(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace14(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace15() {
-			return InplaceUtils.match15(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace15(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 		public Inplaces.Arity16_16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace16() {
-			return InplaceUtils.match16(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+			return matchInplace16(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
 		}
 
 	}
@@ -8498,19 +8478,19 @@ public Arity16_IV_OT(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fin
 		}
 
 		public Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), outType);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), outType);
 		}
 	
 		public Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), outType, hints);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), outType, hints);
 		}
 	
 		public Computers.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), outType);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), outType);
 		}
 
 		public Computers.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), outType, hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), outType, hints);
 		}
 	
 		public O apply() {
@@ -8596,171 +8576,171 @@ public <O> Arity16_IV_OT<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13,
 		}
 
 		public Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, ?> function() {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), Nil.of(Object.class));
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), Nil.of(Object.class));
 		}
 
 		public Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, ?> function(final Hints hints) {
-			return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), Nil.of(Object.class), hints);
+			return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), Nil.of(Object.class), hints);
 		}
 
 		public Inplaces.Arity16_1<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace1() {
 			checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
+			return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
 		}
 
 		public Inplaces.Arity16_2<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace2() {
 			checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
+			return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
 		}
 
 		public Inplaces.Arity16_3<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace3() {
 			checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
+			return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
 		}
 
 		public Inplaces.Arity16_4<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace4() {
 			checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
+			return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
 		}
 
 		public Inplaces.Arity16_5<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace5() {
 			checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
+			return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
 		}
 
 		public Inplaces.Arity16_6<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace6() {
 			checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
+			return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
 		}
 
 		public Inplaces.Arity16_7<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace7() {
 			checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
+			return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
 		}
 
 		public Inplaces.Arity16_8<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace8() {
 			checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
+			return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
 		}
 
 		public Inplaces.Arity16_9<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace9() {
 			checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
+			return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
 		}
 
 		public Inplaces.Arity16_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace10() {
 			checkInplaceRefs(10, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
+			return matchInplace10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
 		}
 
 		public Inplaces.Arity16_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace11() {
 			checkInplaceRefs(11, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
+			return matchInplace11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
 		}
 
 		public Inplaces.Arity16_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace12() {
 			checkInplaceRefs(12, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
+			return matchInplace12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
 		}
 
 		public Inplaces.Arity16_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace13() {
 			checkInplaceRefs(13, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
+			return matchInplace13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
 		}
 
 		public Inplaces.Arity16_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace14() {
 			checkInplaceRefs(14, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match14(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
+			return matchInplace14(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
 		}
 
 		public Inplaces.Arity16_15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace15() {
 			checkInplaceRefs(15, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match15(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
+			return matchInplace15(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
 		}
 
 		public Inplaces.Arity16_16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace16() {
 			checkInplaceRefs(16, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match16(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
+			return matchInplace16(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16));
 		}
 
 		public Inplaces.Arity16_1<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace1(final Hints hints) {
 			checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
+			return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
 		}
 
 		public Inplaces.Arity16_2<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace2(final Hints hints) {
 			checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
+			return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
 		}
 
 		public Inplaces.Arity16_3<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace3(final Hints hints) {
 			checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
+			return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
 		}
 
 		public Inplaces.Arity16_4<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace4(final Hints hints) {
 			checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
+			return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
 		}
 
 		public Inplaces.Arity16_5<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace5(final Hints hints) {
 			checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
+			return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
 		}
 
 		public Inplaces.Arity16_6<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace6(final Hints hints) {
 			checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
+			return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
 		}
 
 		public Inplaces.Arity16_7<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace7(final Hints hints) {
 			checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
+			return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
 		}
 
 		public Inplaces.Arity16_8<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace8(final Hints hints) {
 			checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
+			return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
 		}
 
 		public Inplaces.Arity16_9<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace9(final Hints hints) {
 			checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
+			return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
 		}
 
 		public Inplaces.Arity16_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace10(final Hints hints) {
 			checkInplaceRefs(10, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
+			return matchInplace10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
 		}
 
 		public Inplaces.Arity16_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace11(final Hints hints) {
 			checkInplaceRefs(11, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
+			return matchInplace11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
 		}
 
 		public Inplaces.Arity16_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace12(final Hints hints) {
 			checkInplaceRefs(12, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
+			return matchInplace12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
 		}
 
 		public Inplaces.Arity16_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace13(final Hints hints) {
 			checkInplaceRefs(13, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
+			return matchInplace13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
 		}
 
 		public Inplaces.Arity16_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace14(final Hints hints) {
 			checkInplaceRefs(14, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match14(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
+			return matchInplace14(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
 		}
 
 		public Inplaces.Arity16_15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace15(final Hints hints) {
 			checkInplaceRefs(15, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match15(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
+			return matchInplace15(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
 		}
 
 		public Inplaces.Arity16_16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> inplace16(final Hints hints) {
 			checkInplaceRefs(16, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16);
-			return InplaceUtils.match16(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
+			return matchInplace16(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints);
 		}
 
 		public Object apply() {
@@ -8964,7 +8944,7 @@ public Arity16_IV_OV(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fin
 		}
 
 		public Computers.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> computer() {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), type(out));
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), type(out));
 		}
 
 		public void compute() {
@@ -8972,7 +8952,7 @@ public void compute() {
 		}
 
 		public Computers.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), type(out), hints);
+			return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), type(out), hints);
 		}
 
 		public void compute(final Hints hints) {
@@ -8981,4 +8961,2118 @@ public void compute(final Hints hints) {
 
 	}
 
+	@SuppressWarnings({ "unchecked" })
+	public static <O> Producer<O> matchFunction(final OpEnvironment env, final String opName, final Nil<O> outType)
+	{
+		return matchFunctionHelper(env, opName, Producer.class, outType);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, O> Function<I1, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<O> outType)
+	{
+		return matchFunctionHelper(env, opName, Function.class, outType, in1Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, O> BiFunction<I1, I2, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<O> outType)
+	{
+		return matchFunctionHelper(env, opName, BiFunction.class, outType, in1Type, in2Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, O> Functions.Arity3<I1, I2, I3, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<O> outType)
+	{
+		return matchFunctionHelper(env, opName, Functions.Arity3.class, outType, in1Type, in2Type, in3Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, O> Functions.Arity4<I1, I2, I3, I4, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<O> outType)
+	{
+		return matchFunctionHelper(env, opName, Functions.Arity4.class, outType, in1Type, in2Type, in3Type, in4Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, O> Functions.Arity5<I1, I2, I3, I4, I5, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<O> outType)
+	{
+		return matchFunctionHelper(env, opName, Functions.Arity5.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, O> Functions.Arity6<I1, I2, I3, I4, I5, I6, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<O> outType)
+	{
+		return matchFunctionHelper(env, opName, Functions.Arity6.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, O> Functions.Arity7<I1, I2, I3, I4, I5, I6, I7, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<O> outType)
+	{
+		return matchFunctionHelper(env, opName, Functions.Arity7.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, O> Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<O> outType)
+	{
+		return matchFunctionHelper(env, opName, Functions.Arity8.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, O> Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<O> outType)
+	{
+		return matchFunctionHelper(env, opName, Functions.Arity9.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<O> outType)
+	{
+		return matchFunctionHelper(env, opName, Functions.Arity10.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<O> outType)
+	{
+		return matchFunctionHelper(env, opName, Functions.Arity11.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<O> outType)
+	{
+		return matchFunctionHelper(env, opName, Functions.Arity12.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<O> outType)
+	{
+		return matchFunctionHelper(env, opName, Functions.Arity13.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<O> outType)
+	{
+		return matchFunctionHelper(env, opName, Functions.Arity14.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<O> outType)
+	{
+		return matchFunctionHelper(env, opName, Functions.Arity15.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Nil<O> outType)
+	{
+		return matchFunctionHelper(env, opName, Functions.Arity16.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <O> Producer<O> matchFunction(final OpEnvironment env, final String opName, final Nil<O> outType, final Hints hints)
+	{
+		return matchFunctionHelper(env, opName, hints, Producer.class, outType);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, O> Function<I1, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchFunctionHelper(env, opName, hints, Function.class, outType, in1Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, O> BiFunction<I1, I2, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchFunctionHelper(env, opName, hints, BiFunction.class, outType, in1Type, in2Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, O> Functions.Arity3<I1, I2, I3, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchFunctionHelper(env, opName, hints, Functions.Arity3.class, outType, in1Type, in2Type, in3Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, O> Functions.Arity4<I1, I2, I3, I4, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchFunctionHelper(env, opName, hints, Functions.Arity4.class, outType, in1Type, in2Type, in3Type, in4Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, O> Functions.Arity5<I1, I2, I3, I4, I5, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchFunctionHelper(env, opName, hints, Functions.Arity5.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, O> Functions.Arity6<I1, I2, I3, I4, I5, I6, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchFunctionHelper(env, opName, hints, Functions.Arity6.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, O> Functions.Arity7<I1, I2, I3, I4, I5, I6, I7, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchFunctionHelper(env, opName, hints, Functions.Arity7.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, O> Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchFunctionHelper(env, opName, hints, Functions.Arity8.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, O> Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchFunctionHelper(env, opName, hints, Functions.Arity9.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchFunctionHelper(env, opName, hints, Functions.Arity10.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchFunctionHelper(env, opName, hints, Functions.Arity11.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchFunctionHelper(env, opName, hints, Functions.Arity12.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchFunctionHelper(env, opName, hints, Functions.Arity13.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchFunctionHelper(env, opName, hints, Functions.Arity14.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchFunctionHelper(env, opName, hints, Functions.Arity15.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> matchFunction(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchFunctionHelper(env, opName, hints, Functions.Arity16.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	private static <T> T matchFunctionHelper(final OpEnvironment env, final String opName,
+		final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
+	{
+		final Type[] types = new Type[inTypes.length + 1];
+		for (int i = 0; i < inTypes.length; i++)
+			types[i] = inTypes[i].getType();
+		types[types.length - 1] = outType.getType();
+		final Type specialType = Types.parameterize(opClass, types);
+		return (T) env.op(opName, Nil.of(specialType), inTypes, outType);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	private static <T> T matchFunctionHelper(final OpEnvironment env, final String opName, final Hints hints,
+		final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
+	{
+		final Type[] types = new Type[inTypes.length + 1];
+		for (int i = 0; i < inTypes.length; i++)
+			types[i] = inTypes[i].getType();
+		types[types.length - 1] = outType.getType();
+		final Type specialType = Types.parameterize(opClass, types);
+		return (T) env.op(opName, Nil.of(specialType), inTypes, outType, hints);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <O> Computers.Arity0<O> matchComputer(final OpEnvironment env, final String opName, final Nil<O> outType)
+	{
+		return matchComputerHelper(env, opName, Computers.Arity0.class, outType);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, O> Computers.Arity1<I1, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<O> outType)
+	{
+		return matchComputerHelper(env, opName, Computers.Arity1.class, outType, in1Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, O> Computers.Arity2<I1, I2, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<O> outType)
+	{
+		return matchComputerHelper(env, opName, Computers.Arity2.class, outType, in1Type, in2Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, I3, O> Computers.Arity3<I1, I2, I3, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<O> outType)
+	{
+		return matchComputerHelper(env, opName, Computers.Arity3.class, outType, in1Type, in2Type, in3Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, I3, I4, O> Computers.Arity4<I1, I2, I3, I4, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<O> outType)
+	{
+		return matchComputerHelper(env, opName, Computers.Arity4.class, outType, in1Type, in2Type, in3Type, in4Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, I3, I4, I5, O> Computers.Arity5<I1, I2, I3, I4, I5, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<O> outType)
+	{
+		return matchComputerHelper(env, opName, Computers.Arity5.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, I3, I4, I5, I6, O> Computers.Arity6<I1, I2, I3, I4, I5, I6, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<O> outType)
+	{
+		return matchComputerHelper(env, opName, Computers.Arity6.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, I3, I4, I5, I6, I7, O> Computers.Arity7<I1, I2, I3, I4, I5, I6, I7, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<O> outType)
+	{
+		return matchComputerHelper(env, opName, Computers.Arity7.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, O> Computers.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<O> outType)
+	{
+		return matchComputerHelper(env, opName, Computers.Arity8.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, O> Computers.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<O> outType)
+	{
+		return matchComputerHelper(env, opName, Computers.Arity9.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> Computers.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<O> outType)
+	{
+		return matchComputerHelper(env, opName, Computers.Arity10.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> Computers.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<O> outType)
+	{
+		return matchComputerHelper(env, opName, Computers.Arity11.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> Computers.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<O> outType)
+	{
+		return matchComputerHelper(env, opName, Computers.Arity12.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> Computers.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<O> outType)
+	{
+		return matchComputerHelper(env, opName, Computers.Arity13.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> Computers.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<O> outType)
+	{
+		return matchComputerHelper(env, opName, Computers.Arity14.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> Computers.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<O> outType)
+	{
+		return matchComputerHelper(env, opName, Computers.Arity15.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> Computers.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Nil<O> outType)
+	{
+		return matchComputerHelper(env, opName, Computers.Arity16.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <O> Computers.Arity0<O> matchComputer(final OpEnvironment env, final String opName, final Nil<O> outType, final Hints hints)
+	{
+		return matchComputerHelper(env, opName, hints, Computers.Arity0.class, outType);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, O> Computers.Arity1<I1, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchComputerHelper(env, opName, hints, Computers.Arity1.class, outType, in1Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, O> Computers.Arity2<I1, I2, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchComputerHelper(env, opName, hints, Computers.Arity2.class, outType, in1Type, in2Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, I3, O> Computers.Arity3<I1, I2, I3, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchComputerHelper(env, opName, hints, Computers.Arity3.class, outType, in1Type, in2Type, in3Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, I3, I4, O> Computers.Arity4<I1, I2, I3, I4, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchComputerHelper(env, opName, hints, Computers.Arity4.class, outType, in1Type, in2Type, in3Type, in4Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, I3, I4, I5, O> Computers.Arity5<I1, I2, I3, I4, I5, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchComputerHelper(env, opName, hints, Computers.Arity5.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, I3, I4, I5, I6, O> Computers.Arity6<I1, I2, I3, I4, I5, I6, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchComputerHelper(env, opName, hints, Computers.Arity6.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, I3, I4, I5, I6, I7, O> Computers.Arity7<I1, I2, I3, I4, I5, I6, I7, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchComputerHelper(env, opName, hints, Computers.Arity7.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, O> Computers.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchComputerHelper(env, opName, hints, Computers.Arity8.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, O> Computers.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchComputerHelper(env, opName, hints, Computers.Arity9.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> Computers.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchComputerHelper(env, opName, hints, Computers.Arity10.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> Computers.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchComputerHelper(env, opName, hints, Computers.Arity11.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> Computers.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchComputerHelper(env, opName, hints, Computers.Arity12.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> Computers.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchComputerHelper(env, opName, hints, Computers.Arity13.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> Computers.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchComputerHelper(env, opName, hints, Computers.Arity14.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> Computers.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchComputerHelper(env, opName, hints, Computers.Arity15.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> Computers.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> matchComputer(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Nil<O> outType, final Hints hints)
+	{
+		return matchComputerHelper(env, opName, hints, Computers.Arity16.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	private static <T> T matchComputerHelper(final OpEnvironment env, final String opName, final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
+	{
+		final Type[] types = new Type[inTypes.length + 1];
+		for (int i = 0; i < inTypes.length; i++)
+			types[i] = inTypes[i].getType();
+		types[types.length - 1] = outType.getType();
+		final Type specialType = Types.parameterize(opClass, types);
+		final Nil<?>[] nils = new Nil[inTypes.length + 1];
+		System.arraycopy(inTypes, 0, nils, 0, inTypes.length);
+		nils[nils.length - 1] = outType;
+		return (T) env.op(opName, Nil.of(specialType), nils, outType);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	private static <T> T matchComputerHelper(final OpEnvironment env, final String opName, final Hints hints, final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
+	{
+		final Type[] types = new Type[inTypes.length + 1];
+		for (int i = 0; i < inTypes.length; i++)
+			types[i] = inTypes[i].getType();
+		types[types.length - 1] = outType.getType();
+		final Type specialType = Types.parameterize(opClass, types);
+		final Nil<?>[] nils = new Nil[inTypes.length + 1];
+		System.arraycopy(inTypes, 0, nils, 0, inTypes.length);
+		nils[nils.length - 1] = outType;
+		return (T) env.op(opName, Nil.of(specialType), nils, outType, hints);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO> Inplaces.Arity1<IO> matchInplace(final OpEnvironment env, final String opName, final Nil<IO> ioType)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity1.class, ioType, new Nil[] {ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2> Inplaces.Arity2_1<IO, I2> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity2_1.class, ioType, new Nil[] {ioType, in2Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO> Inplaces.Arity2_2<I1, IO> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity2_2.class, ioType, new Nil[] {in1Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2, I3> Inplaces.Arity3_1<IO, I2, I3> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity3_1.class, ioType, new Nil[] {ioType, in2Type, in3Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO, I3> Inplaces.Arity3_2<I1, IO, I3> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity3_2.class, ioType, new Nil[] {in1Type, ioType, in3Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, IO> Inplaces.Arity3_3<I1, I2, IO> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity3_3.class, ioType, new Nil[] {in1Type, in2Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2, I3, I4> Inplaces.Arity4_1<IO, I2, I3, I4> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity4_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO, I3, I4> Inplaces.Arity4_2<I1, IO, I3, I4> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity4_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, IO, I4> Inplaces.Arity4_3<I1, I2, IO, I4> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity4_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, IO> Inplaces.Arity4_4<I1, I2, I3, IO> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity4_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2, I3, I4, I5> Inplaces.Arity5_1<IO, I2, I3, I4, I5> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity5_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO, I3, I4, I5> Inplaces.Arity5_2<I1, IO, I3, I4, I5> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity5_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, IO, I4, I5> Inplaces.Arity5_3<I1, I2, IO, I4, I5> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity5_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, IO, I5> Inplaces.Arity5_4<I1, I2, I3, IO, I5> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity5_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, IO> Inplaces.Arity5_5<I1, I2, I3, I4, IO> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity5_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2, I3, I4, I5, I6> Inplaces.Arity6_1<IO, I2, I3, I4, I5, I6> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity6_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO, I3, I4, I5, I6> Inplaces.Arity6_2<I1, IO, I3, I4, I5, I6> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity6_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, IO, I4, I5, I6> Inplaces.Arity6_3<I1, I2, IO, I4, I5, I6> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity6_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, IO, I5, I6> Inplaces.Arity6_4<I1, I2, I3, IO, I5, I6> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity6_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, IO, I6> Inplaces.Arity6_5<I1, I2, I3, I4, IO, I6> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity6_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, IO> Inplaces.Arity6_6<I1, I2, I3, I4, I5, IO> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity6_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2, I3, I4, I5, I6, I7> Inplaces.Arity7_1<IO, I2, I3, I4, I5, I6, I7> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity7_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO, I3, I4, I5, I6, I7> Inplaces.Arity7_2<I1, IO, I3, I4, I5, I6, I7> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity7_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, IO, I4, I5, I6, I7> Inplaces.Arity7_3<I1, I2, IO, I4, I5, I6, I7> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity7_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, IO, I5, I6, I7> Inplaces.Arity7_4<I1, I2, I3, IO, I5, I6, I7> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity7_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, IO, I6, I7> Inplaces.Arity7_5<I1, I2, I3, I4, IO, I6, I7> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity7_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, IO, I7> Inplaces.Arity7_6<I1, I2, I3, I4, I5, IO, I7> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity7_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, IO> Inplaces.Arity7_7<I1, I2, I3, I4, I5, I6, IO> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity7_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2, I3, I4, I5, I6, I7, I8> Inplaces.Arity8_1<IO, I2, I3, I4, I5, I6, I7, I8> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity8_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO, I3, I4, I5, I6, I7, I8> Inplaces.Arity8_2<I1, IO, I3, I4, I5, I6, I7, I8> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity8_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, IO, I4, I5, I6, I7, I8> Inplaces.Arity8_3<I1, I2, IO, I4, I5, I6, I7, I8> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity8_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, IO, I5, I6, I7, I8> Inplaces.Arity8_4<I1, I2, I3, IO, I5, I6, I7, I8> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity8_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, IO, I6, I7, I8> Inplaces.Arity8_5<I1, I2, I3, I4, IO, I6, I7, I8> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity8_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, IO, I7, I8> Inplaces.Arity8_6<I1, I2, I3, I4, I5, IO, I7, I8> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity8_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, IO, I8> Inplaces.Arity8_7<I1, I2, I3, I4, I5, I6, IO, I8> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity8_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, IO> Inplaces.Arity8_8<I1, I2, I3, I4, I5, I6, I7, IO> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity8_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9> Inplaces.Arity9_1<IO, I2, I3, I4, I5, I6, I7, I8, I9> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity9_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9> Inplaces.Arity9_2<I1, IO, I3, I4, I5, I6, I7, I8, I9> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity9_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9> Inplaces.Arity9_3<I1, I2, IO, I4, I5, I6, I7, I8, I9> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity9_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9> Inplaces.Arity9_4<I1, I2, I3, IO, I5, I6, I7, I8, I9> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity9_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9> Inplaces.Arity9_5<I1, I2, I3, I4, IO, I6, I7, I8, I9> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity9_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9> Inplaces.Arity9_6<I1, I2, I3, I4, I5, IO, I7, I8, I9> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity9_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9> Inplaces.Arity9_7<I1, I2, I3, I4, I5, I6, IO, I8, I9> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity9_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9> Inplaces.Arity9_8<I1, I2, I3, I4, I5, I6, I7, IO, I9> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity9_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO> Inplaces.Arity9_9<I1, I2, I3, I4, I5, I6, I7, I8, IO> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity9_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity10_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity10_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity10_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity10_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10> Inplaces.Arity10_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity10_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10> Inplaces.Arity10_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity10_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10> Inplaces.Arity10_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity10_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10> Inplaces.Arity10_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity10_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10> Inplaces.Arity10_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity10_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO> Inplaces.Arity10_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity10_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity11_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity11_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity11_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity11_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity11_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11> Inplaces.Arity11_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity11_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11> Inplaces.Arity11_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity11_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11> Inplaces.Arity11_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity11_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11> Inplaces.Arity11_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity11_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11> Inplaces.Arity11_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity11_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO> Inplaces.Arity11_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity11_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity12_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity12_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity12_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity12_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity12_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity12_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12> Inplaces.Arity12_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity12_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12> Inplaces.Arity12_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity12_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12> Inplaces.Arity12_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity12_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12> Inplaces.Arity12_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity12_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12> Inplaces.Arity12_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity12_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO> Inplaces.Arity12_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity12_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity13_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity13_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity13_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity13_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity13_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity13_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity13_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13> Inplaces.Arity13_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity13_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13> Inplaces.Arity13_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity13_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13> Inplaces.Arity13_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity13_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13> Inplaces.Arity13_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity13_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13> Inplaces.Arity13_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity13_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO> Inplaces.Arity13_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO> matchInplace13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity13_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity14_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity14_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity14_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity14_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity14_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity14_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity14_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity14_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14> Inplaces.Arity14_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity14_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14> Inplaces.Arity14_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity14_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14> Inplaces.Arity14_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity14_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14> Inplaces.Arity14_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type, final Nil<I14> in14Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity14_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14> Inplaces.Arity14_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14> matchInplace13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType, final Nil<I14> in14Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity14_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO> Inplaces.Arity14_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO> matchInplace14(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<IO> ioType)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity14_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity15_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity15_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity15_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity15_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity15_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity15_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity15_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity15_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity15_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15> Inplaces.Arity15_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity15_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type, in15Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15> Inplaces.Arity15_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity15_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type, in15Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15> Inplaces.Arity15_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity15_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type, in15Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15> Inplaces.Arity15_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15> matchInplace13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType, final Nil<I14> in14Type, final Nil<I15> in15Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity15_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type, in15Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15> Inplaces.Arity15_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15> matchInplace14(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<IO> ioType, final Nil<I15> in15Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity15_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType, in15Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO> Inplaces.Arity15_15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO> matchInplace15(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<IO> ioType)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity15_15.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity16_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity16_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity16_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity16_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity16_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity16_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity16_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity16_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15, I16> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity16_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15, I16> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity16_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15, I16> Inplaces.Arity16_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15, I16> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity16_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type, in15Type, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15, I16> Inplaces.Arity16_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15, I16> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity16_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type, in15Type, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15, I16> Inplaces.Arity16_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15, I16> matchInplace13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity16_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type, in15Type, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15, I16> Inplaces.Arity16_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15, I16> matchInplace14(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<IO> ioType, final Nil<I15> in15Type, final Nil<I16> in16Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity16_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType, in15Type, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO, I16> Inplaces.Arity16_15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO, I16> matchInplace15(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<IO> ioType, final Nil<I16> in16Type)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity16_15.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, ioType, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO> Inplaces.Arity16_16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO> matchInplace16(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<IO> ioType)
+	{
+		return matchInplaceHelper(env, opName, Inplaces.Arity16_16.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, ioType});
+	}
+
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO> Inplaces.Arity1<IO> matchInplace(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity1.class, ioType, new Nil[] {ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2> Inplaces.Arity2_1<IO, I2> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity2_1.class, ioType, new Nil[] {ioType, in2Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO> Inplaces.Arity2_2<I1, IO> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity2_2.class, ioType, new Nil[] {in1Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2, I3> Inplaces.Arity3_1<IO, I2, I3> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity3_1.class, ioType, new Nil[] {ioType, in2Type, in3Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO, I3> Inplaces.Arity3_2<I1, IO, I3> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity3_2.class, ioType, new Nil[] {in1Type, ioType, in3Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, IO> Inplaces.Arity3_3<I1, I2, IO> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity3_3.class, ioType, new Nil[] {in1Type, in2Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2, I3, I4> Inplaces.Arity4_1<IO, I2, I3, I4> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity4_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO, I3, I4> Inplaces.Arity4_2<I1, IO, I3, I4> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity4_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, IO, I4> Inplaces.Arity4_3<I1, I2, IO, I4> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity4_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, IO> Inplaces.Arity4_4<I1, I2, I3, IO> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity4_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2, I3, I4, I5> Inplaces.Arity5_1<IO, I2, I3, I4, I5> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity5_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO, I3, I4, I5> Inplaces.Arity5_2<I1, IO, I3, I4, I5> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity5_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, IO, I4, I5> Inplaces.Arity5_3<I1, I2, IO, I4, I5> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity5_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, IO, I5> Inplaces.Arity5_4<I1, I2, I3, IO, I5> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity5_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, IO> Inplaces.Arity5_5<I1, I2, I3, I4, IO> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity5_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2, I3, I4, I5, I6> Inplaces.Arity6_1<IO, I2, I3, I4, I5, I6> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity6_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO, I3, I4, I5, I6> Inplaces.Arity6_2<I1, IO, I3, I4, I5, I6> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity6_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, IO, I4, I5, I6> Inplaces.Arity6_3<I1, I2, IO, I4, I5, I6> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity6_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, IO, I5, I6> Inplaces.Arity6_4<I1, I2, I3, IO, I5, I6> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity6_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, IO, I6> Inplaces.Arity6_5<I1, I2, I3, I4, IO, I6> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity6_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, IO> Inplaces.Arity6_6<I1, I2, I3, I4, I5, IO> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity6_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2, I3, I4, I5, I6, I7> Inplaces.Arity7_1<IO, I2, I3, I4, I5, I6, I7> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity7_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO, I3, I4, I5, I6, I7> Inplaces.Arity7_2<I1, IO, I3, I4, I5, I6, I7> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity7_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, IO, I4, I5, I6, I7> Inplaces.Arity7_3<I1, I2, IO, I4, I5, I6, I7> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity7_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, IO, I5, I6, I7> Inplaces.Arity7_4<I1, I2, I3, IO, I5, I6, I7> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity7_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, IO, I6, I7> Inplaces.Arity7_5<I1, I2, I3, I4, IO, I6, I7> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity7_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, IO, I7> Inplaces.Arity7_6<I1, I2, I3, I4, I5, IO, I7> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity7_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, IO> Inplaces.Arity7_7<I1, I2, I3, I4, I5, I6, IO> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity7_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2, I3, I4, I5, I6, I7, I8> Inplaces.Arity8_1<IO, I2, I3, I4, I5, I6, I7, I8> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity8_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO, I3, I4, I5, I6, I7, I8> Inplaces.Arity8_2<I1, IO, I3, I4, I5, I6, I7, I8> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity8_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, IO, I4, I5, I6, I7, I8> Inplaces.Arity8_3<I1, I2, IO, I4, I5, I6, I7, I8> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity8_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, IO, I5, I6, I7, I8> Inplaces.Arity8_4<I1, I2, I3, IO, I5, I6, I7, I8> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity8_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, IO, I6, I7, I8> Inplaces.Arity8_5<I1, I2, I3, I4, IO, I6, I7, I8> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity8_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, IO, I7, I8> Inplaces.Arity8_6<I1, I2, I3, I4, I5, IO, I7, I8> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity8_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, IO, I8> Inplaces.Arity8_7<I1, I2, I3, I4, I5, I6, IO, I8> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity8_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, IO> Inplaces.Arity8_8<I1, I2, I3, I4, I5, I6, I7, IO> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity8_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9> Inplaces.Arity9_1<IO, I2, I3, I4, I5, I6, I7, I8, I9> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity9_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9> Inplaces.Arity9_2<I1, IO, I3, I4, I5, I6, I7, I8, I9> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity9_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9> Inplaces.Arity9_3<I1, I2, IO, I4, I5, I6, I7, I8, I9> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity9_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9> Inplaces.Arity9_4<I1, I2, I3, IO, I5, I6, I7, I8, I9> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity9_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9> Inplaces.Arity9_5<I1, I2, I3, I4, IO, I6, I7, I8, I9> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity9_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9> Inplaces.Arity9_6<I1, I2, I3, I4, I5, IO, I7, I8, I9> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity9_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9> Inplaces.Arity9_7<I1, I2, I3, I4, I5, I6, IO, I8, I9> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity9_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9> Inplaces.Arity9_8<I1, I2, I3, I4, I5, I6, I7, IO, I9> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity9_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO> Inplaces.Arity9_9<I1, I2, I3, I4, I5, I6, I7, I8, IO> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity9_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity10_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity10_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity10_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity10_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10> Inplaces.Arity10_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity10_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10> Inplaces.Arity10_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity10_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10> Inplaces.Arity10_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity10_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10> Inplaces.Arity10_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity10_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10> Inplaces.Arity10_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity10_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO> Inplaces.Arity10_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity10_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity11_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity11_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity11_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity11_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity11_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11> Inplaces.Arity11_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity11_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11> Inplaces.Arity11_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity11_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11> Inplaces.Arity11_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity11_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11> Inplaces.Arity11_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity11_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11> Inplaces.Arity11_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity11_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO> Inplaces.Arity11_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity11_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity12_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity12_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity12_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity12_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity12_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity12_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12> Inplaces.Arity12_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity12_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12> Inplaces.Arity12_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity12_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12> Inplaces.Arity12_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity12_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12> Inplaces.Arity12_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity12_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12> Inplaces.Arity12_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity12_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO> Inplaces.Arity12_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity12_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity13_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity13_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity13_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity13_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity13_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity13_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity13_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13> Inplaces.Arity13_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity13_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13> Inplaces.Arity13_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity13_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13> Inplaces.Arity13_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity13_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13> Inplaces.Arity13_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity13_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13> Inplaces.Arity13_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity13_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO> Inplaces.Arity13_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO> matchInplace13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity13_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity14_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity14_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity14_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity14_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity14_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity14_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity14_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity14_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14> Inplaces.Arity14_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity14_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14> Inplaces.Arity14_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity14_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14> Inplaces.Arity14_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity14_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14> Inplaces.Arity14_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity14_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14> Inplaces.Arity14_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14> matchInplace13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType, final Nil<I14> in14Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity14_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO> Inplaces.Arity14_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO> matchInplace14(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<IO> ioType, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity14_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15> Inplaces.Arity15_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type, in15Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15> Inplaces.Arity15_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type, in15Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15> Inplaces.Arity15_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type, in15Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15> Inplaces.Arity15_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15> matchInplace13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type, in15Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15> Inplaces.Arity15_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15> matchInplace14(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<IO> ioType, final Nil<I15> in15Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType, in15Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO> Inplaces.Arity15_15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO> matchInplace15(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<IO> ioType, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_15.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15, I16> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15, I16> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15, I16> Inplaces.Arity16_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15, I16> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type, in15Type, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15, I16> Inplaces.Arity16_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15, I16> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type, in15Type, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15, I16> Inplaces.Arity16_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15, I16> matchInplace13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type, in15Type, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15, I16> Inplaces.Arity16_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15, I16> matchInplace14(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<IO> ioType, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType, in15Type, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO, I16> Inplaces.Arity16_15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO, I16> matchInplace15(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<IO> ioType, final Nil<I16> in16Type, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_15.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, ioType, in16Type});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO> Inplaces.Arity16_16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO> matchInplace16(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<IO> ioType, final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_16.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, ioType});
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	private static <T> T matchInplaceHelper(final OpEnvironment env, final String opName,
+		final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
+	{
+		final Type[] types = new Type[inTypes.length];
+		for (int i = 0; i < inTypes.length; i++)
+			types[i] = inTypes[i].getType();
+		final Type specialType = Types.parameterize(opClass, types);
+		return (T) env.op(opName, Nil.of(specialType), inTypes, outType);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	private static <T> T matchInplaceHelper(final OpEnvironment env, final String opName, final Hints hints,
+		final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
+	{
+		final Type[] types = new Type[inTypes.length];
+		for (int i = 0; i < inTypes.length; i++)
+			types[i] = inTypes[i].getType();
+		final Type specialType = Types.parameterize(opClass, types);
+		return (T) env.op(opName, Nil.of(specialType), inTypes, outType, hints);
+	}
 }
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java
index 01a8be4e2..50132e47b 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java
@@ -55,1634 +55,1634 @@ private InplaceUtils() {
 
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO> Inplaces.Arity1<IO> match(final OpEnvironment env, final String opName, final Nil<IO> ioType)
+	public static <IO> Inplaces.Arity1<IO> matchInplace(final OpEnvironment env, final String opName, final Nil<IO> ioType)
 	{
 		return matchHelper(env, opName, Inplaces.Arity1.class, ioType, new Nil[] {ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2> Inplaces.Arity2_1<IO, I2> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type)
+	public static <IO, I2> Inplaces.Arity2_1<IO, I2> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity2_1.class, ioType, new Nil[] {ioType, in2Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO> Inplaces.Arity2_2<I1, IO> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType)
+	public static <I1, IO> Inplaces.Arity2_2<I1, IO> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType)
 	{
 		return matchHelper(env, opName, Inplaces.Arity2_2.class, ioType, new Nil[] {in1Type, ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3> Inplaces.Arity3_1<IO, I2, I3> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type)
+	public static <IO, I2, I3> Inplaces.Arity3_1<IO, I2, I3> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity3_1.class, ioType, new Nil[] {ioType, in2Type, in3Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3> Inplaces.Arity3_2<I1, IO, I3> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type)
+	public static <I1, IO, I3> Inplaces.Arity3_2<I1, IO, I3> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity3_2.class, ioType, new Nil[] {in1Type, ioType, in3Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO> Inplaces.Arity3_3<I1, I2, IO> match3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType)
+	public static <I1, I2, IO> Inplaces.Arity3_3<I1, I2, IO> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType)
 	{
 		return matchHelper(env, opName, Inplaces.Arity3_3.class, ioType, new Nil[] {in1Type, in2Type, ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4> Inplaces.Arity4_1<IO, I2, I3, I4> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type)
+	public static <IO, I2, I3, I4> Inplaces.Arity4_1<IO, I2, I3, I4> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity4_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4> Inplaces.Arity4_2<I1, IO, I3, I4> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type)
+	public static <I1, IO, I3, I4> Inplaces.Arity4_2<I1, IO, I3, I4> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity4_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4> Inplaces.Arity4_3<I1, I2, IO, I4> match3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type)
+	public static <I1, I2, IO, I4> Inplaces.Arity4_3<I1, I2, IO, I4> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity4_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO> Inplaces.Arity4_4<I1, I2, I3, IO> match4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType)
+	public static <I1, I2, I3, IO> Inplaces.Arity4_4<I1, I2, I3, IO> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType)
 	{
 		return matchHelper(env, opName, Inplaces.Arity4_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5> Inplaces.Arity5_1<IO, I2, I3, I4, I5> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type)
+	public static <IO, I2, I3, I4, I5> Inplaces.Arity5_1<IO, I2, I3, I4, I5> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity5_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5> Inplaces.Arity5_2<I1, IO, I3, I4, I5> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type)
+	public static <I1, IO, I3, I4, I5> Inplaces.Arity5_2<I1, IO, I3, I4, I5> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity5_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5> Inplaces.Arity5_3<I1, I2, IO, I4, I5> match3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type)
+	public static <I1, I2, IO, I4, I5> Inplaces.Arity5_3<I1, I2, IO, I4, I5> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity5_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5> Inplaces.Arity5_4<I1, I2, I3, IO, I5> match4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type)
+	public static <I1, I2, I3, IO, I5> Inplaces.Arity5_4<I1, I2, I3, IO, I5> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity5_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO> Inplaces.Arity5_5<I1, I2, I3, I4, IO> match5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType)
+	public static <I1, I2, I3, I4, IO> Inplaces.Arity5_5<I1, I2, I3, I4, IO> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType)
 	{
 		return matchHelper(env, opName, Inplaces.Arity5_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6> Inplaces.Arity6_1<IO, I2, I3, I4, I5, I6> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type)
+	public static <IO, I2, I3, I4, I5, I6> Inplaces.Arity6_1<IO, I2, I3, I4, I5, I6> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity6_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6> Inplaces.Arity6_2<I1, IO, I3, I4, I5, I6> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type)
+	public static <I1, IO, I3, I4, I5, I6> Inplaces.Arity6_2<I1, IO, I3, I4, I5, I6> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity6_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6> Inplaces.Arity6_3<I1, I2, IO, I4, I5, I6> match3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type)
+	public static <I1, I2, IO, I4, I5, I6> Inplaces.Arity6_3<I1, I2, IO, I4, I5, I6> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity6_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6> Inplaces.Arity6_4<I1, I2, I3, IO, I5, I6> match4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type)
+	public static <I1, I2, I3, IO, I5, I6> Inplaces.Arity6_4<I1, I2, I3, IO, I5, I6> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity6_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6> Inplaces.Arity6_5<I1, I2, I3, I4, IO, I6> match5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type)
+	public static <I1, I2, I3, I4, IO, I6> Inplaces.Arity6_5<I1, I2, I3, I4, IO, I6> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity6_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO> Inplaces.Arity6_6<I1, I2, I3, I4, I5, IO> match6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType)
+	public static <I1, I2, I3, I4, I5, IO> Inplaces.Arity6_6<I1, I2, I3, I4, I5, IO> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType)
 	{
 		return matchHelper(env, opName, Inplaces.Arity6_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7> Inplaces.Arity7_1<IO, I2, I3, I4, I5, I6, I7> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type)
+	public static <IO, I2, I3, I4, I5, I6, I7> Inplaces.Arity7_1<IO, I2, I3, I4, I5, I6, I7> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity7_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7> Inplaces.Arity7_2<I1, IO, I3, I4, I5, I6, I7> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type)
+	public static <I1, IO, I3, I4, I5, I6, I7> Inplaces.Arity7_2<I1, IO, I3, I4, I5, I6, I7> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity7_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7> Inplaces.Arity7_3<I1, I2, IO, I4, I5, I6, I7> match3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type)
+	public static <I1, I2, IO, I4, I5, I6, I7> Inplaces.Arity7_3<I1, I2, IO, I4, I5, I6, I7> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity7_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7> Inplaces.Arity7_4<I1, I2, I3, IO, I5, I6, I7> match4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type)
+	public static <I1, I2, I3, IO, I5, I6, I7> Inplaces.Arity7_4<I1, I2, I3, IO, I5, I6, I7> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity7_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7> Inplaces.Arity7_5<I1, I2, I3, I4, IO, I6, I7> match5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type)
+	public static <I1, I2, I3, I4, IO, I6, I7> Inplaces.Arity7_5<I1, I2, I3, I4, IO, I6, I7> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity7_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7> Inplaces.Arity7_6<I1, I2, I3, I4, I5, IO, I7> match6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type)
+	public static <I1, I2, I3, I4, I5, IO, I7> Inplaces.Arity7_6<I1, I2, I3, I4, I5, IO, I7> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity7_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO> Inplaces.Arity7_7<I1, I2, I3, I4, I5, I6, IO> match7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType)
+	public static <I1, I2, I3, I4, I5, I6, IO> Inplaces.Arity7_7<I1, I2, I3, I4, I5, I6, IO> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType)
 	{
 		return matchHelper(env, opName, Inplaces.Arity7_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8> Inplaces.Arity8_1<IO, I2, I3, I4, I5, I6, I7, I8> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type)
+	public static <IO, I2, I3, I4, I5, I6, I7, I8> Inplaces.Arity8_1<IO, I2, I3, I4, I5, I6, I7, I8> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity8_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8> Inplaces.Arity8_2<I1, IO, I3, I4, I5, I6, I7, I8> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type)
+	public static <I1, IO, I3, I4, I5, I6, I7, I8> Inplaces.Arity8_2<I1, IO, I3, I4, I5, I6, I7, I8> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity8_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8> Inplaces.Arity8_3<I1, I2, IO, I4, I5, I6, I7, I8> match3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type)
+	public static <I1, I2, IO, I4, I5, I6, I7, I8> Inplaces.Arity8_3<I1, I2, IO, I4, I5, I6, I7, I8> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity8_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8> Inplaces.Arity8_4<I1, I2, I3, IO, I5, I6, I7, I8> match4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type)
+	public static <I1, I2, I3, IO, I5, I6, I7, I8> Inplaces.Arity8_4<I1, I2, I3, IO, I5, I6, I7, I8> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity8_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8> Inplaces.Arity8_5<I1, I2, I3, I4, IO, I6, I7, I8> match5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type)
+	public static <I1, I2, I3, I4, IO, I6, I7, I8> Inplaces.Arity8_5<I1, I2, I3, I4, IO, I6, I7, I8> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity8_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8> Inplaces.Arity8_6<I1, I2, I3, I4, I5, IO, I7, I8> match6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type)
+	public static <I1, I2, I3, I4, I5, IO, I7, I8> Inplaces.Arity8_6<I1, I2, I3, I4, I5, IO, I7, I8> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity8_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8> Inplaces.Arity8_7<I1, I2, I3, I4, I5, I6, IO, I8> match7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type)
+	public static <I1, I2, I3, I4, I5, I6, IO, I8> Inplaces.Arity8_7<I1, I2, I3, I4, I5, I6, IO, I8> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity8_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO> Inplaces.Arity8_8<I1, I2, I3, I4, I5, I6, I7, IO> match8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType)
+	public static <I1, I2, I3, I4, I5, I6, I7, IO> Inplaces.Arity8_8<I1, I2, I3, I4, I5, I6, I7, IO> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType)
 	{
 		return matchHelper(env, opName, Inplaces.Arity8_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9> Inplaces.Arity9_1<IO, I2, I3, I4, I5, I6, I7, I8, I9> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type)
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9> Inplaces.Arity9_1<IO, I2, I3, I4, I5, I6, I7, I8, I9> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity9_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9> Inplaces.Arity9_2<I1, IO, I3, I4, I5, I6, I7, I8, I9> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type)
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9> Inplaces.Arity9_2<I1, IO, I3, I4, I5, I6, I7, I8, I9> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity9_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9> Inplaces.Arity9_3<I1, I2, IO, I4, I5, I6, I7, I8, I9> match3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type)
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9> Inplaces.Arity9_3<I1, I2, IO, I4, I5, I6, I7, I8, I9> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity9_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9> Inplaces.Arity9_4<I1, I2, I3, IO, I5, I6, I7, I8, I9> match4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type)
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9> Inplaces.Arity9_4<I1, I2, I3, IO, I5, I6, I7, I8, I9> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity9_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9> Inplaces.Arity9_5<I1, I2, I3, I4, IO, I6, I7, I8, I9> match5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type)
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9> Inplaces.Arity9_5<I1, I2, I3, I4, IO, I6, I7, I8, I9> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity9_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9> Inplaces.Arity9_6<I1, I2, I3, I4, I5, IO, I7, I8, I9> match6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type)
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9> Inplaces.Arity9_6<I1, I2, I3, I4, I5, IO, I7, I8, I9> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity9_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9> Inplaces.Arity9_7<I1, I2, I3, I4, I5, I6, IO, I8, I9> match7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type)
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9> Inplaces.Arity9_7<I1, I2, I3, I4, I5, I6, IO, I8, I9> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity9_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9> Inplaces.Arity9_8<I1, I2, I3, I4, I5, I6, I7, IO, I9> match8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9> Inplaces.Arity9_8<I1, I2, I3, I4, I5, I6, I7, IO, I9> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity9_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO> Inplaces.Arity9_9<I1, I2, I3, I4, I5, I6, I7, I8, IO> match9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO> Inplaces.Arity9_9<I1, I2, I3, I4, I5, I6, I7, I8, IO> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType)
 	{
 		return matchHelper(env, opName, Inplaces.Arity9_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type)
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity10_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type)
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity10_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10> match3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type)
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity10_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10> match4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type)
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity10_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10> Inplaces.Arity10_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10> match5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type)
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10> Inplaces.Arity10_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity10_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10> Inplaces.Arity10_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10> match6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type)
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10> Inplaces.Arity10_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity10_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10> Inplaces.Arity10_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10> match7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type)
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10> Inplaces.Arity10_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity10_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10> Inplaces.Arity10_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10> match8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10> Inplaces.Arity10_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity10_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10> Inplaces.Arity10_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10> match9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10> Inplaces.Arity10_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity10_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO> Inplaces.Arity10_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO> match10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO> Inplaces.Arity10_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType)
 	{
 		return matchHelper(env, opName, Inplaces.Arity10_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity11_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity11_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11> match3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity11_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11> match4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity11_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11> match5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity11_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11> Inplaces.Arity11_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11> match6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11> Inplaces.Arity11_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity11_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11> Inplaces.Arity11_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11> match7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11> Inplaces.Arity11_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity11_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11> Inplaces.Arity11_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11> match8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11> Inplaces.Arity11_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity11_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11> Inplaces.Arity11_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11> match9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11> Inplaces.Arity11_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity11_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11> Inplaces.Arity11_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11> match10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11> Inplaces.Arity11_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity11_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO> Inplaces.Arity11_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO> match11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO> Inplaces.Arity11_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType)
 	{
 		return matchHelper(env, opName, Inplaces.Arity11_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity12_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity12_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12> match3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity12_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12> match4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity12_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12> match5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity12_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12> match6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity12_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12> Inplaces.Arity12_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12> match7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12> Inplaces.Arity12_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity12_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12> Inplaces.Arity12_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12> match8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12> Inplaces.Arity12_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity12_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12> Inplaces.Arity12_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12> match9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12> Inplaces.Arity12_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity12_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12> Inplaces.Arity12_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12> match10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12> Inplaces.Arity12_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity12_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12> Inplaces.Arity12_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12> match11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12> Inplaces.Arity12_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity12_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO> Inplaces.Arity12_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO> match12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO> Inplaces.Arity12_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType)
 	{
 		return matchHelper(env, opName, Inplaces.Arity12_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity13_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity13_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> match3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity13_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13> match4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity13_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13> match5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity13_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13> match6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity13_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13> match7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity13_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13> Inplaces.Arity13_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13> match8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13> Inplaces.Arity13_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity13_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13> Inplaces.Arity13_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13> match9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13> Inplaces.Arity13_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity13_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13> Inplaces.Arity13_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13> match10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13> Inplaces.Arity13_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity13_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13> Inplaces.Arity13_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13> match11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13> Inplaces.Arity13_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity13_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13> Inplaces.Arity13_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13> match12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13> Inplaces.Arity13_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity13_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO> Inplaces.Arity13_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO> match13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO> Inplaces.Arity13_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO> matchInplace13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType)
 	{
 		return matchHelper(env, opName, Inplaces.Arity13_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity14_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity14_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> match3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity14_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> match4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity14_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14> match5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity14_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14> match6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity14_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14> match7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity14_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14> match8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity14_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14> Inplaces.Arity14_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14> match9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14> Inplaces.Arity14_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity14_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14> Inplaces.Arity14_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14> match10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14> Inplaces.Arity14_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity14_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14> Inplaces.Arity14_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14> match11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14> Inplaces.Arity14_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity14_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14> Inplaces.Arity14_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14> match12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type, final Nil<I14> in14Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14> Inplaces.Arity14_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type, final Nil<I14> in14Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity14_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14> Inplaces.Arity14_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14> match13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType, final Nil<I14> in14Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14> Inplaces.Arity14_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14> matchInplace13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType, final Nil<I14> in14Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity14_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO> Inplaces.Arity14_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO> match14(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<IO> ioType)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO> Inplaces.Arity14_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO> matchInplace14(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<IO> ioType)
 	{
 		return matchHelper(env, opName, Inplaces.Arity14_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity15_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity15_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> match3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity15_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> match4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity15_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> match5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity15_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15> match6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity15_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15> match7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity15_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15> match8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity15_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15> match9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity15_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15> Inplaces.Arity15_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15> match10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15> Inplaces.Arity15_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity15_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type, in15Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15> Inplaces.Arity15_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15> match11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15> Inplaces.Arity15_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity15_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type, in15Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15> Inplaces.Arity15_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15> match12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15> Inplaces.Arity15_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity15_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type, in15Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15> Inplaces.Arity15_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15> match13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType, final Nil<I14> in14Type, final Nil<I15> in15Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15> Inplaces.Arity15_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15> matchInplace13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType, final Nil<I14> in14Type, final Nil<I15> in15Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity15_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type, in15Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15> Inplaces.Arity15_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15> match14(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<IO> ioType, final Nil<I15> in15Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15> Inplaces.Arity15_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15> matchInplace14(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<IO> ioType, final Nil<I15> in15Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity15_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType, in15Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO> Inplaces.Arity15_15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO> match15(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<IO> ioType)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO> Inplaces.Arity15_15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO> matchInplace15(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<IO> ioType)
 	{
 		return matchHelper(env, opName, Inplaces.Arity15_15.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity16_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity16_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> match3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity16_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> match4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity16_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> match5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity16_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> match6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity16_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15, I16> match7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity16_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15, I16> match8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity16_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15, I16> match9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15, I16> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity16_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15, I16> match10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15, I16> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity16_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15, I16> Inplaces.Arity16_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15, I16> match11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15, I16> Inplaces.Arity16_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15, I16> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity16_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type, in15Type, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15, I16> Inplaces.Arity16_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15, I16> match12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15, I16> Inplaces.Arity16_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15, I16> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity16_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type, in15Type, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15, I16> Inplaces.Arity16_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15, I16> match13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15, I16> Inplaces.Arity16_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15, I16> matchInplace13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity16_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type, in15Type, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15, I16> Inplaces.Arity16_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15, I16> match14(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<IO> ioType, final Nil<I15> in15Type, final Nil<I16> in16Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15, I16> Inplaces.Arity16_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15, I16> matchInplace14(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<IO> ioType, final Nil<I15> in15Type, final Nil<I16> in16Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity16_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType, in15Type, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO, I16> Inplaces.Arity16_15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO, I16> match15(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<IO> ioType, final Nil<I16> in16Type)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO, I16> Inplaces.Arity16_15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO, I16> matchInplace15(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<IO> ioType, final Nil<I16> in16Type)
 	{
 		return matchHelper(env, opName, Inplaces.Arity16_15.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, ioType, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO> Inplaces.Arity16_16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO> match16(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<IO> ioType)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO> Inplaces.Arity16_16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO> matchInplace16(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<IO> ioType)
 	{
 		return matchHelper(env, opName, Inplaces.Arity16_16.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, ioType});
 	}
 
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO> Inplaces.Arity1<IO> match(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Hints hints)
+	public static <IO> Inplaces.Arity1<IO> matchInplace(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity1.class, ioType, new Nil[] {ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2> Inplaces.Arity2_1<IO, I2> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Hints hints)
+	public static <IO, I2> Inplaces.Arity2_1<IO, I2> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity2_1.class, ioType, new Nil[] {ioType, in2Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO> Inplaces.Arity2_2<I1, IO> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Hints hints)
+	public static <I1, IO> Inplaces.Arity2_2<I1, IO> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity2_2.class, ioType, new Nil[] {in1Type, ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3> Inplaces.Arity3_1<IO, I2, I3> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Hints hints)
+	public static <IO, I2, I3> Inplaces.Arity3_1<IO, I2, I3> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity3_1.class, ioType, new Nil[] {ioType, in2Type, in3Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3> Inplaces.Arity3_2<I1, IO, I3> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Hints hints)
+	public static <I1, IO, I3> Inplaces.Arity3_2<I1, IO, I3> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity3_2.class, ioType, new Nil[] {in1Type, ioType, in3Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO> Inplaces.Arity3_3<I1, I2, IO> match3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Hints hints)
+	public static <I1, I2, IO> Inplaces.Arity3_3<I1, I2, IO> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity3_3.class, ioType, new Nil[] {in1Type, in2Type, ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4> Inplaces.Arity4_1<IO, I2, I3, I4> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Hints hints)
+	public static <IO, I2, I3, I4> Inplaces.Arity4_1<IO, I2, I3, I4> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity4_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4> Inplaces.Arity4_2<I1, IO, I3, I4> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Hints hints)
+	public static <I1, IO, I3, I4> Inplaces.Arity4_2<I1, IO, I3, I4> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity4_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4> Inplaces.Arity4_3<I1, I2, IO, I4> match3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Hints hints)
+	public static <I1, I2, IO, I4> Inplaces.Arity4_3<I1, I2, IO, I4> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity4_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO> Inplaces.Arity4_4<I1, I2, I3, IO> match4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Hints hints)
+	public static <I1, I2, I3, IO> Inplaces.Arity4_4<I1, I2, I3, IO> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity4_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5> Inplaces.Arity5_1<IO, I2, I3, I4, I5> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Hints hints)
+	public static <IO, I2, I3, I4, I5> Inplaces.Arity5_1<IO, I2, I3, I4, I5> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity5_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5> Inplaces.Arity5_2<I1, IO, I3, I4, I5> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Hints hints)
+	public static <I1, IO, I3, I4, I5> Inplaces.Arity5_2<I1, IO, I3, I4, I5> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity5_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5> Inplaces.Arity5_3<I1, I2, IO, I4, I5> match3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Hints hints)
+	public static <I1, I2, IO, I4, I5> Inplaces.Arity5_3<I1, I2, IO, I4, I5> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity5_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5> Inplaces.Arity5_4<I1, I2, I3, IO, I5> match4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Hints hints)
+	public static <I1, I2, I3, IO, I5> Inplaces.Arity5_4<I1, I2, I3, IO, I5> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity5_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO> Inplaces.Arity5_5<I1, I2, I3, I4, IO> match5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Hints hints)
+	public static <I1, I2, I3, I4, IO> Inplaces.Arity5_5<I1, I2, I3, I4, IO> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity5_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6> Inplaces.Arity6_1<IO, I2, I3, I4, I5, I6> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Hints hints)
+	public static <IO, I2, I3, I4, I5, I6> Inplaces.Arity6_1<IO, I2, I3, I4, I5, I6> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity6_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6> Inplaces.Arity6_2<I1, IO, I3, I4, I5, I6> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Hints hints)
+	public static <I1, IO, I3, I4, I5, I6> Inplaces.Arity6_2<I1, IO, I3, I4, I5, I6> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity6_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6> Inplaces.Arity6_3<I1, I2, IO, I4, I5, I6> match3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Hints hints)
+	public static <I1, I2, IO, I4, I5, I6> Inplaces.Arity6_3<I1, I2, IO, I4, I5, I6> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity6_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6> Inplaces.Arity6_4<I1, I2, I3, IO, I5, I6> match4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Hints hints)
+	public static <I1, I2, I3, IO, I5, I6> Inplaces.Arity6_4<I1, I2, I3, IO, I5, I6> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity6_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6> Inplaces.Arity6_5<I1, I2, I3, I4, IO, I6> match5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Hints hints)
+	public static <I1, I2, I3, I4, IO, I6> Inplaces.Arity6_5<I1, I2, I3, I4, IO, I6> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity6_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO> Inplaces.Arity6_6<I1, I2, I3, I4, I5, IO> match6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Hints hints)
+	public static <I1, I2, I3, I4, I5, IO> Inplaces.Arity6_6<I1, I2, I3, I4, I5, IO> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity6_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7> Inplaces.Arity7_1<IO, I2, I3, I4, I5, I6, I7> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Hints hints)
+	public static <IO, I2, I3, I4, I5, I6, I7> Inplaces.Arity7_1<IO, I2, I3, I4, I5, I6, I7> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity7_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7> Inplaces.Arity7_2<I1, IO, I3, I4, I5, I6, I7> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Hints hints)
+	public static <I1, IO, I3, I4, I5, I6, I7> Inplaces.Arity7_2<I1, IO, I3, I4, I5, I6, I7> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity7_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7> Inplaces.Arity7_3<I1, I2, IO, I4, I5, I6, I7> match3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Hints hints)
+	public static <I1, I2, IO, I4, I5, I6, I7> Inplaces.Arity7_3<I1, I2, IO, I4, I5, I6, I7> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity7_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7> Inplaces.Arity7_4<I1, I2, I3, IO, I5, I6, I7> match4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Hints hints)
+	public static <I1, I2, I3, IO, I5, I6, I7> Inplaces.Arity7_4<I1, I2, I3, IO, I5, I6, I7> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity7_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7> Inplaces.Arity7_5<I1, I2, I3, I4, IO, I6, I7> match5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Hints hints)
+	public static <I1, I2, I3, I4, IO, I6, I7> Inplaces.Arity7_5<I1, I2, I3, I4, IO, I6, I7> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity7_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7> Inplaces.Arity7_6<I1, I2, I3, I4, I5, IO, I7> match6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, IO, I7> Inplaces.Arity7_6<I1, I2, I3, I4, I5, IO, I7> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity7_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO> Inplaces.Arity7_7<I1, I2, I3, I4, I5, I6, IO> match7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, IO> Inplaces.Arity7_7<I1, I2, I3, I4, I5, I6, IO> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity7_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8> Inplaces.Arity8_1<IO, I2, I3, I4, I5, I6, I7, I8> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Hints hints)
+	public static <IO, I2, I3, I4, I5, I6, I7, I8> Inplaces.Arity8_1<IO, I2, I3, I4, I5, I6, I7, I8> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity8_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8> Inplaces.Arity8_2<I1, IO, I3, I4, I5, I6, I7, I8> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Hints hints)
+	public static <I1, IO, I3, I4, I5, I6, I7, I8> Inplaces.Arity8_2<I1, IO, I3, I4, I5, I6, I7, I8> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity8_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8> Inplaces.Arity8_3<I1, I2, IO, I4, I5, I6, I7, I8> match3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Hints hints)
+	public static <I1, I2, IO, I4, I5, I6, I7, I8> Inplaces.Arity8_3<I1, I2, IO, I4, I5, I6, I7, I8> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity8_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8> Inplaces.Arity8_4<I1, I2, I3, IO, I5, I6, I7, I8> match4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Hints hints)
+	public static <I1, I2, I3, IO, I5, I6, I7, I8> Inplaces.Arity8_4<I1, I2, I3, IO, I5, I6, I7, I8> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity8_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8> Inplaces.Arity8_5<I1, I2, I3, I4, IO, I6, I7, I8> match5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Hints hints)
+	public static <I1, I2, I3, I4, IO, I6, I7, I8> Inplaces.Arity8_5<I1, I2, I3, I4, IO, I6, I7, I8> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity8_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8> Inplaces.Arity8_6<I1, I2, I3, I4, I5, IO, I7, I8> match6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, IO, I7, I8> Inplaces.Arity8_6<I1, I2, I3, I4, I5, IO, I7, I8> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity8_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8> Inplaces.Arity8_7<I1, I2, I3, I4, I5, I6, IO, I8> match7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, IO, I8> Inplaces.Arity8_7<I1, I2, I3, I4, I5, I6, IO, I8> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity8_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO> Inplaces.Arity8_8<I1, I2, I3, I4, I5, I6, I7, IO> match8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, IO> Inplaces.Arity8_8<I1, I2, I3, I4, I5, I6, I7, IO> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity8_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9> Inplaces.Arity9_1<IO, I2, I3, I4, I5, I6, I7, I8, I9> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Hints hints)
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9> Inplaces.Arity9_1<IO, I2, I3, I4, I5, I6, I7, I8, I9> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity9_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9> Inplaces.Arity9_2<I1, IO, I3, I4, I5, I6, I7, I8, I9> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Hints hints)
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9> Inplaces.Arity9_2<I1, IO, I3, I4, I5, I6, I7, I8, I9> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity9_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9> Inplaces.Arity9_3<I1, I2, IO, I4, I5, I6, I7, I8, I9> match3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Hints hints)
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9> Inplaces.Arity9_3<I1, I2, IO, I4, I5, I6, I7, I8, I9> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity9_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9> Inplaces.Arity9_4<I1, I2, I3, IO, I5, I6, I7, I8, I9> match4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Hints hints)
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9> Inplaces.Arity9_4<I1, I2, I3, IO, I5, I6, I7, I8, I9> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity9_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9> Inplaces.Arity9_5<I1, I2, I3, I4, IO, I6, I7, I8, I9> match5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Hints hints)
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9> Inplaces.Arity9_5<I1, I2, I3, I4, IO, I6, I7, I8, I9> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity9_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9> Inplaces.Arity9_6<I1, I2, I3, I4, I5, IO, I7, I8, I9> match6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9> Inplaces.Arity9_6<I1, I2, I3, I4, I5, IO, I7, I8, I9> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity9_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9> Inplaces.Arity9_7<I1, I2, I3, I4, I5, I6, IO, I8, I9> match7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9> Inplaces.Arity9_7<I1, I2, I3, I4, I5, I6, IO, I8, I9> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity9_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9> Inplaces.Arity9_8<I1, I2, I3, I4, I5, I6, I7, IO, I9> match8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9> Inplaces.Arity9_8<I1, I2, I3, I4, I5, I6, I7, IO, I9> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity9_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO> Inplaces.Arity9_9<I1, I2, I3, I4, I5, I6, I7, I8, IO> match9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO> Inplaces.Arity9_9<I1, I2, I3, I4, I5, I6, I7, I8, IO> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity9_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity10_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity10_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10> match3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity10_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10> match4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity10_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10> Inplaces.Arity10_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10> match5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10> Inplaces.Arity10_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity10_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10> Inplaces.Arity10_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10> match6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10> Inplaces.Arity10_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity10_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10> Inplaces.Arity10_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10> match7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10> Inplaces.Arity10_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity10_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10> Inplaces.Arity10_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10> match8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10> Inplaces.Arity10_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity10_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10> Inplaces.Arity10_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10> match9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10> Inplaces.Arity10_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity10_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO> Inplaces.Arity10_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO> match10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO> Inplaces.Arity10_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity10_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity11_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity11_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11> match3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity11_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11> match4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity11_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11> match5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity11_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11> Inplaces.Arity11_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11> match6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11> Inplaces.Arity11_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity11_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11> Inplaces.Arity11_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11> match7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11> Inplaces.Arity11_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity11_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11> Inplaces.Arity11_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11> match8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11> Inplaces.Arity11_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity11_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11> Inplaces.Arity11_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11> match9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11> Inplaces.Arity11_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity11_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11> Inplaces.Arity11_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11> match10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11> Inplaces.Arity11_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity11_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO> Inplaces.Arity11_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO> match11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO> Inplaces.Arity11_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity11_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity12_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity12_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12> match3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity12_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12> match4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity12_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12> match5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity12_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12> match6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity12_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12> Inplaces.Arity12_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12> match7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12> Inplaces.Arity12_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity12_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12> Inplaces.Arity12_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12> match8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12> Inplaces.Arity12_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity12_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12> Inplaces.Arity12_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12> match9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12> Inplaces.Arity12_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity12_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12> Inplaces.Arity12_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12> match10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12> Inplaces.Arity12_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity12_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12> Inplaces.Arity12_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12> match11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12> Inplaces.Arity12_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity12_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO> Inplaces.Arity12_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO> match12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO> Inplaces.Arity12_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity12_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity13_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity13_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> match3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity13_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13> match4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity13_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13> match5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity13_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13> match6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity13_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13> match7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity13_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13> Inplaces.Arity13_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13> match8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13> Inplaces.Arity13_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity13_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13> Inplaces.Arity13_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13> match9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13> Inplaces.Arity13_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity13_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13> Inplaces.Arity13_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13> match10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13> Inplaces.Arity13_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity13_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13> Inplaces.Arity13_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13> match11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13> Inplaces.Arity13_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity13_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13> Inplaces.Arity13_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13> match12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13> Inplaces.Arity13_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity13_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO> Inplaces.Arity13_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO> match13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO> Inplaces.Arity13_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO> matchInplace13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity13_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity14_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity14_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> match3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity14_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> match4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity14_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14> match5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity14_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14> match6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity14_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14> match7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity14_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14> match8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity14_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14> Inplaces.Arity14_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14> match9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14> Inplaces.Arity14_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity14_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14> Inplaces.Arity14_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14> match10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14> Inplaces.Arity14_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity14_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14> Inplaces.Arity14_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14> match11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14> Inplaces.Arity14_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity14_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14> Inplaces.Arity14_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14> match12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14> Inplaces.Arity14_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity14_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14> Inplaces.Arity14_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14> match13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType, final Nil<I14> in14Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14> Inplaces.Arity14_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14> matchInplace13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType, final Nil<I14> in14Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity14_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO> Inplaces.Arity14_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO> match14(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<IO> ioType, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO> Inplaces.Arity14_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO> matchInplace14(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<IO> ioType, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity14_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity15_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity15_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> match3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity15_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> match4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity15_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> match5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity15_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15> match6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity15_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15> match7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity15_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15> match8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity15_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15> match9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity15_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15> Inplaces.Arity15_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15> match10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15> Inplaces.Arity15_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity15_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type, in15Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15> Inplaces.Arity15_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15> match11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15> Inplaces.Arity15_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity15_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type, in15Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15> Inplaces.Arity15_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15> match12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15> Inplaces.Arity15_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity15_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type, in15Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15> Inplaces.Arity15_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15> match13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15> Inplaces.Arity15_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15> matchInplace13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity15_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type, in15Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15> Inplaces.Arity15_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15> match14(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<IO> ioType, final Nil<I15> in15Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15> Inplaces.Arity15_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15> matchInplace14(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<IO> ioType, final Nil<I15> in15Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity15_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType, in15Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO> Inplaces.Arity15_15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO> match15(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<IO> ioType, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO> Inplaces.Arity15_15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO> matchInplace15(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<IO> ioType, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity15_15.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, ioType});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> match1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
+	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity16_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> match2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
+	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity16_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> match3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
+	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity16_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> match4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
+	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity16_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> match5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
+	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity16_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> match6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity16_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15, I16> match7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity16_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15, I16> match8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity16_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15, I16> match9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15, I16> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity16_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15, I16> match10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15, I16> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity16_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15, I16> Inplaces.Arity16_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15, I16> match11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15, I16> Inplaces.Arity16_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15, I16> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity16_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type, in15Type, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15, I16> Inplaces.Arity16_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15, I16> match12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15, I16> Inplaces.Arity16_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15, I16> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity16_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type, in15Type, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15, I16> Inplaces.Arity16_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15, I16> match13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15, I16> Inplaces.Arity16_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15, I16> matchInplace13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity16_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type, in15Type, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15, I16> Inplaces.Arity16_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15, I16> match14(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<IO> ioType, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15, I16> Inplaces.Arity16_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15, I16> matchInplace14(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<IO> ioType, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity16_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType, in15Type, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO, I16> Inplaces.Arity16_15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO, I16> match15(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<IO> ioType, final Nil<I16> in16Type, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO, I16> Inplaces.Arity16_15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO, I16> matchInplace15(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<IO> ioType, final Nil<I16> in16Type, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity16_15.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, ioType, in16Type});
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO> Inplaces.Arity16_16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO> match16(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<IO> ioType, final Hints hints)
+	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO> Inplaces.Arity16_16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO> matchInplace16(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<IO> ioType, final Hints hints)
 	{
 		return matchHelper(env, opName, hints, Inplaces.Arity16_16.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, ioType});
 	}
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/OpWrappersTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/OpWrappersTest.java
index 7721049ee..dc561899b 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/OpWrappersTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/OpWrappersTest.java
@@ -16,9 +16,7 @@
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.util.ComputerUtils;
-import org.scijava.ops.util.FunctionUtils;
-import org.scijava.ops.util.InplaceUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.GenericTyped;
 import org.scijava.types.Nil;
 
@@ -33,7 +31,7 @@ public class OpWrappersTest extends AbstractTestEnvironment {
 	@Test
 	public void testWrapProducer() {
 		Nil<Double> nilDouble = Nil.of(Double.class);
-		Producer<Double> op = FunctionUtils.match(ops.env(), "test.addDoubles", nilDouble);
+		Producer<Double> op = OpBuilder.matchFunction(ops.env(), "test.addDoubles", nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -41,7 +39,7 @@ public void testWrapProducer() {
 	public void testWrapFunction1() {
 		Nil<Double> nilDouble = Nil.of(Double.class);
 		Function<Double, Double> op = //
-			FunctionUtils.match(ops.env(), "test.addDoubles", //
+			OpBuilder.matchFunction(ops.env(), "test.addDoubles", //
 				nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
@@ -50,7 +48,7 @@ public void testWrapFunction1() {
 	public void testWrapFunction2() {
 		Nil<Double> nilDouble = Nil.of(Double.class);
 		BiFunction<Double, Double, Double> op = //
-			FunctionUtils.match(ops.env(), "test.addDoubles", //
+			OpBuilder.matchFunction(ops.env(), "test.addDoubles", //
 				nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
@@ -59,7 +57,7 @@ public void testWrapFunction2() {
 	public void testWrapFunction3() {
 		Nil<Double> nilDouble = Nil.of(Double.class);
 		Functions.Arity3<Double, Double, Double, Double> op = //
-			FunctionUtils.match(ops.env(), "test.addDoubles", //
+			OpBuilder.matchFunction(ops.env(), "test.addDoubles", //
 				nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
@@ -68,7 +66,7 @@ public void testWrapFunction3() {
 	public void testWrapFunction4() {
 		Nil<Double> nilDouble = Nil.of(Double.class);
 		Functions.Arity4<Double, Double, Double, Double, Double> op = //
-			FunctionUtils.match(ops.env(), "test.addDoubles", //
+			OpBuilder.matchFunction(ops.env(), "test.addDoubles", //
 				nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
@@ -77,7 +75,7 @@ public void testWrapFunction4() {
 	public void testWrapFunction5() {
 		Nil<Double> nilDouble = Nil.of(Double.class);
 		Functions.Arity5<Double, Double, Double, Double, Double, Double> op = //
-			FunctionUtils.match(ops.env(), "test.addDoubles", //
+			OpBuilder.matchFunction(ops.env(), "test.addDoubles", //
 				nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
@@ -86,7 +84,7 @@ public void testWrapFunction5() {
 	public void testWrapFunction6() {
 		Nil<Double> nilDouble = Nil.of(Double.class);
 		Functions.Arity6<Double, Double, Double, Double, Double, Double, Double> op = //
-			FunctionUtils.match(ops.env(), "test.addDoubles", //
+			OpBuilder.matchFunction(ops.env(), "test.addDoubles", //
 				nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
@@ -95,7 +93,7 @@ public void testWrapFunction6() {
 	public void testWrapFunction7() {
 		Nil<Double> nilDouble = Nil.of(Double.class);
 		Functions.Arity7<Double, Double, Double, Double, Double, Double, Double, Double> op = //
-			FunctionUtils.match(ops.env(), "test.addDoubles", //
+			OpBuilder.matchFunction(ops.env(), "test.addDoubles", //
 				nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
@@ -104,7 +102,7 @@ public void testWrapFunction7() {
 	public void testWrapFunction8() {
 		Nil<Double> nilDouble = Nil.of(Double.class);
 		Functions.Arity8<Double, Double, Double, Double, Double, Double, Double, Double, Double> op = //
-			FunctionUtils.match(ops.env(), "test.addDoubles", //
+			OpBuilder.matchFunction(ops.env(), "test.addDoubles", //
 				nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
@@ -113,7 +111,7 @@ public void testWrapFunction8() {
 	public void testWrapFunction9() {
 		Nil<Double> nilDouble = Nil.of(Double.class);
 		Functions.Arity9<Double, Double, Double, Double, Double, Double, Double, Double, Double, Double> op = //
-			FunctionUtils.match(ops.env(), "test.addDoubles", //
+			OpBuilder.matchFunction(ops.env(), "test.addDoubles", //
 				nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
@@ -122,7 +120,7 @@ public void testWrapFunction9() {
 	public void testWrapFunction10() {
 		Nil<Double> nilDouble = Nil.of(Double.class);
 		Functions.Arity10<Double, Double, Double, Double, Double, Double, Double, Double, Double, Double, Double> op = //
-			FunctionUtils.match(ops.env(), "test.addDoubles", //
+			OpBuilder.matchFunction(ops.env(), "test.addDoubles", //
 				nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
@@ -131,7 +129,7 @@ public void testWrapFunction10() {
 	public void testWrapFunction11() {
 		Nil<Double> nilDouble = Nil.of(Double.class);
 		Functions.Arity11<Double, Double, Double, Double, Double, Double, Double, Double, Double, Double, Double, Double> op = //
-			FunctionUtils.match(ops.env(), "test.addDoubles", //
+			OpBuilder.matchFunction(ops.env(), "test.addDoubles", //
 				nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
@@ -140,7 +138,7 @@ public void testWrapFunction11() {
 	public void testWrapFunction12() {
 		Nil<Double> nilDouble = Nil.of(Double.class);
 		Functions.Arity12<Double, Double, Double, Double, Double, Double, Double, Double, Double, Double, Double, Double, Double> op = //
-			FunctionUtils.match(ops.env(), "test.addDoubles", //
+			OpBuilder.matchFunction(ops.env(), "test.addDoubles", //
 				nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
@@ -149,7 +147,7 @@ public void testWrapFunction12() {
 	public void testWrapFunction13() {
 		Nil<Double> nilDouble = Nil.of(Double.class);
 		Functions.Arity13<Double, Double, Double, Double, Double, Double, Double, Double, Double, Double, Double, Double, Double, Double> op = //
-			FunctionUtils.match(ops.env(), "test.addDoubles", //
+			OpBuilder.matchFunction(ops.env(), "test.addDoubles", //
 				nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
@@ -158,7 +156,7 @@ public void testWrapFunction13() {
 	public void testWrapFunction14() {
 		Nil<Double> nilDouble = Nil.of(Double.class);
 		Functions.Arity14<Double, Double, Double, Double, Double, Double, Double, Double, Double, Double, Double, Double, Double, Double, Double> op = //
-			FunctionUtils.match(ops.env(), "test.addDoubles", //
+			OpBuilder.matchFunction(ops.env(), "test.addDoubles", //
 				nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
@@ -167,7 +165,7 @@ public void testWrapFunction14() {
 	public void testWrapFunction15() {
 		Nil<Double> nilDouble = Nil.of(Double.class);
 		Functions.Arity15<Double, Double, Double, Double, Double, Double, Double, Double, Double, Double, Double, Double, Double, Double, Double, Double> op = //
-			FunctionUtils.match(ops.env(), "test.addDoubles", //
+			OpBuilder.matchFunction(ops.env(), "test.addDoubles", //
 				nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
@@ -176,7 +174,7 @@ public void testWrapFunction15() {
 	public void testWrapFunction16() {
 		Nil<Double> nilDouble = Nil.of(Double.class);
 		Functions.Arity16<Double, Double, Double, Double, Double, Double, Double, Double, Double, Double, Double, Double, Double, Double, Double, Double, Double> op = //
-			FunctionUtils.match(ops.env(), "test.addDoubles", //
+			OpBuilder.matchFunction(ops.env(), "test.addDoubles", //
 				nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
@@ -185,7 +183,7 @@ public void testWrapFunction16() {
 	public void testWrapComputer1() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Computers.Arity1<double[], double[]> op = //
-			ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble);
+			OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -193,7 +191,7 @@ public void testWrapComputer1() {
 	public void testWrapComputer2() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Computers.Arity2<double[], double[], double[]> op = //
-			ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -201,7 +199,7 @@ public void testWrapComputer2() {
 	public void testWrapComputer3() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Computers.Arity3<double[], double[], double[], double[]> op = //
-			ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -209,7 +207,7 @@ public void testWrapComputer3() {
 	public void testWrapComputer4() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Computers.Arity4<double[], double[], double[], double[], double[]> op = //
-			ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -217,7 +215,7 @@ public void testWrapComputer4() {
 	public void testWrapComputer5() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Computers.Arity5<double[], double[], double[], double[], double[], double[]> op = //
-			ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -225,7 +223,7 @@ public void testWrapComputer5() {
 	public void testWrapComputer6() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Computers.Arity6<double[], double[], double[], double[], double[], double[], double[]> op = //
-			ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -233,7 +231,7 @@ public void testWrapComputer6() {
 	public void testWrapComputer7() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Computers.Arity7<double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -241,7 +239,7 @@ public void testWrapComputer7() {
 	public void testWrapComputer8() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Computers.Arity8<double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -249,7 +247,7 @@ public void testWrapComputer8() {
 	public void testWrapComputer9() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Computers.Arity9<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -257,7 +255,7 @@ public void testWrapComputer9() {
 	public void testWrapComputer10() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Computers.Arity10<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -265,7 +263,7 @@ public void testWrapComputer10() {
 	public void testWrapComputer11() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Computers.Arity11<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -273,7 +271,7 @@ public void testWrapComputer11() {
 	public void testWrapComputer12() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Computers.Arity12<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -281,7 +279,7 @@ public void testWrapComputer12() {
 	public void testWrapComputer13() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Computers.Arity13<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -289,7 +287,7 @@ public void testWrapComputer13() {
 	public void testWrapComputer14() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Computers.Arity14<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -297,7 +295,7 @@ public void testWrapComputer14() {
 	public void testWrapComputer15() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Computers.Arity15<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -305,7 +303,7 @@ public void testWrapComputer15() {
 	public void testWrapComputer16() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Computers.Arity16<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -313,7 +311,7 @@ public void testWrapComputer16() {
 	public void testWrapInplace1() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity1<double[]> op = //
-			InplaceUtils.match(ops.env(), "test.mulArrays1_1", nilDouble);
+			OpBuilder.matchInplace(ops.env(), "test.mulArrays1_1", nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -321,7 +319,7 @@ public void testWrapInplace1() {
 	public void testWrapInplace2_1() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity2_1<double[], double[]> op = //
-			InplaceUtils.match1(ops.env(), "test.mulArrays2_1", nilDouble, nilDouble);
+			OpBuilder.matchInplace1(ops.env(), "test.mulArrays2_1", nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -329,7 +327,7 @@ public void testWrapInplace2_1() {
 	public void testWrapInplace2_2() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity2_2<double[], double[]> op = //
-			InplaceUtils.match2(ops.env(), "test.mulArrays2_2", nilDouble, nilDouble);
+			OpBuilder.matchInplace2(ops.env(), "test.mulArrays2_2", nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -337,7 +335,7 @@ public void testWrapInplace2_2() {
 	public void testWrapInplace3_1() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity3_1<double[], double[], double[]> op = //
-			InplaceUtils.match1(ops.env(), "test.mulArrays3_1", nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace1(ops.env(), "test.mulArrays3_1", nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -345,7 +343,7 @@ public void testWrapInplace3_1() {
 	public void testWrapInplace3_2() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity3_2<double[], double[], double[]> op = //
-			InplaceUtils.match2(ops.env(), "test.mulArrays3_2", nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace2(ops.env(), "test.mulArrays3_2", nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -353,7 +351,7 @@ public void testWrapInplace3_2() {
 	public void testWrapInplace3_3() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity3_3<double[], double[], double[]> op = //
-			InplaceUtils.match3(ops.env(), "test.mulArrays3_3", nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace3(ops.env(), "test.mulArrays3_3", nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -361,7 +359,7 @@ public void testWrapInplace3_3() {
 	public void testWrapInplace4_1() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity4_1<double[], double[], double[], double[]> op = //
-			InplaceUtils.match1(ops.env(), "test.mulArrays4_1", nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace1(ops.env(), "test.mulArrays4_1", nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -369,7 +367,7 @@ public void testWrapInplace4_1() {
 	public void testWrapInplace4_2() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity4_2<double[], double[], double[], double[]> op = //
-			InplaceUtils.match2(ops.env(), "test.mulArrays4_2", nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace2(ops.env(), "test.mulArrays4_2", nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -377,7 +375,7 @@ public void testWrapInplace4_2() {
 	public void testWrapInplace4_3() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity4_3<double[], double[], double[], double[]> op = //
-			InplaceUtils.match3(ops.env(), "test.mulArrays4_3", nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace3(ops.env(), "test.mulArrays4_3", nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -385,7 +383,7 @@ public void testWrapInplace4_3() {
 	public void testWrapInplace4_4() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity4_4<double[], double[], double[], double[]> op = //
-			InplaceUtils.match4(ops.env(), "test.mulArrays4_4", nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace4(ops.env(), "test.mulArrays4_4", nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -393,7 +391,7 @@ public void testWrapInplace4_4() {
 	public void testWrapInplace5_1() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity5_1<double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match1(ops.env(), "test.mulArrays5_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace1(ops.env(), "test.mulArrays5_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -401,7 +399,7 @@ public void testWrapInplace5_1() {
 	public void testWrapInplace5_2() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity5_2<double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match2(ops.env(), "test.mulArrays5_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace2(ops.env(), "test.mulArrays5_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -409,7 +407,7 @@ public void testWrapInplace5_2() {
 	public void testWrapInplace5_3() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity5_3<double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match3(ops.env(), "test.mulArrays5_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace3(ops.env(), "test.mulArrays5_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -417,7 +415,7 @@ public void testWrapInplace5_3() {
 	public void testWrapInplace5_4() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity5_4<double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match4(ops.env(), "test.mulArrays5_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace4(ops.env(), "test.mulArrays5_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -425,7 +423,7 @@ public void testWrapInplace5_4() {
 	public void testWrapInplace5_5() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity5_5<double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match5(ops.env(), "test.mulArrays5_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace5(ops.env(), "test.mulArrays5_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -433,7 +431,7 @@ public void testWrapInplace5_5() {
 	public void testWrapInplace6_1() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity6_1<double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match1(ops.env(), "test.mulArrays6_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace1(ops.env(), "test.mulArrays6_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -441,7 +439,7 @@ public void testWrapInplace6_1() {
 	public void testWrapInplace6_2() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity6_2<double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match2(ops.env(), "test.mulArrays6_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace2(ops.env(), "test.mulArrays6_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -449,7 +447,7 @@ public void testWrapInplace6_2() {
 	public void testWrapInplace6_3() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity6_3<double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match3(ops.env(), "test.mulArrays6_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace3(ops.env(), "test.mulArrays6_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -457,7 +455,7 @@ public void testWrapInplace6_3() {
 	public void testWrapInplace6_4() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity6_4<double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match4(ops.env(), "test.mulArrays6_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace4(ops.env(), "test.mulArrays6_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -465,7 +463,7 @@ public void testWrapInplace6_4() {
 	public void testWrapInplace6_5() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity6_5<double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match5(ops.env(), "test.mulArrays6_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace5(ops.env(), "test.mulArrays6_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -473,7 +471,7 @@ public void testWrapInplace6_5() {
 	public void testWrapInplace6_6() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity6_6<double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match6(ops.env(), "test.mulArrays6_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace6(ops.env(), "test.mulArrays6_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -481,7 +479,7 @@ public void testWrapInplace6_6() {
 	public void testWrapInplace7_1() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity7_1<double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match1(ops.env(), "test.mulArrays7_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace1(ops.env(), "test.mulArrays7_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -489,7 +487,7 @@ public void testWrapInplace7_1() {
 	public void testWrapInplace7_2() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity7_2<double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match2(ops.env(), "test.mulArrays7_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace2(ops.env(), "test.mulArrays7_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -497,7 +495,7 @@ public void testWrapInplace7_2() {
 	public void testWrapInplace7_3() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity7_3<double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match3(ops.env(), "test.mulArrays7_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace3(ops.env(), "test.mulArrays7_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -505,7 +503,7 @@ public void testWrapInplace7_3() {
 	public void testWrapInplace7_4() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity7_4<double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match4(ops.env(), "test.mulArrays7_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace4(ops.env(), "test.mulArrays7_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -513,7 +511,7 @@ public void testWrapInplace7_4() {
 	public void testWrapInplace7_5() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity7_5<double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match5(ops.env(), "test.mulArrays7_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace5(ops.env(), "test.mulArrays7_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -521,7 +519,7 @@ public void testWrapInplace7_5() {
 	public void testWrapInplace7_6() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity7_6<double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match6(ops.env(), "test.mulArrays7_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace6(ops.env(), "test.mulArrays7_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -529,7 +527,7 @@ public void testWrapInplace7_6() {
 	public void testWrapInplace7_7() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity7_7<double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match7(ops.env(), "test.mulArrays7_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace7(ops.env(), "test.mulArrays7_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -537,7 +535,7 @@ public void testWrapInplace7_7() {
 	public void testWrapInplace8_1() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity8_1<double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match1(ops.env(), "test.mulArrays8_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace1(ops.env(), "test.mulArrays8_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -545,7 +543,7 @@ public void testWrapInplace8_1() {
 	public void testWrapInplace8_2() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity8_2<double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match2(ops.env(), "test.mulArrays8_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace2(ops.env(), "test.mulArrays8_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -553,7 +551,7 @@ public void testWrapInplace8_2() {
 	public void testWrapInplace8_3() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity8_3<double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match3(ops.env(), "test.mulArrays8_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace3(ops.env(), "test.mulArrays8_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -561,7 +559,7 @@ public void testWrapInplace8_3() {
 	public void testWrapInplace8_4() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity8_4<double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match4(ops.env(), "test.mulArrays8_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace4(ops.env(), "test.mulArrays8_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -569,7 +567,7 @@ public void testWrapInplace8_4() {
 	public void testWrapInplace8_5() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity8_5<double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match5(ops.env(), "test.mulArrays8_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace5(ops.env(), "test.mulArrays8_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -577,7 +575,7 @@ public void testWrapInplace8_5() {
 	public void testWrapInplace8_6() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity8_6<double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match6(ops.env(), "test.mulArrays8_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace6(ops.env(), "test.mulArrays8_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -585,7 +583,7 @@ public void testWrapInplace8_6() {
 	public void testWrapInplace8_7() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity8_7<double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match7(ops.env(), "test.mulArrays8_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace7(ops.env(), "test.mulArrays8_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -593,7 +591,7 @@ public void testWrapInplace8_7() {
 	public void testWrapInplace8_8() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity8_8<double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match8(ops.env(), "test.mulArrays8_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace8(ops.env(), "test.mulArrays8_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -601,7 +599,7 @@ public void testWrapInplace8_8() {
 	public void testWrapInplace9_1() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity9_1<double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match1(ops.env(), "test.mulArrays9_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace1(ops.env(), "test.mulArrays9_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -609,7 +607,7 @@ public void testWrapInplace9_1() {
 	public void testWrapInplace9_2() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity9_2<double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match2(ops.env(), "test.mulArrays9_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace2(ops.env(), "test.mulArrays9_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -617,7 +615,7 @@ public void testWrapInplace9_2() {
 	public void testWrapInplace9_3() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity9_3<double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match3(ops.env(), "test.mulArrays9_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace3(ops.env(), "test.mulArrays9_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -625,7 +623,7 @@ public void testWrapInplace9_3() {
 	public void testWrapInplace9_4() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity9_4<double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match4(ops.env(), "test.mulArrays9_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace4(ops.env(), "test.mulArrays9_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -633,7 +631,7 @@ public void testWrapInplace9_4() {
 	public void testWrapInplace9_5() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity9_5<double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match5(ops.env(), "test.mulArrays9_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace5(ops.env(), "test.mulArrays9_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -641,7 +639,7 @@ public void testWrapInplace9_5() {
 	public void testWrapInplace9_6() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity9_6<double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match6(ops.env(), "test.mulArrays9_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace6(ops.env(), "test.mulArrays9_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -649,7 +647,7 @@ public void testWrapInplace9_6() {
 	public void testWrapInplace9_7() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity9_7<double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match7(ops.env(), "test.mulArrays9_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace7(ops.env(), "test.mulArrays9_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -657,7 +655,7 @@ public void testWrapInplace9_7() {
 	public void testWrapInplace9_8() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity9_8<double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match8(ops.env(), "test.mulArrays9_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace8(ops.env(), "test.mulArrays9_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -665,7 +663,7 @@ public void testWrapInplace9_8() {
 	public void testWrapInplace9_9() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity9_9<double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match9(ops.env(), "test.mulArrays9_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace9(ops.env(), "test.mulArrays9_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -673,7 +671,7 @@ public void testWrapInplace9_9() {
 	public void testWrapInplace10_1() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity10_1<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match1(ops.env(), "test.mulArrays10_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace1(ops.env(), "test.mulArrays10_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -681,7 +679,7 @@ public void testWrapInplace10_1() {
 	public void testWrapInplace10_2() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity10_2<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match2(ops.env(), "test.mulArrays10_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace2(ops.env(), "test.mulArrays10_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -689,7 +687,7 @@ public void testWrapInplace10_2() {
 	public void testWrapInplace10_3() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity10_3<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match3(ops.env(), "test.mulArrays10_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace3(ops.env(), "test.mulArrays10_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -697,7 +695,7 @@ public void testWrapInplace10_3() {
 	public void testWrapInplace10_4() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity10_4<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match4(ops.env(), "test.mulArrays10_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace4(ops.env(), "test.mulArrays10_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -705,7 +703,7 @@ public void testWrapInplace10_4() {
 	public void testWrapInplace10_5() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity10_5<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match5(ops.env(), "test.mulArrays10_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace5(ops.env(), "test.mulArrays10_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -713,7 +711,7 @@ public void testWrapInplace10_5() {
 	public void testWrapInplace10_6() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity10_6<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match6(ops.env(), "test.mulArrays10_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace6(ops.env(), "test.mulArrays10_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -721,7 +719,7 @@ public void testWrapInplace10_6() {
 	public void testWrapInplace10_7() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity10_7<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match7(ops.env(), "test.mulArrays10_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace7(ops.env(), "test.mulArrays10_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -729,7 +727,7 @@ public void testWrapInplace10_7() {
 	public void testWrapInplace10_8() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity10_8<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match8(ops.env(), "test.mulArrays10_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace8(ops.env(), "test.mulArrays10_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -737,7 +735,7 @@ public void testWrapInplace10_8() {
 	public void testWrapInplace10_9() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity10_9<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match9(ops.env(), "test.mulArrays10_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace9(ops.env(), "test.mulArrays10_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -745,7 +743,7 @@ public void testWrapInplace10_9() {
 	public void testWrapInplace10_10() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity10_10<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match10(ops.env(), "test.mulArrays10_10", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace10(ops.env(), "test.mulArrays10_10", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -753,7 +751,7 @@ public void testWrapInplace10_10() {
 	public void testWrapInplace11_1() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity11_1<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match1(ops.env(), "test.mulArrays11_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace1(ops.env(), "test.mulArrays11_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -761,7 +759,7 @@ public void testWrapInplace11_1() {
 	public void testWrapInplace11_2() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity11_2<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match2(ops.env(), "test.mulArrays11_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace2(ops.env(), "test.mulArrays11_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -769,7 +767,7 @@ public void testWrapInplace11_2() {
 	public void testWrapInplace11_3() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity11_3<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match3(ops.env(), "test.mulArrays11_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace3(ops.env(), "test.mulArrays11_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -777,7 +775,7 @@ public void testWrapInplace11_3() {
 	public void testWrapInplace11_4() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity11_4<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match4(ops.env(), "test.mulArrays11_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace4(ops.env(), "test.mulArrays11_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -785,7 +783,7 @@ public void testWrapInplace11_4() {
 	public void testWrapInplace11_5() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity11_5<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match5(ops.env(), "test.mulArrays11_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace5(ops.env(), "test.mulArrays11_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -793,7 +791,7 @@ public void testWrapInplace11_5() {
 	public void testWrapInplace11_6() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity11_6<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match6(ops.env(), "test.mulArrays11_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace6(ops.env(), "test.mulArrays11_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -801,7 +799,7 @@ public void testWrapInplace11_6() {
 	public void testWrapInplace11_7() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity11_7<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match7(ops.env(), "test.mulArrays11_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace7(ops.env(), "test.mulArrays11_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -809,7 +807,7 @@ public void testWrapInplace11_7() {
 	public void testWrapInplace11_8() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity11_8<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match8(ops.env(), "test.mulArrays11_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace8(ops.env(), "test.mulArrays11_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -817,7 +815,7 @@ public void testWrapInplace11_8() {
 	public void testWrapInplace11_9() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity11_9<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match9(ops.env(), "test.mulArrays11_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace9(ops.env(), "test.mulArrays11_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -825,7 +823,7 @@ public void testWrapInplace11_9() {
 	public void testWrapInplace11_10() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity11_10<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match10(ops.env(), "test.mulArrays11_10", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace10(ops.env(), "test.mulArrays11_10", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -833,7 +831,7 @@ public void testWrapInplace11_10() {
 	public void testWrapInplace11_11() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity11_11<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match11(ops.env(), "test.mulArrays11_11", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace11(ops.env(), "test.mulArrays11_11", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -841,7 +839,7 @@ public void testWrapInplace11_11() {
 	public void testWrapInplace12_1() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity12_1<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match1(ops.env(), "test.mulArrays12_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace1(ops.env(), "test.mulArrays12_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -849,7 +847,7 @@ public void testWrapInplace12_1() {
 	public void testWrapInplace12_2() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity12_2<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match2(ops.env(), "test.mulArrays12_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace2(ops.env(), "test.mulArrays12_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -857,7 +855,7 @@ public void testWrapInplace12_2() {
 	public void testWrapInplace12_3() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity12_3<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match3(ops.env(), "test.mulArrays12_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace3(ops.env(), "test.mulArrays12_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -865,7 +863,7 @@ public void testWrapInplace12_3() {
 	public void testWrapInplace12_4() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity12_4<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match4(ops.env(), "test.mulArrays12_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace4(ops.env(), "test.mulArrays12_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -873,7 +871,7 @@ public void testWrapInplace12_4() {
 	public void testWrapInplace12_5() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity12_5<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match5(ops.env(), "test.mulArrays12_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace5(ops.env(), "test.mulArrays12_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -881,7 +879,7 @@ public void testWrapInplace12_5() {
 	public void testWrapInplace12_6() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity12_6<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match6(ops.env(), "test.mulArrays12_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace6(ops.env(), "test.mulArrays12_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -889,7 +887,7 @@ public void testWrapInplace12_6() {
 	public void testWrapInplace12_7() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity12_7<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match7(ops.env(), "test.mulArrays12_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace7(ops.env(), "test.mulArrays12_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -897,7 +895,7 @@ public void testWrapInplace12_7() {
 	public void testWrapInplace12_8() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity12_8<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match8(ops.env(), "test.mulArrays12_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace8(ops.env(), "test.mulArrays12_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -905,7 +903,7 @@ public void testWrapInplace12_8() {
 	public void testWrapInplace12_9() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity12_9<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match9(ops.env(), "test.mulArrays12_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace9(ops.env(), "test.mulArrays12_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -913,7 +911,7 @@ public void testWrapInplace12_9() {
 	public void testWrapInplace12_10() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity12_10<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match10(ops.env(), "test.mulArrays12_10", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace10(ops.env(), "test.mulArrays12_10", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -921,7 +919,7 @@ public void testWrapInplace12_10() {
 	public void testWrapInplace12_11() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity12_11<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match11(ops.env(), "test.mulArrays12_11", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace11(ops.env(), "test.mulArrays12_11", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -929,7 +927,7 @@ public void testWrapInplace12_11() {
 	public void testWrapInplace12_12() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity12_12<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match12(ops.env(), "test.mulArrays12_12", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace12(ops.env(), "test.mulArrays12_12", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -937,7 +935,7 @@ public void testWrapInplace12_12() {
 	public void testWrapInplace13_1() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity13_1<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match1(ops.env(), "test.mulArrays13_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace1(ops.env(), "test.mulArrays13_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -945,7 +943,7 @@ public void testWrapInplace13_1() {
 	public void testWrapInplace13_2() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity13_2<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match2(ops.env(), "test.mulArrays13_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace2(ops.env(), "test.mulArrays13_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -953,7 +951,7 @@ public void testWrapInplace13_2() {
 	public void testWrapInplace13_3() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity13_3<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match3(ops.env(), "test.mulArrays13_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace3(ops.env(), "test.mulArrays13_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -961,7 +959,7 @@ public void testWrapInplace13_3() {
 	public void testWrapInplace13_4() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity13_4<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match4(ops.env(), "test.mulArrays13_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace4(ops.env(), "test.mulArrays13_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -969,7 +967,7 @@ public void testWrapInplace13_4() {
 	public void testWrapInplace13_5() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity13_5<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match5(ops.env(), "test.mulArrays13_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace5(ops.env(), "test.mulArrays13_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -977,7 +975,7 @@ public void testWrapInplace13_5() {
 	public void testWrapInplace13_6() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity13_6<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match6(ops.env(), "test.mulArrays13_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace6(ops.env(), "test.mulArrays13_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -985,7 +983,7 @@ public void testWrapInplace13_6() {
 	public void testWrapInplace13_7() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity13_7<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match7(ops.env(), "test.mulArrays13_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace7(ops.env(), "test.mulArrays13_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -993,7 +991,7 @@ public void testWrapInplace13_7() {
 	public void testWrapInplace13_8() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity13_8<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match8(ops.env(), "test.mulArrays13_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace8(ops.env(), "test.mulArrays13_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1001,7 +999,7 @@ public void testWrapInplace13_8() {
 	public void testWrapInplace13_9() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity13_9<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match9(ops.env(), "test.mulArrays13_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace9(ops.env(), "test.mulArrays13_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1009,7 +1007,7 @@ public void testWrapInplace13_9() {
 	public void testWrapInplace13_10() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity13_10<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match10(ops.env(), "test.mulArrays13_10", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace10(ops.env(), "test.mulArrays13_10", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1017,7 +1015,7 @@ public void testWrapInplace13_10() {
 	public void testWrapInplace13_11() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity13_11<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match11(ops.env(), "test.mulArrays13_11", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace11(ops.env(), "test.mulArrays13_11", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1025,7 +1023,7 @@ public void testWrapInplace13_11() {
 	public void testWrapInplace13_12() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity13_12<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match12(ops.env(), "test.mulArrays13_12", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace12(ops.env(), "test.mulArrays13_12", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1033,7 +1031,7 @@ public void testWrapInplace13_12() {
 	public void testWrapInplace13_13() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity13_13<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match13(ops.env(), "test.mulArrays13_13", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace13(ops.env(), "test.mulArrays13_13", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1041,7 +1039,7 @@ public void testWrapInplace13_13() {
 	public void testWrapInplace14_1() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity14_1<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match1(ops.env(), "test.mulArrays14_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace1(ops.env(), "test.mulArrays14_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1049,7 +1047,7 @@ public void testWrapInplace14_1() {
 	public void testWrapInplace14_2() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity14_2<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match2(ops.env(), "test.mulArrays14_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace2(ops.env(), "test.mulArrays14_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1057,7 +1055,7 @@ public void testWrapInplace14_2() {
 	public void testWrapInplace14_3() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity14_3<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match3(ops.env(), "test.mulArrays14_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace3(ops.env(), "test.mulArrays14_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1065,7 +1063,7 @@ public void testWrapInplace14_3() {
 	public void testWrapInplace14_4() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity14_4<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match4(ops.env(), "test.mulArrays14_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace4(ops.env(), "test.mulArrays14_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1073,7 +1071,7 @@ public void testWrapInplace14_4() {
 	public void testWrapInplace14_5() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity14_5<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match5(ops.env(), "test.mulArrays14_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace5(ops.env(), "test.mulArrays14_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1081,7 +1079,7 @@ public void testWrapInplace14_5() {
 	public void testWrapInplace14_6() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity14_6<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match6(ops.env(), "test.mulArrays14_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace6(ops.env(), "test.mulArrays14_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1089,7 +1087,7 @@ public void testWrapInplace14_6() {
 	public void testWrapInplace14_7() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity14_7<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match7(ops.env(), "test.mulArrays14_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace7(ops.env(), "test.mulArrays14_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1097,7 +1095,7 @@ public void testWrapInplace14_7() {
 	public void testWrapInplace14_8() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity14_8<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match8(ops.env(), "test.mulArrays14_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace8(ops.env(), "test.mulArrays14_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1105,7 +1103,7 @@ public void testWrapInplace14_8() {
 	public void testWrapInplace14_9() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity14_9<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match9(ops.env(), "test.mulArrays14_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace9(ops.env(), "test.mulArrays14_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1113,7 +1111,7 @@ public void testWrapInplace14_9() {
 	public void testWrapInplace14_10() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity14_10<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match10(ops.env(), "test.mulArrays14_10", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace10(ops.env(), "test.mulArrays14_10", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1121,7 +1119,7 @@ public void testWrapInplace14_10() {
 	public void testWrapInplace14_11() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity14_11<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match11(ops.env(), "test.mulArrays14_11", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace11(ops.env(), "test.mulArrays14_11", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1129,7 +1127,7 @@ public void testWrapInplace14_11() {
 	public void testWrapInplace14_12() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity14_12<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match12(ops.env(), "test.mulArrays14_12", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace12(ops.env(), "test.mulArrays14_12", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1137,7 +1135,7 @@ public void testWrapInplace14_12() {
 	public void testWrapInplace14_13() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity14_13<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match13(ops.env(), "test.mulArrays14_13", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace13(ops.env(), "test.mulArrays14_13", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1145,7 +1143,7 @@ public void testWrapInplace14_13() {
 	public void testWrapInplace14_14() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity14_14<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match14(ops.env(), "test.mulArrays14_14", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace14(ops.env(), "test.mulArrays14_14", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1153,7 +1151,7 @@ public void testWrapInplace14_14() {
 	public void testWrapInplace15_1() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity15_1<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match1(ops.env(), "test.mulArrays15_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace1(ops.env(), "test.mulArrays15_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1161,7 +1159,7 @@ public void testWrapInplace15_1() {
 	public void testWrapInplace15_2() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity15_2<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match2(ops.env(), "test.mulArrays15_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace2(ops.env(), "test.mulArrays15_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1169,7 +1167,7 @@ public void testWrapInplace15_2() {
 	public void testWrapInplace15_3() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity15_3<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match3(ops.env(), "test.mulArrays15_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace3(ops.env(), "test.mulArrays15_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1177,7 +1175,7 @@ public void testWrapInplace15_3() {
 	public void testWrapInplace15_4() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity15_4<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match4(ops.env(), "test.mulArrays15_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace4(ops.env(), "test.mulArrays15_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1185,7 +1183,7 @@ public void testWrapInplace15_4() {
 	public void testWrapInplace15_5() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity15_5<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match5(ops.env(), "test.mulArrays15_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace5(ops.env(), "test.mulArrays15_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1193,7 +1191,7 @@ public void testWrapInplace15_5() {
 	public void testWrapInplace15_6() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity15_6<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match6(ops.env(), "test.mulArrays15_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace6(ops.env(), "test.mulArrays15_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1201,7 +1199,7 @@ public void testWrapInplace15_6() {
 	public void testWrapInplace15_7() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity15_7<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match7(ops.env(), "test.mulArrays15_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace7(ops.env(), "test.mulArrays15_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1209,7 +1207,7 @@ public void testWrapInplace15_7() {
 	public void testWrapInplace15_8() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity15_8<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match8(ops.env(), "test.mulArrays15_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace8(ops.env(), "test.mulArrays15_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1217,7 +1215,7 @@ public void testWrapInplace15_8() {
 	public void testWrapInplace15_9() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity15_9<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match9(ops.env(), "test.mulArrays15_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace9(ops.env(), "test.mulArrays15_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1225,7 +1223,7 @@ public void testWrapInplace15_9() {
 	public void testWrapInplace15_10() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity15_10<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match10(ops.env(), "test.mulArrays15_10", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace10(ops.env(), "test.mulArrays15_10", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1233,7 +1231,7 @@ public void testWrapInplace15_10() {
 	public void testWrapInplace15_11() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity15_11<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match11(ops.env(), "test.mulArrays15_11", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace11(ops.env(), "test.mulArrays15_11", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1241,7 +1239,7 @@ public void testWrapInplace15_11() {
 	public void testWrapInplace15_12() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity15_12<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match12(ops.env(), "test.mulArrays15_12", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace12(ops.env(), "test.mulArrays15_12", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1249,7 +1247,7 @@ public void testWrapInplace15_12() {
 	public void testWrapInplace15_13() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity15_13<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match13(ops.env(), "test.mulArrays15_13", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace13(ops.env(), "test.mulArrays15_13", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1257,7 +1255,7 @@ public void testWrapInplace15_13() {
 	public void testWrapInplace15_14() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity15_14<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match14(ops.env(), "test.mulArrays15_14", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace14(ops.env(), "test.mulArrays15_14", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1265,7 +1263,7 @@ public void testWrapInplace15_14() {
 	public void testWrapInplace15_15() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity15_15<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match15(ops.env(), "test.mulArrays15_15", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace15(ops.env(), "test.mulArrays15_15", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1273,7 +1271,7 @@ public void testWrapInplace15_15() {
 	public void testWrapInplace16_1() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity16_1<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match1(ops.env(), "test.mulArrays16_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace1(ops.env(), "test.mulArrays16_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1281,7 +1279,7 @@ public void testWrapInplace16_1() {
 	public void testWrapInplace16_2() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity16_2<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match2(ops.env(), "test.mulArrays16_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace2(ops.env(), "test.mulArrays16_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1289,7 +1287,7 @@ public void testWrapInplace16_2() {
 	public void testWrapInplace16_3() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity16_3<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match3(ops.env(), "test.mulArrays16_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace3(ops.env(), "test.mulArrays16_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1297,7 +1295,7 @@ public void testWrapInplace16_3() {
 	public void testWrapInplace16_4() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity16_4<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match4(ops.env(), "test.mulArrays16_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace4(ops.env(), "test.mulArrays16_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1305,7 +1303,7 @@ public void testWrapInplace16_4() {
 	public void testWrapInplace16_5() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity16_5<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match5(ops.env(), "test.mulArrays16_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace5(ops.env(), "test.mulArrays16_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1313,7 +1311,7 @@ public void testWrapInplace16_5() {
 	public void testWrapInplace16_6() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity16_6<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match6(ops.env(), "test.mulArrays16_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace6(ops.env(), "test.mulArrays16_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1321,7 +1319,7 @@ public void testWrapInplace16_6() {
 	public void testWrapInplace16_7() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity16_7<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match7(ops.env(), "test.mulArrays16_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace7(ops.env(), "test.mulArrays16_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1329,7 +1327,7 @@ public void testWrapInplace16_7() {
 	public void testWrapInplace16_8() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity16_8<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match8(ops.env(), "test.mulArrays16_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace8(ops.env(), "test.mulArrays16_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1337,7 +1335,7 @@ public void testWrapInplace16_8() {
 	public void testWrapInplace16_9() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity16_9<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match9(ops.env(), "test.mulArrays16_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace9(ops.env(), "test.mulArrays16_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1345,7 +1343,7 @@ public void testWrapInplace16_9() {
 	public void testWrapInplace16_10() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity16_10<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match10(ops.env(), "test.mulArrays16_10", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace10(ops.env(), "test.mulArrays16_10", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1353,7 +1351,7 @@ public void testWrapInplace16_10() {
 	public void testWrapInplace16_11() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity16_11<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match11(ops.env(), "test.mulArrays16_11", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace11(ops.env(), "test.mulArrays16_11", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1361,7 +1359,7 @@ public void testWrapInplace16_11() {
 	public void testWrapInplace16_12() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity16_12<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match12(ops.env(), "test.mulArrays16_12", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace12(ops.env(), "test.mulArrays16_12", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1369,7 +1367,7 @@ public void testWrapInplace16_12() {
 	public void testWrapInplace16_13() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity16_13<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match13(ops.env(), "test.mulArrays16_13", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace13(ops.env(), "test.mulArrays16_13", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1377,7 +1375,7 @@ public void testWrapInplace16_13() {
 	public void testWrapInplace16_14() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity16_14<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match14(ops.env(), "test.mulArrays16_14", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace14(ops.env(), "test.mulArrays16_14", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1385,7 +1383,7 @@ public void testWrapInplace16_14() {
 	public void testWrapInplace16_15() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity16_15<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match15(ops.env(), "test.mulArrays16_15", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace15(ops.env(), "test.mulArrays16_15", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -1393,7 +1391,7 @@ public void testWrapInplace16_15() {
 	public void testWrapInplace16_16() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		Inplaces.Arity16_16<double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[], double[]> op = //
-			InplaceUtils.match16(ops.env(), "test.mulArrays16_16", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
+			OpBuilder.matchInplace16(ops.env(), "test.mulArrays16_16", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/InplacesTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/InplacesTest.java
index b106d4b45..ce35a3610 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/InplacesTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/InplacesTest.java
@@ -32,7 +32,7 @@
 import org.junit.Test;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.util.InplaceUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 public class InplacesTest extends AbstractTestEnvironment {
@@ -42,7 +42,7 @@ public class InplacesTest extends AbstractTestEnvironment {
 
 	@Test
 	public void testUnaryInplaces() {
-		Inplaces.Arity1<double[]> inplaceSqrt = InplaceUtils.match(ops.env(), "math.sqrt", nilDoubleArray);
+		Inplaces.Arity1<double[]> inplaceSqrt = OpBuilder.matchInplace(ops.env(), "math.sqrt", nilDoubleArray);
 		final double[] a1 = { 4, 100, 36 };
 		inplaceSqrt.mutate(a1);
 		assert arrayEquals(a1, 2.0, 10.0, 6.0);
@@ -50,7 +50,7 @@ public void testUnaryInplaces() {
 
 	@Test
 	public void testBinaryInplaces() {
-		final Inplaces.Arity2_1<double[], double[]> inplaceAdd = InplaceUtils.match1(ops.env(), "math.add", nilDoubleArray,
+		final Inplaces.Arity2_1<double[], double[]> inplaceAdd = OpBuilder.matchInplace1(ops.env(), "math.add", nilDoubleArray,
 				nilDoubleArray);
 		final double[] a1 = { 3, 5, 7 };
 		final double[] a2 = { 2, 4, 9 };
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.list b/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.list
index a3866eb1d..f4f87aae9 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.list
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.list
@@ -48,6 +48,7 @@ inputClassesToTypes = ```
 ```
 inputTypesArgs = ```
 { arity ->
+  arity == 0 ? '' : 
   String.join(', ', (1..arity).stream().map{a -> "final Nil<I$a> in${a}Type"}.collect())
 }
 ```
@@ -58,16 +59,73 @@ inputTypesFromArgs = ```
 ```
 inputTypesArgsWithOutput = ```
 { arity ->
+  arity == 0 ? 'final Nil<O> outType' : 
   String.join(', ', (1..arity).stream().map{a -> "final Nil<I$a> in${a}Type"}.collect()) + ', final Nil<O> outType'
 }
 ```
 inputTypes = ```
 { arity ->
+  arity == 0 ? '' : 
   String.join(', ', (1..arity).stream().map{a -> "in${a}Type"}.collect())
 }
 ```
 inputTypesWithOutput = ```
 { arity ->
+  arity == 0 ? 'outType' : 
   String.join(', ', (1..arity).stream().map{a -> "in${a}Type"}.collect()) + ', outType'
 }
 ```
+simplifiedClass = ```
+{ arity, num ->
+  simplifiedInplace(arity, num) + '.class'
+}
+```
+inplaceClass = ```
+{ arity, num ->
+  inplaceType(arity, num) + '.class'
+}
+```
+matchName = ```
+{ arity, num ->
+  arity == 1 ? "matchInplace" :
+  "matchInplace${num}"
+}
+```
+inplaceTypeVarNums = ```
+{ arity, io ->
+  (1..arity).subList(0, io - 1) + 'O' + (1..arity).subList(io, arity)
+}
+```
+inplaceGenericsList = ```
+{ arity, io ->
+  inplaceTypeVarNums(arity, io).stream().map{a -> "I$a"}.collect()
+}
+```
+inplaceGenerics = ```
+{ arity, io ->
+  '<' + String.join(', ', inplaceGenericsList(arity, io)) + '>'
+}
+```
+matchParams = ```
+{ arity, io ->
+  String.join(', ', inplaceGenericsList(arity, io).stream().map{a -> 
+    a.charAt(1) == 'O'? 
+	"final Nil<$a> ${a.toLowerCase()}Type"  :
+	"final Nil<$a> in${a.substring(1)}Type"}.collect())
+}
+```
+typeVarNums = ```
+{ arity, io ->
+  (1..arity).subList(0, io - 1) + 'O' + (1..arity).subList(io, arity)
+}
+```
+basicParamsList = ```
+{ arity, io -> 
+	typeVarNums(arity, io).stream().map{a -> a == 'O' ? "ioType" : "in${a}Type"}.collect()
+}
+```
+basicParams = ```
+{ arity, io ->
+  String.join(', ', basicParamsList(arity, io))
+}
+```
\ No newline at end of file
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.vm
index 364961f5e..3781e30d8 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.vm
@@ -42,11 +42,6 @@ import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.Hints;
-import org.scijava.ops.util.ComputerUtils;
-import org.scijava.ops.util.FunctionUtils;
-import org.scijava.ops.util.InplaceUtils;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
 
@@ -240,7 +235,7 @@ public class OpBuilder {
 		}
 
 		public Computers.Arity0<O> computer() {
-			return ComputerUtils.match(env, opName, outType);
+			return matchComputer(env, opName, outType);
 		}
 
 		public O create() {
@@ -248,7 +243,7 @@ public class OpBuilder {
 		}
 
 		public Computers.Arity0<O> computer(Hints hints) {
-			return ComputerUtils.match(env, opName, outType, hints);
+			return matchComputer(env, opName, outType, hints);
 		}
 
 		public O create(Hints hints) {
@@ -272,7 +267,7 @@ public class OpBuilder {
 		}
 
 		public Computers.Arity0<O> computer() {
-			return ComputerUtils.match(env, opName, type(out));
+			return matchComputer(env, opName, type(out));
 		}
 
 		public void compute() {
@@ -280,7 +275,7 @@ public class OpBuilder {
 		}
 
 		public Computers.Arity0<O> computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, type(out), hints);
+			return matchComputer(env, opName, type(out), hints);
 		}
 
 		public void compute(final Hints hints) {
@@ -315,24 +310,24 @@ public class OpBuilder {
 		}
 
 		public $functionArity.call($arity)$generics.call($arity) function() {
-			return FunctionUtils.match(env, opName, $inputTypesWithOutput.call($arity));
+			return matchFunction(env, opName, $inputTypesWithOutput.call($arity));
 		}
 
 		public $functionArity.call($arity)$generics.call($arity) function(final Hints hints) {
-			return FunctionUtils.match(env, opName, $inputTypesWithOutput.call($arity), hints);
+			return matchFunction(env, opName, $inputTypesWithOutput.call($arity), hints);
 		}
 
 		public Computers.Arity${arity}$generics.call($arity) computer() {
-			return ComputerUtils.match(env, opName, $inputTypesWithOutput.call($arity));
+			return matchComputer(env, opName, $inputTypesWithOutput.call($arity));
 		}
 
 		public Computers.Arity${arity}$generics.call($arity) computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, $inputTypesWithOutput.call($arity), hints);
+			return matchComputer(env, opName, $inputTypesWithOutput.call($arity), hints);
 		}
 
 #foreach($a in [1..$arity])
 		public Inplaces.Arity$inplaceSuffix.call($arity, $a)$genericsWithoutOutput.call($arity) inplace${inplaceMatchNumber.call($arity, $a)}() {
-			return InplaceUtils.match${inplaceMatchNumber.call($arity, $a)}(env, opName, $inputTypes.call($arity));
+			return matchInplace${inplaceMatchNumber.call($arity, $a)}(env, opName, $inputTypes.call($arity));
 		}
 
 #end
@@ -368,16 +363,16 @@ public class OpBuilder {
 		}
 
 		public $functionArity.call($arity)$genericsWildcardFunction.call($arity) function() {
-			return FunctionUtils.match(env, opName, $inputTypes.call($arity), Nil.of(Object.class));
+			return matchFunction(env, opName, $inputTypes.call($arity), Nil.of(Object.class));
 		}
 
 		public $functionArity.call($arity)$genericsWildcardFunction.call($arity) function(final Hints hints) {
-			return FunctionUtils.match(env, opName, $inputTypes.call($arity), Nil.of(Object.class), hints);
+			return matchFunction(env, opName, $inputTypes.call($arity), Nil.of(Object.class), hints);
 		}
 
 #foreach($a in [1..$arity])
 		public Inplaces.Arity$inplaceSuffix.call($arity, $a)$genericsWithoutOutput.call($arity) inplace${inplaceMatchNumber.call($arity, $a)}() {
-			return InplaceUtils.match${inplaceMatchNumber.call($arity, $a)}(env, opName, $inputTypes.call($arity));
+			return matchInplace${inplaceMatchNumber.call($arity, $a)}(env, opName, $inputTypes.call($arity));
 		}
 
 #end
@@ -408,19 +403,19 @@ public class OpBuilder {
 		}
 
 		public $functionArity.call($arity)$generics.call($arity) function() {
-			return FunctionUtils.match(env, opName, $inputTypesFromArgs.call($arity), outType);
+			return matchFunction(env, opName, $inputTypesFromArgs.call($arity), outType);
 		}
 	
 		public $functionArity.call($arity)$generics.call($arity) function(final Hints hints) {
-			return FunctionUtils.match(env, opName, $inputTypesFromArgs.call($arity), outType, hints);
+			return matchFunction(env, opName, $inputTypesFromArgs.call($arity), outType, hints);
 		}
 	
 		public Computers.Arity${arity}$generics.call($arity) computer() {
-			return ComputerUtils.match(env, opName, $inputTypesFromArgs.call($arity), outType);
+			return matchComputer(env, opName, $inputTypesFromArgs.call($arity), outType);
 		}
 
 		public Computers.Arity${arity}$generics.call($arity) computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, $inputTypesFromArgs.call($arity), outType, hints);
+			return matchComputer(env, opName, $inputTypesFromArgs.call($arity), outType, hints);
 		}
 	
 		public O apply() {
@@ -467,24 +462,24 @@ public class OpBuilder {
 		}
 
 		public $functionArity.call($arity)$genericsWildcardFunction.call($arity) function() {
-			return FunctionUtils.match(env, opName, $inputTypesFromArgs.call($arity), Nil.of(Object.class));
+			return matchFunction(env, opName, $inputTypesFromArgs.call($arity), Nil.of(Object.class));
 		}
 
 		public $functionArity.call($arity)$genericsWildcardFunction.call($arity) function(final Hints hints) {
-			return FunctionUtils.match(env, opName, $inputTypesFromArgs.call($arity), Nil.of(Object.class), hints);
+			return matchFunction(env, opName, $inputTypesFromArgs.call($arity), Nil.of(Object.class), hints);
 		}
 
 #foreach($a in [1..$arity])
 		public Inplaces.Arity$inplaceSuffix.call($arity, $a)$genericsWithoutOutput.call($arity) inplace${inplaceMatchNumber.call($arity, $a)}() {
 			checkInplaceRefs($a, $inputObjects.call($arity));
-			return InplaceUtils.match${inplaceMatchNumber.call($arity, $a)}(env, opName, $inputTypesFromArgs.call($arity));
+			return matchInplace${inplaceMatchNumber.call($arity, $a)}(env, opName, $inputTypesFromArgs.call($arity));
 		}
 
 #end
 #foreach($a in [1..$arity])
 		public Inplaces.Arity$inplaceSuffix.call($arity, $a)$genericsWithoutOutput.call($arity) inplace${inplaceMatchNumber.call($arity, $a)}(final Hints hints) {
 			checkInplaceRefs($a, $inputObjects.call($arity));
-			return InplaceUtils.match${inplaceMatchNumber.call($arity, $a)}(env, opName, $inputTypesFromArgs.call($arity), hints);
+			return matchInplace${inplaceMatchNumber.call($arity, $a)}(env, opName, $inputTypesFromArgs.call($arity), hints);
 		}
 
 #end
@@ -534,7 +529,7 @@ public class OpBuilder {
 		}
 
 		public Computers.Arity${arity}${generics.call($arity)} computer() {
-			return ComputerUtils.match(env, opName, $inputTypesFromArgs.call($arity), type(out));
+			return matchComputer(env, opName, $inputTypesFromArgs.call($arity), type(out));
 		}
 
 		public void compute() {
@@ -542,7 +537,7 @@ public class OpBuilder {
 		}
 
 		public Computers.Arity${arity}${generics.call($arity)} computer(final Hints hints) {
-			return ComputerUtils.match(env, opName, $inputTypesFromArgs.call($arity), type(out), hints);
+			return matchComputer(env, opName, $inputTypesFromArgs.call($arity), type(out), hints);
 		}
 
 		public void compute(final Hints hints) {
@@ -550,6 +545,132 @@ public class OpBuilder {
 		}
 
 	}
+#end
+
+#foreach($arity in [0..$maxArity])
+	@SuppressWarnings({ "unchecked" })
+	public static $generics.call($arity) $functionArity.call($arity)$generics.call($arity) matchFunction(final OpEnvironment env, final String opName, $inputTypesArgsWithOutput.call($arity))
+	{
+		return matchFunctionHelper(env, opName, ${functionArity.call($arity)}.class, outType#if( $arity == 0)#{else}, #end$inputTypes.call($arity));
+	}
+
+#end
+#foreach($arity in [0..$maxArity])
+	@SuppressWarnings({ "unchecked" })
+	public static $generics.call($arity) $functionArity.call($arity)$generics.call($arity) matchFunction(final OpEnvironment env, final String opName, $inputTypesArgsWithOutput.call($arity), final Hints hints)
+	{
+		return matchFunctionHelper(env, opName, hints, ${functionArity.call($arity)}.class, outType#if( $arity == 0)#{else}, #end$inputTypes.call($arity));
+	}
+
+#end
+	@SuppressWarnings({ "unchecked" })
+	private static <T> T matchFunctionHelper(final OpEnvironment env, final String opName,
+		final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
+	{
+		final Type[] types = new Type[inTypes.length + 1];
+		for (int i = 0; i < inTypes.length; i++)
+			types[i] = inTypes[i].getType();
+		types[types.length - 1] = outType.getType();
+		final Type specialType = Types.parameterize(opClass, types);
+		return (T) env.op(opName, Nil.of(specialType), inTypes, outType);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	private static <T> T matchFunctionHelper(final OpEnvironment env, final String opName, final Hints hints,
+		final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
+	{
+		final Type[] types = new Type[inTypes.length + 1];
+		for (int i = 0; i < inTypes.length; i++)
+			types[i] = inTypes[i].getType();
+		types[types.length - 1] = outType.getType();
+		final Type specialType = Types.parameterize(opClass, types);
+		return (T) env.op(opName, Nil.of(specialType), inTypes, outType, hints);
+	}
+
+#foreach($arity in [0..$maxArity])
+	@SuppressWarnings("unchecked")
+	public static $generics.call($arity) $computerArity.call($arity)$generics.call($arity) matchComputer(final OpEnvironment env, final String opName, $inputTypesArgsWithOutput.call($arity))
+	{
+		return matchComputerHelper(env, opName, ${computerArity.call($arity)}.class, outType#if( $arity == 0)#{else}, #end$inputTypes.call($arity));
+	}
+
+#end
+#foreach($arity in [0..$maxArity])
+	@SuppressWarnings("unchecked")
+	public static $generics.call($arity) $computerArity.call($arity)$generics.call($arity) matchComputer(final OpEnvironment env, final String opName, $inputTypesArgsWithOutput.call($arity), final Hints hints)
+	{
+		return matchComputerHelper(env, opName, hints, ${computerArity.call($arity)}.class, outType#if( $arity == 0)#{else}, #end$inputTypes.call($arity));
+	}
+
+#end
+	@SuppressWarnings({ "unchecked" })
+	private static <T> T matchComputerHelper(final OpEnvironment env, final String opName, final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
+	{
+		final Type[] types = new Type[inTypes.length + 1];
+		for (int i = 0; i < inTypes.length; i++)
+			types[i] = inTypes[i].getType();
+		types[types.length - 1] = outType.getType();
+		final Type specialType = Types.parameterize(opClass, types);
+		final Nil<?>[] nils = new Nil[inTypes.length + 1];
+		System.arraycopy(inTypes, 0, nils, 0, inTypes.length);
+		nils[nils.length - 1] = outType;
+		return (T) env.op(opName, Nil.of(specialType), nils, outType);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	private static <T> T matchComputerHelper(final OpEnvironment env, final String opName, final Hints hints, final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
+	{
+		final Type[] types = new Type[inTypes.length + 1];
+		for (int i = 0; i < inTypes.length; i++)
+			types[i] = inTypes[i].getType();
+		types[types.length - 1] = outType.getType();
+		final Type specialType = Types.parameterize(opClass, types);
+		final Nil<?>[] nils = new Nil[inTypes.length + 1];
+		System.arraycopy(inTypes, 0, nils, 0, inTypes.length);
+		nils[nils.length - 1] = outType;
+		return (T) env.op(opName, Nil.of(specialType), nils, outType, hints);
+	}
+
+#foreach($arity in $arities)
+#foreach($a in [1..$arity])
+	@SuppressWarnings({ "unchecked" })
+	public static $inplaceGenerics.call($arity, $a) $inplaceType.call($arity, $a)$inplaceGenerics.call($arity, $a) $matchName.call($arity, $a)(final OpEnvironment env, final String opName, $matchParams.call($arity, $a))
+	{
+		return matchInplaceHelper(env, opName, ${inplaceClass.call($arity, $a)}, ioType, new Nil[] {${basicParams.call($arity, $a)}});
+	}
 
 #end
+#end
+
+#foreach($arity in $arities)
+#foreach($a in [1..$arity])
+	@SuppressWarnings({ "unchecked" })
+	public static $inplaceGenerics.call($arity, $a) $inplaceType.call($arity, $a)$inplaceGenerics.call($arity, $a) $matchName.call($arity, $a)(final OpEnvironment env, final String opName, $matchParams.call($arity, $a), final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, ${inplaceType.call($arity, $a)}.class, ioType, new Nil[] {${basicParams.call($arity, $a)}});
+	}
+
+#end
+#end
+	@SuppressWarnings({ "unchecked" })
+	private static <T> T matchInplaceHelper(final OpEnvironment env, final String opName,
+		final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
+	{
+		final Type[] types = new Type[inTypes.length];
+		for (int i = 0; i < inTypes.length; i++)
+			types[i] = inTypes[i].getType();
+		final Type specialType = Types.parameterize(opClass, types);
+		return (T) env.op(opName, Nil.of(specialType), inTypes, outType);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	private static <T> T matchInplaceHelper(final OpEnvironment env, final String opName, final Hints hints,
+		final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
+	{
+		final Type[] types = new Type[inTypes.length];
+		for (int i = 0; i < inTypes.length; i++)
+			types[i] = inTypes[i].getType();
+		final Type specialType = Types.parameterize(opClass, types);
+		return (T) env.op(opName, Nil.of(specialType), inTypes, outType, hints);
+	}
 }
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.list b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.list
index 0cb053054..1461fe4bc 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.list
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.list
@@ -49,8 +49,8 @@ basicParams = ```
 ```
 matchName = ```
 { arity, num ->
-  arity == 1 ? "match" :
-  "match${num}"
+  arity == 1 ? "matchInplace" :
+  "matchInplace${num}"
 }
 ```
 matchParams = ```
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/matcher/OpWrappersTest.list b/scijava/scijava-ops/templates/test/java/org/scijava/ops/matcher/OpWrappersTest.list
index f7e22fb47..bf49f4a14 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/matcher/OpWrappersTest.list
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/matcher/OpWrappersTest.list
@@ -20,7 +20,7 @@ nilDoubleList = ```
 ```
 matchName = ```
 { arity, num ->
-  arity == 1 ? "match" :
-  "match${num}"
+  arity == 1 ? "matchInplace" :
+  "matchInplace${num}"
 }
 ```
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/matcher/OpWrappersTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/matcher/OpWrappersTest.vm
index 7c3dc856e..f5436ebed 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/matcher/OpWrappersTest.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/matcher/OpWrappersTest.vm
@@ -16,9 +16,7 @@ import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.util.ComputerUtils;
-import org.scijava.ops.util.FunctionUtils;
-import org.scijava.ops.util.InplaceUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.GenericTyped;
 import org.scijava.types.Nil;
 
@@ -33,7 +31,7 @@ public class OpWrappersTest extends AbstractTestEnvironment {
 	@Test
 	public void testWrapProducer() {
 		Nil<Double> nilDouble = Nil.of(Double.class);
-		Producer<Double> op = FunctionUtils.match(ops.env(), "test.addDoubles", nilDouble);
+		Producer<Double> op = OpBuilder.matchFunction(ops.env(), "test.addDoubles", nilDouble);
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -42,7 +40,7 @@ public class OpWrappersTest extends AbstractTestEnvironment {
 	public void testWrapFunction$arity() {
 		Nil<Double> nilDouble = Nil.of(Double.class);
 		$functionArity.call($arity)$doubleTypeParams.call($arity) op = //
-			FunctionUtils.match(ops.env(), "test.addDoubles", //
+			OpBuilder.matchFunction(ops.env(), "test.addDoubles", //
 				$nilDoubleList.call($arity));
 		assertTrue(op instanceof GenericTyped);
 	}
@@ -53,7 +51,7 @@ public class OpWrappersTest extends AbstractTestEnvironment {
 	public void testWrapComputer$arity() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		$computerArity.call($arity)$doubleArrayTypeParams.call($arity) op = //
-			ComputerUtils.match(ops.env(), "test.addArrays", $nilDoubleList.call($arity));
+			OpBuilder.matchComputer(ops.env(), "test.addArrays", $nilDoubleList.call($arity));
 		assertTrue(op instanceof GenericTyped);
 	}
 
@@ -65,7 +63,7 @@ public class OpWrappersTest extends AbstractTestEnvironment {
 	public void testWrapInplace$inplaceSuffix.call($arity, $a)() {
 		Nil<double[]> nilDouble = Nil.of(double[].class);
 		$inplaceType.call($arity, $a)$doubleArrayTypeParams.call($t) op = //
-			InplaceUtils.$matchName.call($arity, $a)(ops.env(), "test.mulArrays${arity}_${a}", $nilDoubleList.call($t));
+			OpBuilder.$matchName.call($arity, $a)(ops.env(), "test.mulArrays${arity}_${a}", $nilDoubleList.call($t));
 		assertTrue(op instanceof GenericTyped);
 	}
 

From d5fc7ed0270a048ff4d27e052488d51039254ff3 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Wed, 30 Jun 2021 10:13:39 -0500
Subject: [PATCH 55/91] Remove match methods from fiface util classes

---
 .../net/imagej/ops2/eval/OpEvaluator.java     |    5 +-
 .../geom2d/LabelRegionToPolygonConverter.java |    7 +-
 .../geom/geom3d/mesh/RAIToMeshConverter.java  |    7 +-
 .../net/imagej/ops2/coloc/icq/LiICQTest.java  |    7 +-
 .../coloc/kendallTau/KendallTauBRankTest.java |    9 +-
 .../ops2/coloc/maxTKendallTau/MTKTTest.java   |   13 +-
 .../coloc/pearsons/DefaultPearsonsTest.java   |    6 +-
 .../net/imagej/ops2/copy/CopyRAITest.java     |    6 +-
 .../imagej/ops2/create/CreateImgPlusTest.java |    9 +-
 .../net/imagej/ops2/create/CreateImgTest.java |   27 +-
 .../ops2/create/CreateKernelGaborTest.java    |   17 +-
 .../ops2/create/CreateKernelGaussTest.java    |    9 +-
 .../ops2/create/CreateKernelLogTest.java      |    9 +-
 .../ops2/create/CreateLabelingTest.java       |   13 +-
 .../ops2/filter/convolve/ConvolveTest.java    |    6 +-
 .../ops2/image/integral/IntegralImgTest.java  |    6 +-
 .../ops2/math/UnaryRealTypeMathTest.java      |    8 +-
 .../net/imagej/ops2/project/ProjectTest.java  |    4 +-
 .../ops2/threshold/AbstractThresholdTest.java |    5 +-
 .../ops2/threshold/ComputeThresholdTest.java  |    4 +-
 .../apply/ApplyManualThresholdTest.java       |    4 +-
 .../threshold/apply/LocalThresholdTest.java   |  103 +-
 .../CollapseNumericViewTest.java              |   10 +-
 .../CollapseRealViewTest.java                 |   13 +-
 .../collapseView/CollapseViewTest.java        |   13 +-
 .../concatenateView/ConcatenateViewTest.java  |   10 +-
 .../DropSingletonDimensionsViewTest.java      |    9 +-
 .../ExtendBorderViewTest.java                 |    9 +-
 .../ExtendMirrorDoubleViewTest.java           |    9 +-
 .../ExtendMirrorSingleViewTest.java           |    9 +-
 .../ExtendPeriodicViewTest.java               |    9 +-
 .../ExtendRandomViewTest.java                 |    9 +-
 .../extendValueView/ExtendValueViewTest.java  |    9 +-
 .../transform/extendView/ExtendViewTest.java  |    9 +-
 .../extendZeroView/ExtendZeroViewTest.java    |    9 +-
 .../FlatIterableViewTest.java                 |    9 +-
 .../hyperSliceView/HyperSliceViewTest.java    |   13 +-
 .../interpolateView/InterpolateViewTest.java  |    9 +-
 .../intervalView/IntervalViewTest.java        |   13 +-
 .../invertAxisView/InvertAxisViewTest.java    |   13 +-
 .../transform/offsetView/OffsetViewTest.java  |   17 +-
 .../permuteView/PermuteViewTest.java          |   45 +-
 .../transform/rasterView/RasterViewTest.java  |    9 +-
 .../transform/rotateView/RotateViewTest.java  |   17 +-
 .../transform/shearView/ShearViewTest.java    |   13 +-
 .../transform/stackView/StackViewTest.java    |   11 +-
 .../subsampleView/SubsampleViewTest.java      |   13 +-
 .../translateView/TranslateViewTest.java      |    9 +-
 .../unshearView/UnshearViewTest.java          |   13 +-
 .../zeroMinView/ZeroMinViewTest.java          |    7 +-
 .../org/scijava/ops/util/ComputerUtils.java   |  272 ---
 .../org/scijava/ops/util/FunctionUtils.java   |  217 ---
 .../org/scijava/ops/util/InplaceUtils.java    | 1731 -----------------
 .../scijava/ops/monitor/OpMonitorTest.java    |   10 +-
 .../java/org/scijava/ops/stats/MeanTest.java  |    5 +-
 .../org/scijava/ops/util/ComputersTest.java   |    6 +-
 .../org/scijava/ops/util/FunctionsTest.java   |    9 +-
 .../java/org/scijava/ops/util/LiftTest.java   |    5 +-
 .../scijava/ops/util/OpsAsParametersTest.java |    7 +-
 .../org/scijava/ops/util/ComputerUtils.list   |   24 -
 .../org/scijava/ops/util/ComputerUtils.vm     |   84 -
 .../org/scijava/ops/util/FunctionUtils.vm     |   29 -
 .../org/scijava/ops/util/InplaceUtils.list    |   83 -
 .../java/org/scijava/ops/util/InplaceUtils.vm |  119 --
 64 files changed, 309 insertions(+), 2914 deletions(-)
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/util/ComputerUtils.java
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java
 delete mode 100644 scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.list
 delete mode 100644 scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.vm
 delete mode 100644 scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.list
 delete mode 100644 scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.vm

diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/OpEvaluator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/OpEvaluator.java
index adbafa415..12546598f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/OpEvaluator.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/OpEvaluator.java
@@ -37,15 +37,16 @@
 import java.util.Map;
 
 import org.scijava.function.Functions;
+import org.scijava.ops.Op;
 import org.scijava.ops.OpService;
 import org.scijava.ops.util.FunctionUtils;
-import org.scijava.types.Nil;
-import org.scijava.types.TypeService;
 import org.scijava.parsington.Operator;
 import org.scijava.parsington.Operators;
 import org.scijava.parsington.Variable;
 import org.scijava.parsington.eval.AbstractStandardStackEvaluator;
 import org.scijava.parsington.eval.Evaluator;
+import org.scijava.types.Nil;
+import org.scijava.types.TypeService;
 
 /**
  * A Parsington {@link Evaluator} using available {@link Op}s.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/LabelRegionToPolygonConverter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/LabelRegionToPolygonConverter.java
index c8172bd9f..6bc274c3e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/LabelRegionToPolygonConverter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/LabelRegionToPolygonConverter.java
@@ -41,12 +41,11 @@
 import org.scijava.convert.AbstractConverter;
 import org.scijava.convert.ConversionRequest;
 import org.scijava.convert.Converter;
-import org.scijava.function.Functions;
+import org.scijava.ops.OpBuilder;
 import org.scijava.ops.OpService;
-import org.scijava.ops.util.FunctionUtils;
-import org.scijava.types.Nil;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
+import org.scijava.types.Nil;
 
 /**
  * Converts a {@link LabelRegion} to a polygon
@@ -67,7 +66,7 @@ public class LabelRegionToPolygonConverter extends
 	@Override
 	public <T> T convert(final Object src, final Class<T> dest) {
 		if (contourFunc == null) {
-			contourFunc = FunctionUtils.match(ops.env(), "geom.contour", new Nil<RandomAccessibleInterval<BoolType>>() {}, new Nil<Boolean>() {},
+			contourFunc = OpBuilder.matchFunction(ops.env(), "geom.contour", new Nil<RandomAccessibleInterval<BoolType>>() {}, new Nil<Boolean>() {},
 					new Nil<Polygon2D>() {});
 		}
 		// FIXME: can we make this faster?
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/RAIToMeshConverter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/RAIToMeshConverter.java
index 37e03d465..fdcae963a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/RAIToMeshConverter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/RAIToMeshConverter.java
@@ -41,12 +41,11 @@
 import org.scijava.convert.AbstractConverter;
 import org.scijava.convert.ConversionRequest;
 import org.scijava.convert.Converter;
-import org.scijava.function.Functions;
+import org.scijava.ops.OpBuilder;
 import org.scijava.ops.OpService;
-import org.scijava.ops.util.FunctionUtils;
-import org.scijava.types.Nil;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
+import org.scijava.types.Nil;
 
 /**
  * Converts a RandomAccessibleInterval to a Mesh
@@ -68,7 +67,7 @@ public class RAIToMeshConverter <B extends BooleanType<B>> extends
 	@Override
 	public <T> T convert(Object src, Class<T> dest) {
 		if (marchingCubesFunc == null) {
-			marchingCubesFunc = FunctionUtils.match(ops.env(), "geom.marchingCubes", new Nil<RandomAccessibleInterval<B>>() {},
+			marchingCubesFunc = OpBuilder.matchFunction(ops.env(), "geom.marchingCubes", new Nil<RandomAccessibleInterval<B>>() {},
 					new Nil<Mesh>() {});
 		}
 		if (src instanceof IterableInterval<?>) {
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/icq/LiICQTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/icq/LiICQTest.java
index 25140e084..d2b8903e1 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/icq/LiICQTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/icq/LiICQTest.java
@@ -44,10 +44,9 @@
 import net.imglib2.type.numeric.real.FloatType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
-import org.scijava.types.Nil;
+import org.scijava.ops.OpBuilder;
 import org.scijava.thread.ThreadService;
+import org.scijava.types.Nil;
 
 /**
  * Tests {@link net.imagej.ops2.coloc.icq.LiICQ}.
@@ -102,7 +101,7 @@ public void testPValue() {
 				0x01234567);
 		Img<FloatType> ch2 = ColocalisationTest.produceMeanBasedNoiseImage(new FloatType(), 24, 24, mean, spread, sigma,
 				0x98765432);
-		BiFunction<RandomAccessibleInterval<FloatType>, RandomAccessibleInterval<FloatType>, Double> op = FunctionUtils.match(ops.env(), "coloc.icq",
+		BiFunction<RandomAccessibleInterval<FloatType>, RandomAccessibleInterval<FloatType>, Double> op = OpBuilder.matchFunction(ops.env(), "coloc.icq",
 				new Nil<RandomAccessibleInterval<FloatType>>() {}, new Nil<RandomAccessibleInterval<FloatType>>() {}, new Nil<Double>() {});
 		PValueResult value = new PValueResult();
 		ops.op("coloc.pValue").input(ch1, ch2, op, es).output(value).compute();
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRankTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRankTest.java
index 5a3a961a5..eaadb5be8 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRankTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRankTest.java
@@ -29,9 +29,9 @@
 
 package net.imagej.ops2.coloc.kendallTau;
 
+import static org.junit.Assume.assumeTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.Assume.assumeTrue;
 
 import java.util.Iterator;
 import java.util.concurrent.ExecutorService;
@@ -50,10 +50,9 @@
 import net.imglib2.util.Pair;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
-import org.scijava.types.Nil;
+import org.scijava.ops.OpBuilder;
 import org.scijava.thread.ThreadService;
+import org.scijava.types.Nil;
 
 /**
  * Tests {@link net.imagej.ops2.Ops.Coloc.KendallTau}.
@@ -128,7 +127,7 @@ public void testPValue() {
 				0x98765432);
 		Nil<Iterable<FloatType>> nilI = new Nil<Iterable<FloatType>>() {};
 		Nil<RandomAccessibleInterval<FloatType>> nilRAI = new Nil<RandomAccessibleInterval<FloatType>>() {};
-		BiFunction<RandomAccessibleInterval<FloatType>, RandomAccessibleInterval<FloatType>, Double> op = FunctionUtils.match(ops.env(),
+		BiFunction<RandomAccessibleInterval<FloatType>, RandomAccessibleInterval<FloatType>, Double> op = OpBuilder.matchFunction(ops.env(),
 				"coloc.kendallTau", nilRAI, nilRAI, new Nil<Double>() {});
 //		BiFunction<RandomAccessibleInterval<FloatType>, RandomAccessibleInterval<FloatType>, Double> raiOp = op(
 //				"transform.raiToIterable").input(op).outType(
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/maxTKendallTau/MTKTTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/maxTKendallTau/MTKTTest.java
index b5a858e16..6f59caf5b 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/maxTKendallTau/MTKTTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/maxTKendallTau/MTKTTest.java
@@ -47,10 +47,9 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
-import org.scijava.types.Nil;
+import org.scijava.ops.OpBuilder;
 import org.scijava.thread.ThreadService;
+import org.scijava.types.Nil;
 
 /**
  * Tests {@link net.imagej.ops2.Ops.Coloc.MaxTKendallTau}.
@@ -209,7 +208,7 @@ public void testMTKTpValueNone() {
 		Img<DoubleType> vImage1 = ArrayImgs.doubles(values1, values1.length);
 		Img<DoubleType> vImage2 = ArrayImgs.doubles(values2, values2.length);
 		BiFunction<RandomAccessibleInterval<DoubleType>, RandomAccessibleInterval<DoubleType>, Double> op =
-			FunctionUtils.match(ops.env(), "coloc.maxTKendallTau", new Nil<RandomAccessibleInterval<DoubleType>>() {}, new Nil<RandomAccessibleInterval<DoubleType>>() {}, new Nil<Double>() {});
+			OpBuilder.matchFunction(ops.env(), "coloc.maxTKendallTau", new Nil<RandomAccessibleInterval<DoubleType>>() {}, new Nil<RandomAccessibleInterval<DoubleType>>() {}, new Nil<Double>() {});
 		PValueResult value = new PValueResult();
 		ops.op("coloc.pValue").input(vImage1, vImage2, op, 5, es).output(value).compute();
 		assertEquals(0.0, value.getPValue(), 0.0);
@@ -229,7 +228,7 @@ public void testMTKTpValueAll() {
 		Img<DoubleType> vImage1 = ArrayImgs.doubles(values1, values1.length);
 		Img<DoubleType> vImage2 = ArrayImgs.doubles(values2, values2.length);
 		BiFunction<RandomAccessibleInterval<DoubleType>, RandomAccessibleInterval<DoubleType>, Double> op =
-			FunctionUtils.match(ops.env(), "coloc.maxTKendallTau", new Nil<RandomAccessibleInterval<DoubleType>>() {}, new Nil<RandomAccessibleInterval<DoubleType>>() {}, new Nil<Double>() {});
+			OpBuilder.matchFunction(ops.env(), "coloc.maxTKendallTau", new Nil<RandomAccessibleInterval<DoubleType>>() {}, new Nil<RandomAccessibleInterval<DoubleType>>() {}, new Nil<Double>() {});
 		PValueResult value = new PValueResult();
 		ops.op("coloc.pValue").input(vImage1, vImage2, op, 5, es).output(value).compute();
 		assertEquals(0.0, value.getPValue(), 0.0);
@@ -247,7 +246,7 @@ public void testMTKTpValueRandom() {
 		Img<FloatType> ch2 = ColocalisationTest.produceMeanBasedNoiseImage(new FloatType(), 24, 24, mean, spread, sigma,
 				0x98765432);
 		BiFunction<RandomAccessibleInterval<FloatType>, RandomAccessibleInterval<FloatType>, Double> op =
-			FunctionUtils.match(ops.env(), "coloc.maxTKendallTau", new Nil<RandomAccessibleInterval<FloatType>>() {}, new Nil<RandomAccessibleInterval<FloatType>>() {}, new Nil<Double>() {});
+			OpBuilder.matchFunction(ops.env(), "coloc.maxTKendallTau", new Nil<RandomAccessibleInterval<FloatType>>() {}, new Nil<RandomAccessibleInterval<FloatType>>() {}, new Nil<Double>() {});
 		PValueResult value = new PValueResult();
 		ops.op("coloc.pValue").input(ch1, ch2, op, 10, es).output(value).compute();
 		assertEquals(0.2, value.getPValue(), 0.0);
@@ -262,7 +261,7 @@ public void testMTKTpValueImage() {
 		RandomAccessibleInterval<UnsignedByteType> cropCh2 = Views.interval(zeroCorrelationImageCh2,
 				new long[] { 0, 0, 0 }, new long[] { 20, 20, 0 });
 		BiFunction<RandomAccessibleInterval<UnsignedByteType>, RandomAccessibleInterval<UnsignedByteType>, Double> op =
-			FunctionUtils.match(ops.env(), "coloc.maxTKendallTau", new Nil<RandomAccessibleInterval<UnsignedByteType>>() {}, new Nil<RandomAccessibleInterval<UnsignedByteType>>() {}, new Nil<Double>() {});
+			OpBuilder.matchFunction(ops.env(), "coloc.maxTKendallTau", new Nil<RandomAccessibleInterval<UnsignedByteType>>() {}, new Nil<RandomAccessibleInterval<UnsignedByteType>>() {}, new Nil<Double>() {});
 		final int[] blockSize = new int[cropCh1.numDimensions()];
 		for (int d = 0; d < blockSize.length; d++) {
 			final long size = (long) Math.floor(Math.sqrt(cropCh1.dimension(d)));
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/pearsons/DefaultPearsonsTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/pearsons/DefaultPearsonsTest.java
index 0700ea586..e168e6de5 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/pearsons/DefaultPearsonsTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/pearsons/DefaultPearsonsTest.java
@@ -40,9 +40,9 @@
 import net.imglib2.type.numeric.real.FloatType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.types.Nil;
-import org.scijava.ops.util.FunctionUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.thread.ThreadService;
+import org.scijava.types.Nil;
 
 /**
  * Tests {@link DefaultPearsons}.
@@ -107,7 +107,7 @@ public void testPValue() {
 		Img<FloatType> ch2 = ColocalisationTest.produceMeanBasedNoiseImage(new FloatType(), 24, 24,
 			mean, spread, sigma, 0x98765432);
 		BiFunction<RandomAccessibleInterval<FloatType>, RandomAccessibleInterval<FloatType>, Double> op =
-			FunctionUtils.match(ops.env(), "coloc.pearsons", new Nil<RandomAccessibleInterval<FloatType>>() {}, new Nil<RandomAccessibleInterval<FloatType>>() {}, new Nil<Double>() {});
+			OpBuilder.matchFunction(ops.env(), "coloc.pearsons", new Nil<RandomAccessibleInterval<FloatType>>() {}, new Nil<RandomAccessibleInterval<FloatType>>() {}, new Nil<Double>() {});
 		PValueResult value = new PValueResult();
 		ops.op("coloc.pValue").input(ch1, ch2, op, es).output(value).compute();
 		assertEquals(0.66, value.getPValue(), 0.0);
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyRAITest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyRAITest.java
index 08060fc8a..15344f33f 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyRAITest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyRAITest.java
@@ -49,7 +49,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.util.ComputerUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.util.MersenneTwisterFast;
 
@@ -150,8 +150,8 @@ public void copyRAIWithOutputTest() {
 	public void copyRAIDifferentSizeTest() {
 
 		// create a copy op
-		final Computers.Arity1<IntervalView<UnsignedByteType>, RandomAccessibleInterval<UnsignedByteType>> copy = ComputerUtils
-				.match(ops.env(), "copy.rai", new Nil<IntervalView<UnsignedByteType>>() {},
+		final Computers.Arity1<IntervalView<UnsignedByteType>, RandomAccessibleInterval<UnsignedByteType>> copy = OpBuilder
+				.matchComputer(ops.env(), "copy.rai", new Nil<IntervalView<UnsignedByteType>>() {},
 						new Nil<RandomAccessibleInterval<UnsignedByteType>>() {});
 
 		assertNotNull(copy);
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgPlusTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgPlusTest.java
index 87392eafb..56b8b2d9c 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgPlusTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgPlusTest.java
@@ -35,16 +35,15 @@
 import java.util.function.Function;
 
 import net.imagej.ImgPlus;
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.Dimensions;
 import net.imglib2.FinalDimensions;
 import net.imglib2.img.Img;
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
-import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
 
 /**
  * Tests several ways to create an image
@@ -57,8 +56,8 @@ public class CreateImgPlusTest extends AbstractOpTest {
 
 	@Test
 	public void createImgPlusTest() {
-		BiFunction<Dimensions, DoubleType, Img<DoubleType>> createImgFunc = FunctionUtils.match(ops.env(), "create.img", new Nil<Dimensions>() {}, new Nil<DoubleType>() {}, new Nil<Img<DoubleType>>() {});
-		Function<Img<DoubleType>, ImgPlus<DoubleType>> imgPlusFunction = FunctionUtils.match(ops.env(), "create.imgPlus", new Nil<Img<DoubleType>>() {}, new Nil<ImgPlus<DoubleType>>() {});
+		BiFunction<Dimensions, DoubleType, Img<DoubleType>> createImgFunc = OpBuilder.matchFunction(ops.env(), "create.img", new Nil<Dimensions>() {}, new Nil<DoubleType>() {}, new Nil<Img<DoubleType>>() {});
+		Function<Img<DoubleType>, ImgPlus<DoubleType>> imgPlusFunction = OpBuilder.matchFunction(ops.env(), "create.imgPlus", new Nil<Img<DoubleType>>() {}, new Nil<ImgPlus<DoubleType>>() {});
 		assertEquals(imgPlusFunction.apply(createImgFunc.apply(new FinalDimensions(new long[] { 10, 9, 8 }), new DoubleType())).getClass(), ImgPlus.class);
 	}
 }
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgTest.java
index 7cd219c3a..202e63259 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgTest.java
@@ -35,6 +35,7 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.Dimensions;
 import net.imglib2.FinalDimensions;
 import net.imglib2.FinalInterval;
@@ -57,10 +58,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
-
 import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.util.MersenneTwisterFast;
 
@@ -94,7 +93,7 @@ public void testImageMinimum() {
 			}
 
 			// create img
-			final Function<Interval, Img<?>> createFunc = FunctionUtils.match(ops.env(), "create.img", new Nil<Interval>() {
+			final Function<Interval, Img<?>> createFunc = OpBuilder.matchFunction(ops.env(), "create.img", new Nil<Interval>() {
 			}, new Nil<Img<?>>() {
 			});
 			final Img<?> img = createFunc.apply(new FinalInterval(min, max));
@@ -120,7 +119,7 @@ public void testImageDimensions() {
 			}
 
 			// create img
-			BiFunction<Dimensions, DoubleType, Img<DoubleType>> createFunc = FunctionUtils.match(ops.env(), "create.img",
+			BiFunction<Dimensions, DoubleType, Img<DoubleType>> createFunc = OpBuilder.matchFunction(ops.env(), "create.img",
 					new Nil<Dimensions>() {
 					}, new Nil<DoubleType>() {
 					}, new Nil<Img<DoubleType>>() {
@@ -135,13 +134,13 @@ public void testImageDimensions() {
 	@Test
 	public void testImgFromImg() {
 		// create img
-		BiFunction<Dimensions, ByteType, Img<ByteType>> createFuncDimsType = FunctionUtils.match(ops.env(), "create.img",
+		BiFunction<Dimensions, ByteType, Img<ByteType>> createFuncDimsType = OpBuilder.matchFunction(ops.env(), "create.img",
 				new Nil<Dimensions>() {
 				}, new Nil<ByteType>() {
 				}, new Nil<Img<ByteType>>() {
 				});
 		final Img<ByteType> img = createFuncDimsType.apply(new FinalDimensions(1), new ByteType());
-		Function<Img<ByteType>, Img<ByteType>> createFuncImg = FunctionUtils.match(ops.env(), "create.img",
+		Function<Img<ByteType>, Img<ByteType>> createFuncImg = OpBuilder.matchFunction(ops.env(), "create.img",
 				new Nil<Img<ByteType>>() {
 				}, new Nil<Img<ByteType>>() {
 				});
@@ -157,7 +156,7 @@ public void testImageFactory() {
 		final Dimensions dim = new FinalDimensions(10, 10, 10);
 
 		Functions.Arity3<Dimensions, DoubleType, ImgFactory<DoubleType>, Img<DoubleType>> createFunc =
-			FunctionUtils.match(ops.env(), "create.img", new Nil<Dimensions>()
+			OpBuilder.matchFunction(ops.env(), "create.img", new Nil<Dimensions>()
 			{}, new Nil<DoubleType>() {}, new Nil<ImgFactory<DoubleType>>() {},
 				new Nil<Img<DoubleType>>()
 				{});
@@ -178,7 +177,7 @@ public void testImageFactory() {
 	public void testImageType() {
 		final Dimensions dim = new FinalDimensions(10, 10, 10);
 		
-		BiFunction<Dimensions, T, Img<T>> createFunc = FunctionUtils.match(ops.env(), "create.img", new Nil<Dimensions>() {}, new Nil<T>() {}, new Nil<Img<T>>() {});
+		BiFunction<Dimensions, T, Img<T>> createFunc = OpBuilder.matchFunction(ops.env(), "create.img", new Nil<Dimensions>() {}, new Nil<T>() {}, new Nil<Img<T>>() {});
 
 		assertEquals(BitType.class, ((Img<?>) createFunc.apply(dim,
 			(T) new BitType())).firstElement().getClass(), "Image Type: ");
@@ -202,7 +201,7 @@ public void testImageType() {
 	@Test
 	public void testCreateFromImgSameType() {
 		final Img<ByteType> input = PlanarImgs.bytes(10, 10, 10);
-		BiFunction<Dimensions, ByteType, Img<ByteType>> createFunc = FunctionUtils.match(ops.env(), "create.img",
+		BiFunction<Dimensions, ByteType, Img<ByteType>> createFunc = OpBuilder.matchFunction(ops.env(), "create.img",
 				new Nil<Dimensions>() {
 				}, new Nil<ByteType>() {
 				}, new Nil<Img<ByteType>>() {
@@ -218,7 +217,7 @@ public void testCreateFromImgSameType() {
 	@Test
 	public void testCreateFromImgDifferentType() {
 		final Img<ByteType> input = PlanarImgs.bytes(10, 10, 10);
-		BiFunction<Dimensions, ShortType, Img<ShortType>> createFunc = FunctionUtils.match(ops.env(), "create.img",
+		BiFunction<Dimensions, ShortType, Img<ShortType>> createFunc = OpBuilder.matchFunction(ops.env(), "create.img",
 				new Nil<Dimensions>() {
 				}, new Nil<ShortType>() {
 				}, new Nil<Img<ShortType>>() {
@@ -236,7 +235,7 @@ public void testCreateFromRaiDifferentType() {
 		final IntervalView<ByteType> input = Views.interval(PlanarImgs.bytes(10, 10, 10),
 				new FinalInterval(new long[] { 10, 10, 1 }));
 
-		BiFunction<Dimensions, ShortType, Img<ShortType>> createFunc = FunctionUtils.match(ops.env(), "create.img",
+		BiFunction<Dimensions, ShortType, Img<ShortType>> createFunc = OpBuilder.matchFunction(ops.env(), "create.img",
 				new Nil<Dimensions>() {
 				}, new Nil<ShortType>() {
 				}, new Nil<Img<ShortType>>() {
@@ -260,7 +259,7 @@ public void testCreateFromRaiDifferentType() {
 	public void testCreateFromIntegerArray() {
 		final Integer[] dims = new Integer[] { 25, 25, 10 };
 
-		Function<Integer[], Img<?>> createFunc = FunctionUtils.match(ops.env(), "create.img", new Nil<Integer[]>() {
+		Function<Integer[], Img<?>> createFunc = OpBuilder.matchFunction(ops.env(), "create.img", new Nil<Integer[]>() {
 		}, new Nil<Img<?>>() {
 		});
 		final Img<?> res = createFunc.apply(dims);
@@ -278,7 +277,7 @@ public void testCreateFromIntegerArray() {
 	public void testCreateFromLongArray() {
 		final Long[] dims = new Long[] { 25l, 25l, 10l };
 
-		Function<Long[], Img<?>> createFunc = FunctionUtils.match(ops.env(), "create.img", new Nil<Long[]>() {
+		Function<Long[], Img<?>> createFunc = OpBuilder.matchFunction(ops.env(), "create.img", new Nil<Long[]>() {
 		}, new Nil<Img<?>>() {
 		});
 		final Img<?> res = createFunc.apply(dims);
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaborTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaborTest.java
index 21de4e9c3..b8e37b84e 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaborTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaborTest.java
@@ -33,6 +33,7 @@
 
 import java.util.function.BiFunction;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imagej.ops2.create.kernel.DefaultCreateKernelGabor;
 import net.imglib2.RandomAccess;
 import net.imglib2.RandomAccessibleInterval;
@@ -42,10 +43,8 @@
 import net.imglib2.type.numeric.real.FloatType;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
-
 import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
@@ -62,28 +61,28 @@ public <C extends ComplexType<C>> void testKernelGabor() {
 		final double[] period = { 4.0, 1.0 };
 
 		// define functions used in the test
-		Functions.Arity3<double[], double[], C, RandomAccessibleInterval<C>> createFunc = FunctionUtils.match(ops.env(),
+		Functions.Arity3<double[], double[], C, RandomAccessibleInterval<C>> createFunc = OpBuilder.matchFunction(ops.env(),
 				"create.kernelGabor", new Nil<double[]>() {
 				}, new Nil<double[]>() {
 				}, new Nil<C>() {
 				}, new Nil<RandomAccessibleInterval<C>>() {
 				});
-		BiFunction<Double, double[], RandomAccessibleInterval<DoubleType>> createFuncSingleSigma = FunctionUtils
-				.match(ops.env(), "create.kernelGabor", new Nil<Double>() {
+		BiFunction<Double, double[], RandomAccessibleInterval<DoubleType>> createFuncSingleSigma = OpBuilder
+				.matchFunction(ops.env(), "create.kernelGabor", new Nil<Double>() {
 				}, new Nil<double[]>() {
 				}, new Nil<RandomAccessibleInterval<DoubleType>>() {
 				});
-		BiFunction<double[], double[], RandomAccessibleInterval<DoubleType>> createFuncDouble = FunctionUtils.match(ops.env(),
+		BiFunction<double[], double[], RandomAccessibleInterval<DoubleType>> createFuncDouble = OpBuilder.matchFunction(ops.env(),
 				"create.kernelGabor", new Nil<double[]>() {
 				}, new Nil<double[]>() {
 				}, new Nil<RandomAccessibleInterval<DoubleType>>() {
 				});
-		BiFunction<double[], double[], RandomAccessibleInterval<FloatType>> createFuncFloat = FunctionUtils.match(ops.env(),
+		BiFunction<double[], double[], RandomAccessibleInterval<FloatType>> createFuncFloat = OpBuilder.matchFunction(ops.env(),
 				"create.kernelGabor", new Nil<double[]>() {
 				}, new Nil<double[]>() {
 				}, new Nil<RandomAccessibleInterval<FloatType>>() {
 				});
-		BiFunction<double[], double[], RandomAccessibleInterval<ComplexDoubleType>> createFuncComplexDouble = FunctionUtils.match(ops.env(),
+		BiFunction<double[], double[], RandomAccessibleInterval<ComplexDoubleType>> createFuncComplexDouble = OpBuilder.matchFunction(ops.env(),
 				"create.kernelGabor", new Nil<double[]>() {
 				}, new Nil<double[]>() {
 				}, new Nil<RandomAccessibleInterval<ComplexDoubleType>>() {
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaussTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaussTest.java
index a81aa9d0d..fe887c224 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaussTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaussTest.java
@@ -34,14 +34,13 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
-import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
 
 /**
  * Tests {@code CreateKernelGaussDoubleType} and
@@ -57,12 +56,12 @@ public void testKernelGauss() {
 		final double sigma = 5.0;
 		final double[] sigmas = {sigma, sigma};
 		
-		BiFunction<Double, Integer, RandomAccessibleInterval<DoubleType>> createFunc = FunctionUtils.match(ops.env(), "create.kernelGauss", new Nil<Double>() {}, new Nil<Integer>() {}, new Nil<RandomAccessibleInterval<DoubleType>>() {});
+		BiFunction<Double, Integer, RandomAccessibleInterval<DoubleType>> createFunc = OpBuilder.matchFunction(ops.env(), "create.kernelGauss", new Nil<Double>() {}, new Nil<Integer>() {}, new Nil<RandomAccessibleInterval<DoubleType>>() {});
 
 		final RandomAccessibleInterval<DoubleType> gaussianKernel = //
 			createFunc.apply(sigma, sigmas.length);
 
-		Function<double[], RandomAccessibleInterval<DoubleType>> createFunc2 = FunctionUtils.match(ops.env(), "create.kernelGauss", new Nil<double[]>() {}, new Nil<RandomAccessibleInterval<DoubleType>>() {});
+		Function<double[], RandomAccessibleInterval<DoubleType>> createFunc2 = OpBuilder.matchFunction(ops.env(), "create.kernelGauss", new Nil<double[]>() {}, new Nil<RandomAccessibleInterval<DoubleType>>() {});
 				
 		
 		final RandomAccessibleInterval<DoubleType> gaussianKernel2 = //
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelLogTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelLogTest.java
index bfe971b2b..97d76b591 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelLogTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelLogTest.java
@@ -34,14 +34,13 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
-import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
 
 /**
  * Tests {@code CreateKernelLogDoubleType} and
@@ -57,7 +56,7 @@ public void testKernelLog() {
 		final double sigma = 5.0;
 		final double[] sigmas = { sigma, sigma };
 
-		BiFunction<Double, Integer, RandomAccessibleInterval<DoubleType>> func1 = FunctionUtils.match(ops.env(),
+		BiFunction<Double, Integer, RandomAccessibleInterval<DoubleType>> func1 = OpBuilder.matchFunction(ops.env(),
 				"create.kernelLog", new Nil<Double>() {
 				}, new Nil<Integer>() {
 				}, new Nil<RandomAccessibleInterval<DoubleType>>() {
@@ -66,7 +65,7 @@ public void testKernelLog() {
 		final RandomAccessibleInterval<DoubleType> logKernel = //
 				func1.apply(sigma, sigmas.length);
 
-		Function<double[], RandomAccessibleInterval<DoubleType>> func2 = FunctionUtils.match(ops.env(), "create.kernelLog",
+		Function<double[], RandomAccessibleInterval<DoubleType>> func2 = OpBuilder.matchFunction(ops.env(), "create.kernelLog",
 				new Nil<double[]>() {
 				}, new Nil<RandomAccessibleInterval<DoubleType>>() {
 				});
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateLabelingTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateLabelingTest.java
index 691c9f0bf..45b4ae7ac 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateLabelingTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateLabelingTest.java
@@ -34,6 +34,7 @@
 
 import java.util.function.BiFunction;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.Dimensions;
 import net.imglib2.FinalDimensions;
 import net.imglib2.img.Img;
@@ -45,10 +46,8 @@
 import net.imglib2.util.Intervals;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
-
 import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.util.MersenneTwisterFast;
 
@@ -70,7 +69,7 @@ public void testImageDimensions() {
 		final MersenneTwisterFast randomGenerator = new MersenneTwisterFast(SEED);
 
 		// TODO can we keep this?
-		BiFunction<Dimensions, IntType, ImgLabeling<String, IntType>> createFunc = FunctionUtils.match(ops.env(),
+		BiFunction<Dimensions, IntType, ImgLabeling<String, IntType>> createFunc = OpBuilder.matchFunction(ops.env(),
 				"create.imgLabeling", new Nil<Dimensions>() {
 				}, new Nil<IntType>() {
 				}, new Nil<ImgLabeling<String, IntType>>() {
@@ -100,8 +99,8 @@ public void testImageFactory() {
 
 		final Dimensions dim = new FinalDimensions(10, 10, 10);
 
-		Functions.Arity3<Dimensions, IntType, ImgFactory<IntType>, ImgLabeling<String, IntType>> createFunc = FunctionUtils
-				.match(ops.env(), "create.imgLabeling", new Nil<Dimensions>() {
+		Functions.Arity3<Dimensions, IntType, ImgFactory<IntType>, ImgLabeling<String, IntType>> createFunc = OpBuilder
+				.matchFunction(ops.env(), "create.imgLabeling", new Nil<Dimensions>() {
 				}, new Nil<IntType>() {
 				}, new Nil<ImgFactory<IntType>>() {
 				}, new Nil<ImgLabeling<String, IntType>>() {
@@ -136,7 +135,7 @@ public void testImageType() {
 	@SuppressWarnings("unchecked")
 	private <I> ImgLabeling<I, ?> createLabelingWithType(final I type) {
 
-		BiFunction<Dimensions, IntType, ImgLabeling<I, IntType>> createFunc = FunctionUtils.match(ops.env(),
+		BiFunction<Dimensions, IntType, ImgLabeling<I, IntType>> createFunc = OpBuilder.matchFunction(ops.env(),
 				"create.imgLabeling", new Nil<Dimensions>() {
 				}, new Nil<IntType>() {
 				}, new Nil<ImgLabeling<I, IntType>>() {
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/convolve/ConvolveTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/convolve/ConvolveTest.java
index b96c6d0d8..34aefc8cd 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/convolve/ConvolveTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/convolve/ConvolveTest.java
@@ -149,19 +149,19 @@
 //
 //		// Op used to pad the input
 //		final BinaryFunctionOp<RandomAccessibleInterval<FloatType>, Dimensions, RandomAccessibleInterval<FloatType>> padOp =
-//			(BinaryFunctionOp) FunctionUtils.match(ops.env(), PadInputFFTMethods.class,
+//			(BinaryFunctionOp) OpBuilder.matchFunction(ops.env(), PadInputFFTMethods.class,
 //				RandomAccessibleInterval.class, RandomAccessibleInterval.class,
 //				Dimensions.class, true);
 //
 //		// Op used to pad the kernel
 //		final BinaryFunctionOp<RandomAccessibleInterval<FloatType>, Dimensions, RandomAccessibleInterval<FloatType>> padKernelOp =
-//			(BinaryFunctionOp) FunctionUtils.match(ops.env(), PadShiftKernelFFTMethods.class,
+//			(BinaryFunctionOp) OpBuilder.matchFunction(ops.env(), PadShiftKernelFFTMethods.class,
 //				RandomAccessibleInterval.class, RandomAccessibleInterval.class,
 //				Dimensions.class, true);
 //
 //		// Op used to create the complex FFTs
 //		UnaryFunctionOp<Dimensions, RandomAccessibleInterval<ComplexFloatType>> createOp =
-//			(UnaryFunctionOp) FunctionUtils.match(ops.env(), CreateOutputFFTMethods.class,
+//			(UnaryFunctionOp) OpBuilder.matchFunction(ops.env(), CreateOutputFFTMethods.class,
 //				RandomAccessibleInterval.class, Dimensions.class,
 //				new ComplexFloatType(), true);
 //
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/integral/IntegralImgTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/integral/IntegralImgTest.java
index 7ce703189..e4b71f7cd 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/integral/IntegralImgTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/integral/IntegralImgTest.java
@@ -49,7 +49,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.util.ComputerUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
@@ -78,8 +78,8 @@ public void before() throws Exception {
 	@Test
 	public void testIntegralImageSimilarity() {
 		// should match DefaultIntegralImg
-		Computers.Arity1<RandomAccessibleInterval<ByteType>, RandomAccessibleInterval<DoubleType>> defaultOp = ComputerUtils
-				.match(ops.env(), "image.integral", new Nil<RandomAccessibleInterval<ByteType>>() {
+		Computers.Arity1<RandomAccessibleInterval<ByteType>, RandomAccessibleInterval<DoubleType>> defaultOp = OpBuilder
+				.matchComputer(ops.env(), "image.integral", new Nil<RandomAccessibleInterval<ByteType>>() {
 				}, new Nil<RandomAccessibleInterval<DoubleType>>() {
 				});
 		defaultOp.compute(in, out1);
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/math/UnaryRealTypeMathTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/math/UnaryRealTypeMathTest.java
index a8ba48a10..470c2d0be 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/math/UnaryRealTypeMathTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/math/UnaryRealTypeMathTest.java
@@ -38,12 +38,10 @@
 import net.imglib2.type.numeric.real.DoubleType;
 import net.imglib2.type.numeric.real.FloatType;
 
-import org.junit.Rule;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.rules.ExpectedException;
 import org.scijava.function.Computers;
-import org.scijava.ops.util.ComputerUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
@@ -528,7 +526,7 @@ private void assertRandomGaussian(final double i, final double o, final double i
 		final DoubleType out = new DoubleType();
 		final long seed = 0xcafebabe12345678L;
 		final Random rng = new Random(seed);
-		final Computers.Arity2<DoubleType, Random, DoubleType> op = ComputerUtils.match(ops.env(), "math.randomGaussian",
+		final Computers.Arity2<DoubleType, Random, DoubleType> op = OpBuilder.matchComputer(ops.env(), "math.randomGaussian",
 				new Nil<DoubleType>() {}, new Nil<Random>() {}, new Nil<DoubleType>() {});
 		op.compute(in, rng, out);
 		assertEquals(o, out.get(), 0);
@@ -549,7 +547,7 @@ private void assertRandomUniform(final double i, final double o, final double i2
 		final DoubleType out = new DoubleType();
 		final long seed = 0xcafebabe12345678L;
 		final Random rng = new Random(seed);
-		final Computers.Arity2<DoubleType, Random, DoubleType> op = ComputerUtils.match(ops.env(), "math.randomUniform",
+		final Computers.Arity2<DoubleType, Random, DoubleType> op = OpBuilder.matchComputer(ops.env(), "math.randomUniform",
 				new Nil<DoubleType>() {}, new Nil<Random>() {}, new Nil<DoubleType>() {});
 		op.compute(in, rng, out);
 		assertEquals(o, out.get(), 0);
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/project/ProjectTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/project/ProjectTest.java
index 419ab5c18..fa6947b39 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/project/ProjectTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/project/ProjectTest.java
@@ -40,7 +40,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.util.ComputerUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 public class ProjectTest extends AbstractOpTest {
@@ -71,7 +71,7 @@ public void initImg() {
 		out1 = TestImgGeneration.unsignedByteArray(false, 10, 10);
 		out2 = TestImgGeneration.unsignedByteArray(false, 10, 10);
 
-		op = ComputerUtils.match(ops.env(), "stats.sum", new Nil<Iterable<UnsignedByteType>>() {},
+		op = OpBuilder.matchComputer(ops.env(), "stats.sum", new Nil<Iterable<UnsignedByteType>>() {},
 				new Nil<UnsignedByteType>() {});
 	}
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/AbstractThresholdTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/AbstractThresholdTest.java
index 983c57366..154000c05 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/AbstractThresholdTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/AbstractThresholdTest.java
@@ -46,8 +46,7 @@
 import net.imglib2.type.numeric.integer.UnsignedShortType;
 
 import org.junit.jupiter.api.BeforeEach;
-import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.util.ListUtils;
 
@@ -85,7 +84,7 @@ public void initialize() {
 			}
 		}
 		
-		createFunc = FunctionUtils.match(ops.env(), "image.histogram", new Nil<Img<UnsignedShortType>>() {}, new Nil<Integer>() {}, new Nil<Histogram1d<UnsignedShortType>>() {});
+		createFunc = OpBuilder.matchFunction(ops.env(), "image.histogram", new Nil<Img<UnsignedShortType>>() {}, new Nil<Integer>() {}, new Nil<Histogram1d<UnsignedShortType>>() {});
 	}
 
 	protected Histogram1d<UnsignedShortType> histogram() {
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/ComputeThresholdTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/ComputeThresholdTest.java
index 8b05ae5e2..bea79d915 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/ComputeThresholdTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/ComputeThresholdTest.java
@@ -35,7 +35,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.util.ComputerUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
@@ -182,7 +182,7 @@ private void testComputeThresholdOp(final int expectedOutput,
 	private Computers.Arity1<Histogram1d<UnsignedShortType>, UnsignedShortType>
 		getComputeThresholdOp(final String name)
 	{
-		return ComputerUtils.match(ops.env(), name,
+		return OpBuilder.matchComputer(ops.env(), name,
 			new Nil<Histogram1d<UnsignedShortType>>()
 			{}, new Nil<UnsignedShortType>() {});
 	}
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/ApplyManualThresholdTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/ApplyManualThresholdTest.java
index eec8d50e7..04f71ee81 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/ApplyManualThresholdTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/ApplyManualThresholdTest.java
@@ -39,7 +39,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.util.ComputerUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
@@ -52,7 +52,7 @@ public class ApplyManualThresholdTest extends AbstractThresholdTest {
 	@Test
 	public void testApplyThreshold() throws IncompatibleTypeException {
 		Computers.Arity3<Img<UnsignedShortType>, UnsignedShortType, Comparator<UnsignedShortType>, Iterable<BitType>> createFunc =
-			ComputerUtils.match(ops.env(), "threshold.apply",
+			OpBuilder.matchComputer(ops.env(), "threshold.apply",
 				new Nil<Img<UnsignedShortType>>()
 				{}, new Nil<UnsignedShortType>() {},
 				new Nil<Comparator<UnsignedShortType>>()
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/LocalThresholdTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/LocalThresholdTest.java
index 1cd4b428a..ef3e231e7 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/LocalThresholdTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/LocalThresholdTest.java
@@ -74,11 +74,10 @@
 import net.imglib2.util.Pair;
 import net.imglib2.view.Views;
 
-import org.junit.Before;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.util.ComputerUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
@@ -265,8 +264,8 @@ public void before() throws Exception {
 	@Test
 	public void testLocalBernsenThreshold() {
 		final Computers.Arity5<RandomAccessibleInterval<ByteType>, Shape, Double, Double, //
-				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = ComputerUtils
-						.match(ops.env(), "threshold.localBernsen", //
+				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = OpBuilder
+						.matchComputer(ops.env(), "threshold.localBernsen", //
 								new Nil<RandomAccessibleInterval<ByteType>>() {}, //
 								new Nil<Shape>() {}, //
 								new Nil<Double>() {}, //
@@ -286,8 +285,8 @@ public void testLocalBernsenThreshold() {
 	@Test
 	public void testLocalContrastThreshold() {
 		final Computers.Arity3<RandomAccessibleInterval<ByteType>, Shape, //
-				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = ComputerUtils
-						.match(ops.env(), "threshold.localContrast", //
+				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = OpBuilder
+						.matchComputer(ops.env(), "threshold.localContrast", //
 								new Nil<RandomAccessibleInterval<ByteType>>() {}, //
 								new Nil<Shape>() {}, //
 								new Nil<OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>>() {}, //
@@ -305,8 +304,8 @@ public void testLocalContrastThreshold() {
 	@Test
 	public void testLocalHuangThreshold() {
 		final Computers.Arity3<RandomAccessibleInterval<ByteType>, Shape, //
-				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = ComputerUtils
-						.match(ops.env(), "threshold.huang", //
+				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = OpBuilder
+						.matchComputer(ops.env(), "threshold.huang", //
 								new Nil<RandomAccessibleInterval<ByteType>>() {}, //
 								new Nil<Shape>() {}, //
 								new Nil<OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>>() {}, //
@@ -324,8 +323,8 @@ public void testLocalHuangThreshold() {
 	@Test
 	public void testLocalIJ1Threshold() {
 		final Computers.Arity3<RandomAccessibleInterval<ByteType>, Shape, //
-				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = ComputerUtils
-						.match(ops.env(), "threshold.ij1", //
+				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = OpBuilder
+						.matchComputer(ops.env(), "threshold.ij1", //
 								new Nil<RandomAccessibleInterval<ByteType>>() {}, //
 								new Nil<Shape>() {}, //
 								new Nil<OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>>() {}, //
@@ -343,8 +342,8 @@ public void testLocalIJ1Threshold() {
 	@Test
 	public void testLocalIntermodesThreshold() {
 		final Computers.Arity3<RandomAccessibleInterval<ByteType>, Shape, //
-				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = ComputerUtils
-						.match(ops.env(), "threshold.intermodes", //
+				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = OpBuilder
+						.matchComputer(ops.env(), "threshold.intermodes", //
 								new Nil<RandomAccessibleInterval<ByteType>>() {}, //
 								new Nil<Shape>() {}, //
 								new Nil<OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>>() {}, //
@@ -363,8 +362,8 @@ public void testLocalIntermodesThreshold() {
 	public void testLocalIsoDataThreshold() {
 		// NB: Test fails for RectangleShapes of span 1
 		final Computers.Arity3<RandomAccessibleInterval<ByteType>, Shape, //
-				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = ComputerUtils
-						.match(ops.env(), "threshold.isoData", //
+				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = OpBuilder
+						.matchComputer(ops.env(), "threshold.isoData", //
 								new Nil<RandomAccessibleInterval<ByteType>>() {}, //
 								new Nil<Shape>() {}, //
 								new Nil<OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>>() {}, //
@@ -382,8 +381,8 @@ public void testLocalIsoDataThreshold() {
 	@Test
 	public void testLocalLiThreshold() {
 		final Computers.Arity3<RandomAccessibleInterval<ByteType>, Shape, //
-				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = ComputerUtils
-						.match(ops.env(), "threshold.li", //
+				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = OpBuilder
+						.matchComputer(ops.env(), "threshold.li", //
 								new Nil<RandomAccessibleInterval<ByteType>>() {}, //
 								new Nil<Shape>() {}, //
 								new Nil<OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>>() {}, //
@@ -401,8 +400,8 @@ public void testLocalLiThreshold() {
 	@Test
 	public void testLocalMaxEntropyThreshold() {
 		final Computers.Arity3<RandomAccessibleInterval<ByteType>, Shape, //
-				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = ComputerUtils
-						.match(ops.env(), "threshold.maxEntropy", //
+				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = OpBuilder
+						.matchComputer(ops.env(), "threshold.maxEntropy", //
 								new Nil<RandomAccessibleInterval<ByteType>>() {}, //
 								new Nil<Shape>() {}, //
 								new Nil<OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>>() {}, //
@@ -421,8 +420,8 @@ public void testLocalMaxEntropyThreshold() {
 	public void testLocalMaxLikelihoodThreshold() {
 		// NB: Test fails for RectangleShapes of up to span==2
 		final Computers.Arity3<RandomAccessibleInterval<ByteType>, Shape, //
-				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = ComputerUtils
-						.match(ops.env(), "threshold.maxLikelihood", //
+				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = OpBuilder
+						.matchComputer(ops.env(), "threshold.maxLikelihood", //
 								new Nil<RandomAccessibleInterval<ByteType>>() {}, //
 								new Nil<Shape>() {}, //
 								new Nil<OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>>() {}, //
@@ -440,8 +439,8 @@ public void testLocalMaxLikelihoodThreshold() {
 	@Test
 	public void testLocalThresholdMean() {
 		final Computers.Arity4<RandomAccessibleInterval<ByteType>, Shape, Double, //
-				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = ComputerUtils
-						.match(ops.env(), "threshold.localMean", //
+				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = OpBuilder
+						.matchComputer(ops.env(), "threshold.localMean", //
 								new Nil<RandomAccessibleInterval<ByteType>>() {}, //
 								new Nil<Shape>() {}, //
 								new Nil<Double>() {}, //
@@ -502,8 +501,8 @@ public void testLocalThresholdMean() {
 	@Test
 	public void testLocalMedianThreshold() {
 		final Computers.Arity4<RandomAccessibleInterval<ByteType>, Shape, Double, //
-				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = ComputerUtils
-						.match(ops.env(), "threshold.localMedian", //
+				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = OpBuilder
+						.matchComputer(ops.env(), "threshold.localMedian", //
 								new Nil<RandomAccessibleInterval<ByteType>>() {}, //
 								new Nil<Shape>() {}, //
 								new Nil<Double>() {}, //
@@ -522,8 +521,8 @@ public void testLocalMedianThreshold() {
 	@Test
 	public void testLocalMidGreyThreshold() {
 		final Computers.Arity4<RandomAccessibleInterval<ByteType>, Shape, Double, //
-				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = ComputerUtils
-						.match(ops.env(), "threshold.localMidGrey", //
+				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = OpBuilder
+						.matchComputer(ops.env(), "threshold.localMidGrey", //
 								new Nil<RandomAccessibleInterval<ByteType>>() {}, //
 								new Nil<Shape>() {}, //
 								new Nil<Double>() {}, //
@@ -542,8 +541,8 @@ public void testLocalMidGreyThreshold() {
 	@Test
 	public void testLocalMinErrorThreshold() {
 		final Computers.Arity3<RandomAccessibleInterval<ByteType>, Shape, //
-				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = ComputerUtils
-						.match(ops.env(), "threshold.minError", //
+				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = OpBuilder
+						.matchComputer(ops.env(), "threshold.minError", //
 								new Nil<RandomAccessibleInterval<ByteType>>() {}, //
 								new Nil<Shape>() {}, //
 								new Nil<OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>>() {}, //
@@ -561,8 +560,8 @@ public void testLocalMinErrorThreshold() {
 	@Test
 	public void testLocalMinimumThreshold() {
 		final Computers.Arity3<RandomAccessibleInterval<ByteType>, Shape, //
-				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = ComputerUtils
-						.match(ops.env(), "threshold.minimum", //
+				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = OpBuilder
+						.matchComputer(ops.env(), "threshold.minimum", //
 								new Nil<RandomAccessibleInterval<ByteType>>() {}, //
 								new Nil<Shape>() {}, //
 								new Nil<OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>>() {}, //
@@ -580,8 +579,8 @@ public void testLocalMinimumThreshold() {
 	@Test
 	public void testLocalMomentsThreshold() {
 		final Computers.Arity3<RandomAccessibleInterval<ByteType>, Shape, //
-				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = ComputerUtils
-						.match(ops.env(), "threshold.moments", //
+				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = OpBuilder
+						.matchComputer(ops.env(), "threshold.moments", //
 								new Nil<RandomAccessibleInterval<ByteType>>() {}, //
 								new Nil<Shape>() {}, //
 								new Nil<OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>>() {}, //
@@ -599,8 +598,8 @@ public void testLocalMomentsThreshold() {
 	@Test
 	public void testLocalNiblackThreshold() {
 		final Computers.Arity5<RandomAccessibleInterval<ByteType>, Shape, Double, Double, //
-				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = ComputerUtils
-						.match(ops.env(), "threshold.localNiblack", //
+				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = OpBuilder
+						.matchComputer(ops.env(), "threshold.localNiblack", //
 								new Nil<RandomAccessibleInterval<ByteType>>() {}, //
 								new Nil<Shape>() {}, //
 								new Nil<Double>() {}, //
@@ -662,8 +661,8 @@ public void testLocalNiblackThreshold() {
 	@Test
 	public void testLocalOtsuThreshold() {
 		final Computers.Arity3<RandomAccessibleInterval<ByteType>, Shape, //
-				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = ComputerUtils
-						.match(ops.env(), "threshold.otsu", //
+				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = OpBuilder
+						.matchComputer(ops.env(), "threshold.otsu", //
 								new Nil<RandomAccessibleInterval<ByteType>>() {}, //
 								new Nil<Shape>() {}, //
 								new Nil<OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>>() {}, //
@@ -681,8 +680,8 @@ public void testLocalOtsuThreshold() {
 	@Test
 	public void testLocalPercentileThreshold() {
 		final Computers.Arity3<RandomAccessibleInterval<ByteType>, Shape, //
-				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = ComputerUtils
-						.match(ops.env(), "threshold.percentile", //
+				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = OpBuilder
+						.matchComputer(ops.env(), "threshold.percentile", //
 								new Nil<RandomAccessibleInterval<ByteType>>() {}, //
 								new Nil<Shape>() {}, //
 								new Nil<OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>>() {}, //
@@ -700,8 +699,8 @@ public void testLocalPercentileThreshold() {
 	@Test
 	public void testLocalPhansalkar() {
 		final Computers.Arity5<RandomAccessibleInterval<DoubleType>, Shape, Double, Double, //
-				OutOfBoundsFactory<DoubleType, RandomAccessibleInterval<DoubleType>>, RandomAccessibleInterval<BitType>> opToTest = ComputerUtils
-						.match(ops.env(), "threshold.localPhansalkar", //
+				OutOfBoundsFactory<DoubleType, RandomAccessibleInterval<DoubleType>>, RandomAccessibleInterval<BitType>> opToTest = OpBuilder
+						.matchComputer(ops.env(), "threshold.localPhansalkar", //
 								new Nil<RandomAccessibleInterval<DoubleType>>() {}, //
 								new Nil<Shape>() {}, //
 								new Nil<Double>() {}, //
@@ -765,8 +764,8 @@ public void testLocalPhansalkar() {
 	@Test
 	public void testLocalRenyiEntropyThreshold() {
 		final Computers.Arity3<RandomAccessibleInterval<ByteType>, Shape, //
-				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = ComputerUtils
-						.match(ops.env(), "threshold.renyiEntropy", //
+				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = OpBuilder
+						.matchComputer(ops.env(), "threshold.renyiEntropy", //
 								new Nil<RandomAccessibleInterval<ByteType>>() {}, //
 								new Nil<Shape>() {}, //
 								new Nil<OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>>() {}, //
@@ -784,8 +783,8 @@ public void testLocalRenyiEntropyThreshold() {
 	@Test
 	public void testLocalSauvola() {
 		final Computers.Arity5<RandomAccessibleInterval<ByteType>, Shape, Double, Double, //
-				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = ComputerUtils
-						.match(ops.env(), "threshold.localSauvola", //
+				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = OpBuilder
+						.matchComputer(ops.env(), "threshold.localSauvola", //
 								new Nil<RandomAccessibleInterval<ByteType>>() {}, //
 								new Nil<Shape>() {}, //
 								new Nil<Double>() {}, //
@@ -847,8 +846,8 @@ public void testLocalSauvola() {
 	@Test
 	public void testLocalShanbhagThreshold() {
 		final Computers.Arity3<RandomAccessibleInterval<ByteType>, Shape, //
-				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = ComputerUtils
-						.match(ops.env(), "threshold.shanbhag", //
+				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = OpBuilder
+						.matchComputer(ops.env(), "threshold.shanbhag", //
 								new Nil<RandomAccessibleInterval<ByteType>>() {}, //
 								new Nil<Shape>() {}, //
 								new Nil<OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>>() {}, //
@@ -866,8 +865,8 @@ public void testLocalShanbhagThreshold() {
 	@Test
 	public void testLocalTriangleThreshold() {
 		final Computers.Arity3<RandomAccessibleInterval<ByteType>, Shape, //
-				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = ComputerUtils
-						.match(ops.env(), "threshold.triangle", //
+				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = OpBuilder
+						.matchComputer(ops.env(), "threshold.triangle", //
 								new Nil<RandomAccessibleInterval<ByteType>>() {}, //
 								new Nil<Shape>() {}, //
 								new Nil<OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>>() {}, //
@@ -885,8 +884,8 @@ public void testLocalTriangleThreshold() {
 	@Test
 	public void testLocalYenThreshold() {
 		final Computers.Arity3<RandomAccessibleInterval<ByteType>, Shape, //
-				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = ComputerUtils
-						.match(ops.env(), "threshold.yen", //
+				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = OpBuilder
+						.matchComputer(ops.env(), "threshold.yen", //
 								new Nil<RandomAccessibleInterval<ByteType>>() {}, //
 								new Nil<Shape>() {}, //
 								new Nil<OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>>() {}, //
@@ -904,8 +903,8 @@ public void testLocalYenThreshold() {
 	@Test
 	public void testLocalRosinThreshold() {
 		final Computers.Arity3<RandomAccessibleInterval<ByteType>, Shape, //
-				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = ComputerUtils
-						.match(ops.env(), "threshold.rosin", //
+				OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<BitType>> opToTest = OpBuilder
+						.matchComputer(ops.env(), "threshold.rosin", //
 								new Nil<RandomAccessibleInterval<ByteType>>() {}, //
 								new Nil<Shape>() {}, //
 								new Nil<OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>>>() {}, //
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseNumericView/CollapseNumericViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseNumericView/CollapseNumericViewTest.java
index 9624d4aa7..3f328af3b 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseNumericView/CollapseNumericViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseNumericView/CollapseNumericViewTest.java
@@ -33,6 +33,7 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.RandomAccessible;
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.img.Img;
@@ -44,10 +45,7 @@
 import net.imglib2.view.composite.NumericComposite;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
-
-import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
@@ -81,8 +79,8 @@ public void defaultCollapseNumericTest() {
 
 		assertEquals(il2.numDimensions(), opr.numDimensions());
 
-		BiFunction<RandomAccessible<NativeARGBDoubleType>, Integer, CompositeView<NativeARGBDoubleType, NumericComposite<NativeARGBDoubleType>>> collapseFuncRA = FunctionUtils
-				.match(ops.env(), "transform.collapseNumericView",
+		BiFunction<RandomAccessible<NativeARGBDoubleType>, Integer, CompositeView<NativeARGBDoubleType, NumericComposite<NativeARGBDoubleType>>> collapseFuncRA = OpBuilder
+				.matchFunction(ops.env(), "transform.collapseNumericView",
 						new Nil<RandomAccessible<NativeARGBDoubleType>>() {
 				}, new Nil<Integer>() {
 				},
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseRealView/CollapseRealViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseRealView/CollapseRealViewTest.java
index 8a5bffdf2..afa64d7b9 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseRealView/CollapseRealViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseRealView/CollapseRealViewTest.java
@@ -33,6 +33,7 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.RandomAccessible;
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.img.Img;
@@ -44,10 +45,8 @@
 import net.imglib2.view.composite.RealComposite;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
-import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
 
 /**
  * Tests {@link net.imagej.ops2.Ops.Transform.CollapseRealView} ops.
@@ -66,8 +65,8 @@ public void defaultCollapseRealTest() {
 
 		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 
-		Function<RandomAccessibleInterval<DoubleType>, CompositeIntervalView<DoubleType, RealComposite<DoubleType>>> collapseFunc = FunctionUtils
-				.match(ops.env(), "transform.collapseRealView", new Nil<RandomAccessibleInterval<DoubleType>>() {
+		Function<RandomAccessibleInterval<DoubleType>, CompositeIntervalView<DoubleType, RealComposite<DoubleType>>> collapseFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.collapseRealView", new Nil<RandomAccessibleInterval<DoubleType>>() {
 				}, new Nil<CompositeIntervalView<DoubleType, RealComposite<DoubleType>>>() {
 				});
 
@@ -77,8 +76,8 @@ public void defaultCollapseRealTest() {
 
 		assertEquals(il2.numDimensions(), opr.numDimensions());
 
-		BiFunction<RandomAccessible<DoubleType>, Integer, CompositeView<DoubleType, RealComposite<DoubleType>>> collapseFuncRA = FunctionUtils
-				.match(ops.env(), "transform.collapseRealView", new Nil<RandomAccessible<DoubleType>>() {
+		BiFunction<RandomAccessible<DoubleType>, Integer, CompositeView<DoubleType, RealComposite<DoubleType>>> collapseFuncRA = OpBuilder
+				.matchFunction(ops.env(), "transform.collapseRealView", new Nil<RandomAccessible<DoubleType>>() {
 				}, new Nil<Integer>() {
 				}, new Nil<CompositeView<DoubleType, RealComposite<DoubleType>>>() {
 				});
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseView/CollapseViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseView/CollapseViewTest.java
index 4944c9385..49acee2a2 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseView/CollapseViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseView/CollapseViewTest.java
@@ -32,6 +32,7 @@
 
 import java.util.function.Function;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.RandomAccessible;
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.img.Img;
@@ -43,10 +44,8 @@
 import net.imglib2.view.composite.GenericComposite;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
-import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
 
 /**
  * Tests {@link net.imagej.ops2.Ops.Transform.CollapseView} ops.
@@ -64,8 +63,8 @@ public class CollapseViewTest extends AbstractOpTest {
 	public void defaultCollapseTest() {
 		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 
-		Function<RandomAccessibleInterval<DoubleType>, CompositeIntervalView<DoubleType, ? extends GenericComposite<DoubleType>>> collapseFunc = FunctionUtils
-				.match(ops.env(), "transform.collapseView", new Nil<RandomAccessibleInterval<DoubleType>>() {
+		Function<RandomAccessibleInterval<DoubleType>, CompositeIntervalView<DoubleType, ? extends GenericComposite<DoubleType>>> collapseFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.collapseView", new Nil<RandomAccessibleInterval<DoubleType>>() {
 				}, new Nil<CompositeIntervalView<DoubleType, ? extends GenericComposite<DoubleType>>>() {
 				});
 
@@ -80,8 +79,8 @@ public void collapseRATest() {
 
 		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10, 10 });
 
-		Function<RandomAccessible<DoubleType>, CompositeView<DoubleType, ? extends GenericComposite<DoubleType>>> collapseFunc = FunctionUtils
-				.match(ops.env(), "transform.collapseView", new Nil<RandomAccessible<DoubleType>>() {
+		Function<RandomAccessible<DoubleType>, CompositeView<DoubleType, ? extends GenericComposite<DoubleType>>> collapseFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.collapseView", new Nil<RandomAccessible<DoubleType>>() {
 				}, new Nil<CompositeView<DoubleType, ? extends GenericComposite<DoubleType>>>() {
 				});
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/concatenateView/ConcatenateViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/concatenateView/ConcatenateViewTest.java
index 2a6c334e1..cc76e764d 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/concatenateView/ConcatenateViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/concatenateView/ConcatenateViewTest.java
@@ -49,7 +49,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.util.MersenneTwisterFast;
 
@@ -108,8 +108,8 @@ private static <T extends ValueEquals<T>> void testEqual(final RandomAccessibleI
 
 	@Test
 	public void defaultConcatenateTest() {
-		BiFunction<Integer, List<RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<ByteType>> concatFunc = FunctionUtils
-				.match(ops.env(), "transform.concatenateView", new Nil<Integer>() {
+		BiFunction<Integer, List<RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<ByteType>> concatFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.concatenateView", new Nil<Integer>() {
 				}, new Nil<List<RandomAccessibleInterval<ByteType>>>() {
 				}, new Nil<RandomAccessibleInterval<ByteType>>() {
 				});
@@ -123,8 +123,8 @@ public void defaultConcatenateTest() {
 
 	@Test
 	public void concatenateWithAccessModeTest() {
-		Functions.Arity3<Integer, StackAccessMode, List<RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<ByteType>> concatFunc = FunctionUtils
-				.match(ops.env(), "transform.concatenateView", new Nil<Integer>() {
+		Functions.Arity3<Integer, StackAccessMode, List<RandomAccessibleInterval<ByteType>>, RandomAccessibleInterval<ByteType>> concatFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.concatenateView", new Nil<Integer>() {
 				}, new Nil<StackAccessMode>() {
 				}, new Nil<List<RandomAccessibleInterval<ByteType>>>() {
 				}, new Nil<RandomAccessibleInterval<ByteType>>() {
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/dropSingleDimensionsView/DropSingletonDimensionsViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/dropSingleDimensionsView/DropSingletonDimensionsViewTest.java
index fef57752f..6de6c9a27 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/dropSingleDimensionsView/DropSingletonDimensionsViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/dropSingleDimensionsView/DropSingletonDimensionsViewTest.java
@@ -32,6 +32,7 @@
 
 import java.util.function.Function;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.img.Img;
 import net.imglib2.img.array.ArrayImgFactory;
@@ -39,9 +40,7 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
-
-import org.scijava.ops.util.FunctionUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
@@ -59,8 +58,8 @@ public class DropSingletonDimensionsViewTest extends AbstractOpTest {
 	@Test
 	public void dropSingletonDimensionsTest() {
 
-		Function<RandomAccessibleInterval<DoubleType>, RandomAccessibleInterval<DoubleType>> dropFunc = FunctionUtils
-				.match(ops.env(), "transform.dropSingletonDimensionsView", new Nil<RandomAccessibleInterval<DoubleType>>() {
+		Function<RandomAccessibleInterval<DoubleType>, RandomAccessibleInterval<DoubleType>> dropFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.dropSingletonDimensionsView", new Nil<RandomAccessibleInterval<DoubleType>>() {
 				}, new Nil<RandomAccessibleInterval<DoubleType>>() {
 				});
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendBorderView/ExtendBorderViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendBorderView/ExtendBorderViewTest.java
index 6af6df524..6ce1067a6 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendBorderView/ExtendBorderViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendBorderView/ExtendBorderViewTest.java
@@ -32,6 +32,7 @@
 
 import java.util.function.Function;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.RandomAccess;
 import net.imglib2.RandomAccessible;
 import net.imglib2.RandomAccessibleInterval;
@@ -41,10 +42,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
-import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
 
 /**
  * Tests {@link net.imagej.ops2.Ops.Transform.ExtendBorderView} ops.
@@ -63,8 +62,8 @@ public class ExtendBorderViewTest extends AbstractOpTest {
 
 	@Test
 	public void extendBorderTest() {
-		Function<RandomAccessibleInterval<DoubleType>, RandomAccessible<DoubleType>> extendFunc = FunctionUtils
-				.match(ops.env(), "transform.extendBorderView", raiNil,
+		Function<RandomAccessibleInterval<DoubleType>, RandomAccessible<DoubleType>> extendFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.extendBorderView", raiNil,
 						new Nil<RandomAccessible<DoubleType>>() {
 				});
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorDoubleView/ExtendMirrorDoubleViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorDoubleView/ExtendMirrorDoubleViewTest.java
index 1faad5470..f6428bb93 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorDoubleView/ExtendMirrorDoubleViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorDoubleView/ExtendMirrorDoubleViewTest.java
@@ -32,6 +32,7 @@
 
 import java.util.function.Function;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.RandomAccess;
 import net.imglib2.RandomAccessible;
 import net.imglib2.RandomAccessibleInterval;
@@ -41,10 +42,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
-import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
 
 /**
  * Tests {@link net.imagej.ops2.Ops.Transform.ExtendMirrorDoubleView} ops.
@@ -63,8 +62,8 @@ public class ExtendMirrorDoubleViewTest extends AbstractOpTest {
 
 	@Test
 	public void extendMirrorDoubleTest() {
-		Function<RandomAccessibleInterval<DoubleType>, RandomAccessible<DoubleType>> extendFunc = FunctionUtils
-				.match(ops.env(), "transform.extendMirrorDoubleView", raiNil,
+		Function<RandomAccessibleInterval<DoubleType>, RandomAccessible<DoubleType>> extendFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.extendMirrorDoubleView", raiNil,
 						new Nil<RandomAccessible<DoubleType>>() {
 				});
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorSingleView/ExtendMirrorSingleViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorSingleView/ExtendMirrorSingleViewTest.java
index a4c39bb47..9ad7b254e 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorSingleView/ExtendMirrorSingleViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorSingleView/ExtendMirrorSingleViewTest.java
@@ -32,6 +32,7 @@
 
 import java.util.function.Function;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.RandomAccess;
 import net.imglib2.RandomAccessible;
 import net.imglib2.RandomAccessibleInterval;
@@ -41,10 +42,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
-import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
 
 /**
  * Tests {@link net.imagej.ops2.Ops.Transform.ExtendMirrorSingleView} ops.
@@ -63,8 +62,8 @@ public class ExtendMirrorSingleViewTest extends AbstractOpTest {
 
 	@Test
 	public void extendMirrorSingleTest() {
-		Function<RandomAccessibleInterval<DoubleType>, RandomAccessible<DoubleType>> extendFunc = FunctionUtils
-				.match(ops.env(), "transform.extendMirrorSingleView", raiNil,
+		Function<RandomAccessibleInterval<DoubleType>, RandomAccessible<DoubleType>> extendFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.extendMirrorSingleView", raiNil,
 						new Nil<RandomAccessible<DoubleType>>() {
 				});
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendPeriodicView/ExtendPeriodicViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendPeriodicView/ExtendPeriodicViewTest.java
index bd72fe6b7..a3d899618 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendPeriodicView/ExtendPeriodicViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendPeriodicView/ExtendPeriodicViewTest.java
@@ -32,6 +32,7 @@
 
 import java.util.function.Function;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.RandomAccess;
 import net.imglib2.RandomAccessible;
 import net.imglib2.RandomAccessibleInterval;
@@ -41,10 +42,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
-import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
 
 /**
  * Tests {@link net.imagej.ops2.Ops.Transform.ExtendPeriodicView} ops.
@@ -63,8 +62,8 @@ public class ExtendPeriodicViewTest extends AbstractOpTest {
 
 	@Test
 	public void extendPeriodicTest() {
-		Function<RandomAccessibleInterval<DoubleType>, RandomAccessible<DoubleType>> extendFunc = FunctionUtils
-				.match(ops.env(), "transform.extendPeriodicView", raiNil,
+		Function<RandomAccessibleInterval<DoubleType>, RandomAccessible<DoubleType>> extendFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.extendPeriodicView", raiNil,
 						new Nil<RandomAccessible<DoubleType>>() {
 				});
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendRandomView/ExtendRandomViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendRandomView/ExtendRandomViewTest.java
index 5154908d9..cd4e89453 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendRandomView/ExtendRandomViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendRandomView/ExtendRandomViewTest.java
@@ -30,6 +30,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.RandomAccess;
 import net.imglib2.RandomAccessible;
 import net.imglib2.RandomAccessibleInterval;
@@ -39,10 +40,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
-
 import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
@@ -64,8 +63,8 @@ public class ExtendRandomViewTest extends AbstractOpTest {
 
 	@Test
 	public void extendRandomTest() {
-		Functions.Arity3<RandomAccessibleInterval<DoubleType>, Double, Double, RandomAccessible<DoubleType>> extendFunc = FunctionUtils
-				.match(ops.env(), "transform.extendRandomView", raiNil, doubleNil, doubleNil,
+		Functions.Arity3<RandomAccessibleInterval<DoubleType>, Double, Double, RandomAccessible<DoubleType>> extendFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.extendRandomView", raiNil, doubleNil, doubleNil,
 						new Nil<RandomAccessible<DoubleType>>() {
 				});
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendValueView/ExtendValueViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendValueView/ExtendValueViewTest.java
index ba2294171..2635486ab 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendValueView/ExtendValueViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendValueView/ExtendValueViewTest.java
@@ -32,6 +32,7 @@
 
 import java.util.function.BiFunction;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.RandomAccess;
 import net.imglib2.RandomAccessible;
 import net.imglib2.RandomAccessibleInterval;
@@ -41,10 +42,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
-import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
 
 /**
  * Tests {@link net.imagej.ops2.Ops.Transform.ExtendValueView} ops.
@@ -63,8 +62,8 @@ public class ExtendValueViewTest extends AbstractOpTest {
 
 	@Test
 	public void extendValueTest() {
-		BiFunction<RandomAccessibleInterval<DoubleType>, DoubleType, RandomAccessible<DoubleType>> extendFunc = FunctionUtils
-				.match(ops.env(), "transform.extendValueView", raiNil, new Nil<DoubleType>() {
+		BiFunction<RandomAccessibleInterval<DoubleType>, DoubleType, RandomAccessible<DoubleType>> extendFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.extendValueView", raiNil, new Nil<DoubleType>() {
 				}, new Nil<RandomAccessible<DoubleType>>() {
 				});
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendView/ExtendViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendView/ExtendViewTest.java
index b6223c1ad..c2e2f6d71 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendView/ExtendViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendView/ExtendViewTest.java
@@ -32,6 +32,7 @@
 
 import java.util.function.BiFunction;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.RandomAccess;
 import net.imglib2.RandomAccessible;
 import net.imglib2.RandomAccessibleInterval;
@@ -43,10 +44,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
-import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
 
 /**
  * Tests {@link net.imagej.ops2.Ops.Transform.ExtendView} ops.
@@ -65,8 +64,8 @@ public class ExtendViewTest extends AbstractOpTest {
 
 	@Test
 	public void defaultExtendTest() {
-		BiFunction<RandomAccessibleInterval<DoubleType>, OutOfBoundsFactory<DoubleType, ? super RandomAccessibleInterval<DoubleType>>, RandomAccessible<DoubleType>> extendFunc = FunctionUtils
-				.match(ops.env(), "transform.extendView", raiNil,
+		BiFunction<RandomAccessibleInterval<DoubleType>, OutOfBoundsFactory<DoubleType, ? super RandomAccessibleInterval<DoubleType>>, RandomAccessible<DoubleType>> extendFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.extendView", raiNil,
 						new Nil<OutOfBoundsFactory<DoubleType, ? super RandomAccessibleInterval<DoubleType>>>() {
 				},
 						new Nil<RandomAccessible<DoubleType>>() {
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendZeroView/ExtendZeroViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendZeroView/ExtendZeroViewTest.java
index 61549d7a3..fbbb589b1 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendZeroView/ExtendZeroViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendZeroView/ExtendZeroViewTest.java
@@ -32,6 +32,7 @@
 
 import java.util.function.Function;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.RandomAccess;
 import net.imglib2.RandomAccessible;
 import net.imglib2.RandomAccessibleInterval;
@@ -41,10 +42,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
-import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
 
 /**
  * Tests {@link net.imagej.ops2.Ops.Transform.ExtendZeroView} ops.
@@ -63,8 +62,8 @@ public class ExtendZeroViewTest extends AbstractOpTest {
 
 	@Test
 	public void extendZeroTest() {
-		Function<RandomAccessibleInterval<DoubleType>, RandomAccessible<DoubleType>> extendFunc = FunctionUtils
-				.match(ops.env(), "transform.extendZeroView", raiNil,
+		Function<RandomAccessibleInterval<DoubleType>, RandomAccessible<DoubleType>> extendFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.extendZeroView", raiNil,
 						new Nil<RandomAccessible<DoubleType>>() {
 				});
 		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/flatIterableView/FlatIterableViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/flatIterableView/FlatIterableViewTest.java
index 13dd51bb1..02b8f4e9d 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/flatIterableView/FlatIterableViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/flatIterableView/FlatIterableViewTest.java
@@ -32,6 +32,7 @@
 
 import java.util.function.Function;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.Cursor;
 import net.imglib2.IterableInterval;
 import net.imglib2.RandomAccessibleInterval;
@@ -41,10 +42,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
-import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
 
 /**
  * Tests {@link net.imagej.ops2.Ops.Transform.FlatIterableView} ops.
@@ -64,8 +63,8 @@ public class FlatIterableViewTest extends AbstractOpTest {
 
 	@Test
 	public void defaultFlatIterableTest() {
-		Function<RandomAccessibleInterval<DoubleType>, IterableInterval<DoubleType>> flatIterableFunc = FunctionUtils
-				.match(ops.env(), "transform.flatIterableView", raiNil, iiNil);
+		Function<RandomAccessibleInterval<DoubleType>, IterableInterval<DoubleType>> flatIterableFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.flatIterableView", raiNil, iiNil);
 
 		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/hyperSliceView/HyperSliceViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/hyperSliceView/HyperSliceViewTest.java
index a4e58ccad..1cd95c34e 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/hyperSliceView/HyperSliceViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/hyperSliceView/HyperSliceViewTest.java
@@ -30,6 +30,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.RandomAccessible;
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.img.Img;
@@ -40,10 +41,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
-
 import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
@@ -74,8 +73,8 @@ public static <T> RandomAccessible<T> deinterval(RandomAccessibleInterval<T> inp
 
 	@Test
 	public void defaultHyperSliceTest() {
-		Functions.Arity3<RandomAccessible<DoubleType>, Integer, Long, MixedTransformView<DoubleType>> hyperSliceFunc = FunctionUtils
-				.match(ops.env(), "transform.hyperSliceView", raNil, integerNil, longNil,
+		Functions.Arity3<RandomAccessible<DoubleType>, Integer, Long, MixedTransformView<DoubleType>> hyperSliceFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.hyperSliceView", raNil, integerNil, longNil,
 						new Nil<MixedTransformView<DoubleType>>() {
 				});
 
@@ -95,8 +94,8 @@ public void defaultHyperSliceTest() {
 	@Test
 	public void IntervalHyperSliceTest() {
 
-		Functions.Arity3<RandomAccessibleInterval<DoubleType>, Integer, Long, IntervalView<DoubleType>> hyperSliceFunc = FunctionUtils
-				.match(ops.env(), "transform.hyperSliceView", raiNil, integerNil, longNil,
+		Functions.Arity3<RandomAccessibleInterval<DoubleType>, Integer, Long, IntervalView<DoubleType>> hyperSliceFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.hyperSliceView", raiNil, integerNil, longNil,
 						new Nil<IntervalView<DoubleType>>() {
 						});
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/interpolateView/InterpolateViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/interpolateView/InterpolateViewTest.java
index 504a7655d..340d8dee2 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/interpolateView/InterpolateViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/interpolateView/InterpolateViewTest.java
@@ -32,6 +32,7 @@
 
 import java.util.function.BiFunction;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.RandomAccessible;
 import net.imglib2.RealRandomAccess;
 import net.imglib2.RealRandomAccessible;
@@ -42,10 +43,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
-import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
 import org.scijava.util.MersenneTwisterFast;
 
 /**
@@ -65,8 +64,8 @@ public class InterpolateViewTest extends AbstractOpTest {
 	@Test
 	public void defaultInterpolateTest() {
 
-		BiFunction<RandomAccessible<DoubleType>, FloorInterpolatorFactory<DoubleType>, RealRandomAccessible<DoubleType>> interpolateFunc = FunctionUtils
-				.match(ops.env(), "transform.interpolateView", new Nil<RandomAccessible<DoubleType>>() {
+		BiFunction<RandomAccessible<DoubleType>, FloorInterpolatorFactory<DoubleType>, RealRandomAccessible<DoubleType>> interpolateFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.interpolateView", new Nil<RandomAccessible<DoubleType>>() {
 				}, new Nil<FloorInterpolatorFactory<DoubleType>>() {
 				}, new Nil<RealRandomAccessible<DoubleType>>() {
 				});
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/intervalView/IntervalViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/intervalView/IntervalViewTest.java
index 778e511bb..2566b740e 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/intervalView/IntervalViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/intervalView/IntervalViewTest.java
@@ -32,6 +32,7 @@
 
 import java.util.function.BiFunction;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.Cursor;
 import net.imglib2.Interval;
 import net.imglib2.RandomAccess;
@@ -43,10 +44,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
-
 import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.util.MersenneTwisterFast;
 
@@ -67,8 +66,8 @@ public class IntervalViewTest extends AbstractOpTest {
 	@Test
 	public void defaultIntervalTest() {
 
-		BiFunction<RandomAccessible<DoubleType>, Interval, IntervalView<DoubleType>> intervalFunc = FunctionUtils
-				.match(ops.env(), "transform.intervalView", new Nil<RandomAccessible<DoubleType>>() {
+		BiFunction<RandomAccessible<DoubleType>, Interval, IntervalView<DoubleType>> intervalFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.intervalView", new Nil<RandomAccessible<DoubleType>>() {
 				}, new Nil<Interval>() {
 				}, new Nil<IntervalView<DoubleType>>() {
 				});
@@ -94,8 +93,8 @@ public void defaultIntervalTest() {
 	@Test
 	public void intervalMinMaxTest() {
 
-		Functions.Arity3<RandomAccessible<DoubleType>, long[], long[], IntervalView<DoubleType>> intervalFunc = FunctionUtils
-				.match(ops.env(), "transform.intervalView", new Nil<RandomAccessible<DoubleType>>() {
+		Functions.Arity3<RandomAccessible<DoubleType>, long[], long[], IntervalView<DoubleType>> intervalFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.intervalView", new Nil<RandomAccessible<DoubleType>>() {
 				}, new Nil<long[]>() {
 				}, new Nil<long[]>() {
 				}, new Nil<IntervalView<DoubleType>>() {
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/invertAxisView/InvertAxisViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/invertAxisView/InvertAxisViewTest.java
index ff2126da8..205374b8d 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/invertAxisView/InvertAxisViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/invertAxisView/InvertAxisViewTest.java
@@ -32,6 +32,7 @@
 
 import java.util.function.BiFunction;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.RandomAccessible;
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.img.Img;
@@ -42,9 +43,7 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
-
-import org.scijava.ops.util.FunctionUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
@@ -67,8 +66,8 @@ public static <T> RandomAccessible<T> deinterval(RandomAccessibleInterval<T> inp
 	@Test
 	public void defaultInvertAxisTest() {
 
-		BiFunction<RandomAccessible<DoubleType>, Integer, MixedTransformView<DoubleType>> invertFunc = FunctionUtils
-				.match(ops.env(), "transform.invertAxisView", new Nil<RandomAccessible<DoubleType>>() {
+		BiFunction<RandomAccessible<DoubleType>, Integer, MixedTransformView<DoubleType>> invertFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.invertAxisView", new Nil<RandomAccessible<DoubleType>>() {
 				}, new Nil<Integer>() {
 				}, new Nil<MixedTransformView<DoubleType>>() {
 				});
@@ -89,8 +88,8 @@ public void defaultInvertAxisTest() {
 	@Test
 	public void intervalInvertAxisTest() {
 
-		BiFunction<RandomAccessibleInterval<DoubleType>, Integer, IntervalView<DoubleType>> invertFunc = FunctionUtils
-				.match(ops.env(), "transform.invertAxisView", new Nil<RandomAccessibleInterval<DoubleType>>() {
+		BiFunction<RandomAccessibleInterval<DoubleType>, Integer, IntervalView<DoubleType>> invertFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.invertAxisView", new Nil<RandomAccessibleInterval<DoubleType>>() {
 				}, new Nil<Integer>() {
 				}, new Nil<IntervalView<DoubleType>>() {
 				});
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/offsetView/OffsetViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/offsetView/OffsetViewTest.java
index ebbc55bae..efe48cbd5 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/offsetView/OffsetViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/offsetView/OffsetViewTest.java
@@ -32,6 +32,7 @@
 
 import java.util.function.BiFunction;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.FinalInterval;
 import net.imglib2.Interval;
 import net.imglib2.RandomAccessible;
@@ -44,10 +45,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
-
 import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
@@ -65,8 +64,8 @@ public class OffsetViewTest extends AbstractOpTest {
 	@Test
 	public void defaultOffsetTest() {
 
-		BiFunction<RandomAccessible<DoubleType>, long[], MixedTransformView<DoubleType>> offsetFunc = FunctionUtils
-				.match(ops.env(), "transform.offsetView", new Nil<RandomAccessible<DoubleType>>() {
+		BiFunction<RandomAccessible<DoubleType>, long[], MixedTransformView<DoubleType>> offsetFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.offsetView", new Nil<RandomAccessible<DoubleType>>() {
 				}, new Nil<long[]>() {
 				}, new Nil<MixedTransformView<DoubleType>>() {
 				});
@@ -87,8 +86,8 @@ public void defaultOffsetTest() {
 	@Test
 	public void defaultOffsetIntervalTest() {
 
-		BiFunction<RandomAccessibleInterval<DoubleType>, Interval, IntervalView<DoubleType>> offsetFunc = FunctionUtils
-				.match(ops.env(), "transform.offsetView", new Nil<RandomAccessibleInterval<DoubleType>>() {
+		BiFunction<RandomAccessibleInterval<DoubleType>, Interval, IntervalView<DoubleType>> offsetFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.offsetView", new Nil<RandomAccessibleInterval<DoubleType>>() {
 				}, new Nil<Interval>() {
 				}, new Nil<IntervalView<DoubleType>>() {
 				});
@@ -109,8 +108,8 @@ public void defaultOffsetIntervalTest() {
 	@Test
 	public void defaultOffsetStartEndTest() {
 
-		Functions.Arity3<RandomAccessibleInterval<DoubleType>, long[], long[], IntervalView<DoubleType>> offsetFunc = FunctionUtils
-				.match(ops.env(), "transform.offsetView", new Nil<RandomAccessibleInterval<DoubleType>>() {
+		Functions.Arity3<RandomAccessibleInterval<DoubleType>, long[], long[], IntervalView<DoubleType>> offsetFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.offsetView", new Nil<RandomAccessibleInterval<DoubleType>>() {
 				}, new Nil<long[]>() {
 				}, new Nil<long[]>() {
 				}, new Nil<IntervalView<DoubleType>>() {
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/permuteView/PermuteViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/permuteView/PermuteViewTest.java
index 441e7ddd5..f3b3e1be0 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/permuteView/PermuteViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/permuteView/PermuteViewTest.java
@@ -33,6 +33,7 @@
 
 import java.util.function.BiFunction;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.Cursor;
 import net.imglib2.RandomAccess;
 import net.imglib2.RandomAccessible;
@@ -47,10 +48,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
-
 import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.util.MersenneTwisterFast;
 
@@ -76,8 +75,8 @@ public static <T> RandomAccessible<T> deinterval(RandomAccessibleInterval<T> inp
 	@Test
 	public void defaultPermuteTest() {
 
-		Functions.Arity3<RandomAccessible<DoubleType>, Integer, Integer, MixedTransformView<DoubleType>> permuteFunc = FunctionUtils
-				.match(ops.env(), "transform.permuteView", new Nil<RandomAccessible<DoubleType>>() {
+		Functions.Arity3<RandomAccessible<DoubleType>, Integer, Integer, MixedTransformView<DoubleType>> permuteFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.permuteView", new Nil<RandomAccessible<DoubleType>>() {
 				}, new Nil<Integer>() {
 				}, new Nil<Integer>() {
 				}, new Nil<MixedTransformView<DoubleType>>() {
@@ -99,8 +98,8 @@ public void defaultPermuteTest() {
 	@Test
 	public void defaultPermuteCoordinatesTest() {
 
-		BiFunction<RandomAccessibleInterval<DoubleType>, int[], IntervalView<DoubleType>> permuteFunc = FunctionUtils
-				.match(ops.env(), "transform.permuteCoordinatesView", new Nil<RandomAccessibleInterval<DoubleType>>() {
+		BiFunction<RandomAccessibleInterval<DoubleType>, int[], IntervalView<DoubleType>> permuteFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.permuteCoordinatesView", new Nil<RandomAccessibleInterval<DoubleType>>() {
 				}, new Nil<int[]>() {
 				}, new Nil<IntervalView<DoubleType>>() {
 				});
@@ -125,8 +124,8 @@ public void defaultPermuteCoordinatesTest() {
 	@Test
 	public void permuteCoordinatesOfDimensionTest() {
 
-		Functions.Arity3<RandomAccessibleInterval<DoubleType>, int[], Integer, IntervalView<DoubleType>> permuteFunc = FunctionUtils
-				.match(ops.env(), "transform.permuteCoordinatesView", new Nil<RandomAccessibleInterval<DoubleType>>() {
+		Functions.Arity3<RandomAccessibleInterval<DoubleType>, int[], Integer, IntervalView<DoubleType>> permuteFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.permuteCoordinatesView", new Nil<RandomAccessibleInterval<DoubleType>>() {
 				}, new Nil<int[]>() {
 				}, new Nil<Integer>() {
 				}, new Nil<IntervalView<DoubleType>>() {
@@ -153,8 +152,8 @@ public void permuteCoordinatesOfDimensionTest() {
 	@Test
 	public void defaultPermuteCoordinatesInverseTest() {
 
-		BiFunction<RandomAccessibleInterval<DoubleType>, int[], IntervalView<DoubleType>> permuteFunc = FunctionUtils
-				.match(ops.env(), "transform.permuteCoordinatesInverseView",
+		BiFunction<RandomAccessibleInterval<DoubleType>, int[], IntervalView<DoubleType>> permuteFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.permuteCoordinatesInverseView",
 						new Nil<RandomAccessibleInterval<DoubleType>>() {
 				}, new Nil<int[]>() {
 				}, new Nil<IntervalView<DoubleType>>() {
@@ -180,8 +179,8 @@ public void defaultPermuteCoordinatesInverseTest() {
 	@Test
 	public void permuteCoordinatesInverseOfDimensionTest() {
 
-		Functions.Arity3<RandomAccessibleInterval<DoubleType>, int[], Integer, IntervalView<DoubleType>> permuteFunc = FunctionUtils
-				.match(ops.env(), "transform.permuteCoordinatesInverseView",
+		Functions.Arity3<RandomAccessibleInterval<DoubleType>, int[], Integer, IntervalView<DoubleType>> permuteFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.permuteCoordinatesInverseView",
 						new Nil<RandomAccessibleInterval<DoubleType>>() {
 				}, new Nil<int[]>() {
 				}, new Nil<Integer>() {
@@ -211,8 +210,8 @@ public void permuteCoordinatesInverseOfDimensionTest() {
 	@Test
 	public void testIntervalPermute() {
 
-		Functions.Arity3<RandomAccessibleInterval<DoubleType>, Integer, Integer, IntervalView<DoubleType>> permuteFunc = FunctionUtils
-				.match(ops.env(), "transform.permuteView",
+		Functions.Arity3<RandomAccessibleInterval<DoubleType>, Integer, Integer, IntervalView<DoubleType>> permuteFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.permuteView",
 						new Nil<RandomAccessibleInterval<DoubleType>>() {
 				}, new Nil<Integer>() {
 				}, new Nil<Integer>() {
@@ -240,8 +239,8 @@ public void testIntervalPermute() {
 	@Test
 	public void testIntervalPermuteCoordinates() {
 
-		BiFunction<RandomAccessibleInterval<DoubleType>, int[], IntervalView<DoubleType>> permuteFunc = FunctionUtils
-				.match(ops.env(), "transform.permuteCoordinatesView", new Nil<RandomAccessibleInterval<DoubleType>>() {
+		BiFunction<RandomAccessibleInterval<DoubleType>, int[], IntervalView<DoubleType>> permuteFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.permuteCoordinatesView", new Nil<RandomAccessibleInterval<DoubleType>>() {
 				}, new Nil<int[]>() {
 				}, new Nil<IntervalView<DoubleType>>() {
 				});
@@ -270,8 +269,8 @@ public void testIntervalPermuteCoordinates() {
 	@Test
 	public void testIntervalPermuteDimensionCoordinates() {
 
-		Functions.Arity3<RandomAccessibleInterval<DoubleType>, int[], Integer, IntervalView<DoubleType>> permuteFunc = FunctionUtils
-				.match(ops.env(), "transform.permuteCoordinatesInverseView",
+		Functions.Arity3<RandomAccessibleInterval<DoubleType>, int[], Integer, IntervalView<DoubleType>> permuteFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.permuteCoordinatesInverseView",
 						new Nil<RandomAccessibleInterval<DoubleType>>() {
 				}, new Nil<int[]>() {
 				}, new Nil<Integer>() {
@@ -303,8 +302,8 @@ public void testIntervalPermuteDimensionCoordinates() {
 	@Test
 	public void testIntervalPermuteInverseCoordinates() {
 
-		BiFunction<RandomAccessibleInterval<DoubleType>, int[], IntervalView<DoubleType>> permuteFunc = FunctionUtils
-				.match(ops.env(), "transform.permuteCoordinatesInverseView",
+		BiFunction<RandomAccessibleInterval<DoubleType>, int[], IntervalView<DoubleType>> permuteFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.permuteCoordinatesInverseView",
 						new Nil<RandomAccessibleInterval<DoubleType>>() {
 				}, new Nil<int[]>() {
 				}, new Nil<IntervalView<DoubleType>>() {
@@ -335,8 +334,8 @@ public void testIntervalPermuteInverseCoordinates() {
 	@Test
 	public void testIntervalPermuteInverseDimensionCoordinates() {
 
-		Functions.Arity3<RandomAccessibleInterval<DoubleType>, int[], Integer, IntervalView<DoubleType>> permuteFunc = FunctionUtils
-				.match(ops.env(), "transform.permuteCoordinatesInverseView",
+		Functions.Arity3<RandomAccessibleInterval<DoubleType>, int[], Integer, IntervalView<DoubleType>> permuteFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.permuteCoordinatesInverseView",
 						new Nil<RandomAccessibleInterval<DoubleType>>() {
 				}, new Nil<int[]>() {
 				}, new Nil<Integer>() {
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rasterView/RasterViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rasterView/RasterViewTest.java
index 0dc18a725..3e75ae8e0 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rasterView/RasterViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rasterView/RasterViewTest.java
@@ -32,6 +32,7 @@
 
 import java.util.function.Function;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.Cursor;
 import net.imglib2.RandomAccess;
 import net.imglib2.RealRandomAccessible;
@@ -43,10 +44,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
-import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
 import org.scijava.util.MersenneTwisterFast;
 
 /**
@@ -66,8 +65,8 @@ public class RasterViewTest extends AbstractOpTest {
 	@Test
 	public void defaultRasterTest() {
 
-		Function<RealRandomAccessible<DoubleType>, RandomAccessibleOnRealRandomAccessible<DoubleType>> rasterFunc = FunctionUtils
-				.match(ops.env(), "transform.rasterView", new Nil<RealRandomAccessible<DoubleType>>() {
+		Function<RealRandomAccessible<DoubleType>, RandomAccessibleOnRealRandomAccessible<DoubleType>> rasterFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.rasterView", new Nil<RealRandomAccessible<DoubleType>>() {
 				}, new Nil<RandomAccessibleOnRealRandomAccessible<DoubleType>>() {
 				});
 		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rotateView/RotateViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rotateView/RotateViewTest.java
index 607e64a82..38dec3153 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rotateView/RotateViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rotateView/RotateViewTest.java
@@ -30,6 +30,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.RandomAccessible;
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.img.Img;
@@ -41,10 +42,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
-
 import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
@@ -67,8 +66,8 @@ public static <T> RandomAccessible<T> deinterval(RandomAccessibleInterval<T> inp
 	@Test
 	public void testDefaultRotate() {
 
-		Functions.Arity3<RandomAccessible<DoubleType>, Integer, Integer, MixedTransformView<DoubleType>> rotateFunc = FunctionUtils
-				.match(ops.env(), "transform.rotateView", new Nil<RandomAccessible<DoubleType>>() {
+		Functions.Arity3<RandomAccessible<DoubleType>, Integer, Integer, MixedTransformView<DoubleType>> rotateFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.rotateView", new Nil<RandomAccessible<DoubleType>>() {
 				}, new Nil<Integer>() {
 				}, new Nil<Integer>() {
 				}, new Nil<MixedTransformView<DoubleType>>() {
@@ -90,8 +89,8 @@ public void testDefaultRotate() {
 	@Test
 	public void testIntervalRotate() {
 
-		Functions.Arity3<RandomAccessibleInterval<DoubleType>, Integer, Integer, IntervalView<DoubleType>> rotateFunc = FunctionUtils
-				.match(ops.env(), "transform.rotateView", new Nil<RandomAccessibleInterval<DoubleType>>() {
+		Functions.Arity3<RandomAccessibleInterval<DoubleType>, Integer, Integer, IntervalView<DoubleType>> rotateFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.rotateView", new Nil<RandomAccessibleInterval<DoubleType>>() {
 				}, new Nil<Integer>() {
 				}, new Nil<Integer>() {
 				}, new Nil<IntervalView<DoubleType>>() {
@@ -117,8 +116,8 @@ public void testIntervalRotate() {
 	@Test
 	public void testIntervalRotateInterval() {
 
-		Functions.Arity3<RandomAccessibleInterval<DoubleType>, Integer, Integer, IntervalView<DoubleType>> rotateFunc = FunctionUtils
-				.match(ops.env(), "transform.rotateView", new Nil<RandomAccessibleInterval<DoubleType>>() {
+		Functions.Arity3<RandomAccessibleInterval<DoubleType>, Integer, Integer, IntervalView<DoubleType>> rotateFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.rotateView", new Nil<RandomAccessibleInterval<DoubleType>>() {
 				}, new Nil<Integer>() {
 				}, new Nil<Integer>() {
 				}, new Nil<IntervalView<DoubleType>>() {
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/shearView/ShearViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/shearView/ShearViewTest.java
index 7bcb42312..162be50b2 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/shearView/ShearViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/shearView/ShearViewTest.java
@@ -30,6 +30,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.Cursor;
 import net.imglib2.FinalInterval;
 import net.imglib2.Interval;
@@ -43,10 +44,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
-
 import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
@@ -65,8 +64,8 @@ public class ShearViewTest extends AbstractOpTest {
 	@Test
 	public void defaultShearTest() {
 
-		Functions.Arity3<RandomAccessible<DoubleType>, Integer, Integer, TransformView<DoubleType>> shearFunc = FunctionUtils
-				.match(ops.env(), "transform.shearView", new Nil<RandomAccessible<DoubleType>>() {
+		Functions.Arity3<RandomAccessible<DoubleType>, Integer, Integer, TransformView<DoubleType>> shearFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.shearView", new Nil<RandomAccessible<DoubleType>>() {
 				}, new Nil<Integer>() {
 				}, new Nil<Integer>() {
 				}, new Nil<TransformView<DoubleType>>() {
@@ -96,8 +95,8 @@ public void defaultShearTest() {
 	@Test
 	public void ShearIntervalTest() {
 
-		Functions.Arity4<RandomAccessible<DoubleType>, Interval, Integer, Integer, IntervalView<DoubleType>> shearFunc = FunctionUtils
-				.match(ops.env(), "transform.shearView", new Nil<RandomAccessible<DoubleType>>() {
+		Functions.Arity4<RandomAccessible<DoubleType>, Interval, Integer, Integer, IntervalView<DoubleType>> shearFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.shearView", new Nil<RandomAccessible<DoubleType>>() {
 				}, new Nil<Interval>() {
 				}, new Nil<Integer>() {
 				}, new Nil<Integer>() {
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/stackView/StackViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/stackView/StackViewTest.java
index f46e3e977..40e9c3c99 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/stackView/StackViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/stackView/StackViewTest.java
@@ -35,6 +35,7 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.img.Img;
 import net.imglib2.img.array.ArrayImgFactory;
@@ -43,10 +44,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
-import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
 
 /**
  * Tests {@link net.imagej.ops2.Ops.Transform.StackView} ops.
@@ -63,7 +62,7 @@ public class StackViewTest extends AbstractOpTest {
 	@Test
 	public void defaultStackTest() {
 		Function<List<Img<DoubleType>>, RandomAccessibleInterval<DoubleType>> stackFunc =
-			FunctionUtils.match(ops.env(), "transform.stackView",
+			OpBuilder.matchFunction(ops.env(), "transform.stackView",
 				new Nil<List<Img<DoubleType>>>()
 				{}, new Nil<RandomAccessibleInterval<DoubleType>>() {});
 
@@ -82,8 +81,8 @@ public void defaultStackTest() {
 	@Test
 	public void stackWithAccessModeTest() {
 
-		BiFunction<StackAccessMode, List<Img<DoubleType>>, RandomAccessibleInterval<DoubleType>> stackFunc = FunctionUtils
-				.match(ops.env(), "transform.stackView", new Nil<StackAccessMode>() {
+		BiFunction<StackAccessMode, List<Img<DoubleType>>, RandomAccessibleInterval<DoubleType>> stackFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.stackView", new Nil<StackAccessMode>() {
 				}, new Nil<List<Img<DoubleType>>>() {
 				}, new Nil<RandomAccessibleInterval<DoubleType>>() {
 				});
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/subsampleView/SubsampleViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/subsampleView/SubsampleViewTest.java
index 590acd324..384c84c96 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/subsampleView/SubsampleViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/subsampleView/SubsampleViewTest.java
@@ -33,6 +33,7 @@
 
 import java.util.function.BiFunction;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.Cursor;
 import net.imglib2.RandomAccess;
 import net.imglib2.RandomAccessible;
@@ -47,10 +48,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
-import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
 import org.scijava.util.MersenneTwisterFast;
 
 /**
@@ -70,7 +69,7 @@ public class SubsampleViewTest extends AbstractOpTest {
 	@Test
 	public void defaultSubsampleTest() {
 
-		BiFunction<Img<DoubleType>, Long, SubsampleView<DoubleType>> subsampleFunc = FunctionUtils.match(ops.env(),
+		BiFunction<Img<DoubleType>, Long, SubsampleView<DoubleType>> subsampleFunc = OpBuilder.matchFunction(ops.env(),
 				"transform.subsampleView", new Nil<Img<DoubleType>>() {
 		}, new Nil<Long>() {
 		}, new Nil<SubsampleView<DoubleType>>() {
@@ -98,7 +97,7 @@ public void defaultSubsampleTest() {
 	@Test
 	public void defaultSubsampleStepsTest() {
 
-		BiFunction<Img<DoubleType>, long[], SubsampleView<DoubleType>> subsampleFunc = FunctionUtils.match(ops.env(),
+		BiFunction<Img<DoubleType>, long[], SubsampleView<DoubleType>> subsampleFunc = OpBuilder.matchFunction(ops.env(),
 				"transform.subsampleView", new Nil<Img<DoubleType>>() {
 		}, new Nil<long[]>() {
 		}, new Nil<SubsampleView<DoubleType>>() {
@@ -126,7 +125,7 @@ public void defaultSubsampleStepsTest() {
 	@Test
 	public void testIntervalSubsample() {
 
-		BiFunction<Img<DoubleType>, Long, SubsampleIntervalView<DoubleType>> subsampleFunc = FunctionUtils.match(ops.env(),
+		BiFunction<Img<DoubleType>, Long, SubsampleIntervalView<DoubleType>> subsampleFunc = OpBuilder.matchFunction(ops.env(),
 				"transform.subsampleView", new Nil<Img<DoubleType>>() {
 		}, new Nil<Long>() {
 		}, new Nil<SubsampleIntervalView<DoubleType>>() {
@@ -156,7 +155,7 @@ public void testIntervalSubsample() {
 	@Test
 	public void testIntervalSubsampleSteps() {
 
-		BiFunction<Img<DoubleType>, long[], SubsampleIntervalView<DoubleType>> subsampleFunc = FunctionUtils.match(ops.env(),
+		BiFunction<Img<DoubleType>, long[], SubsampleIntervalView<DoubleType>> subsampleFunc = OpBuilder.matchFunction(ops.env(),
 				"transform.subsampleView", new Nil<Img<DoubleType>>() {
 				}, new Nil<long[]>() {
 				}, new Nil<SubsampleIntervalView<DoubleType>>() {
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/translateView/TranslateViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/translateView/TranslateViewTest.java
index 405cfa457..db1b873a5 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/translateView/TranslateViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/translateView/TranslateViewTest.java
@@ -33,6 +33,7 @@
 
 import java.util.function.BiFunction;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.RandomAccessible;
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.img.Img;
@@ -45,10 +46,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
-import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
 
 /**
  * Tests {@link net.imagej.ops2.Ops.Transform.TranslateView} ops.
@@ -71,7 +70,7 @@ public static <T> RandomAccessible<T> deinterval(RandomAccessibleInterval<T> inp
 	@Test
 	public void defaultTranslateTest() {
 
-		BiFunction<Img<DoubleType>, long[], MixedTransformView<DoubleType>> translateFunc = FunctionUtils.match(ops.env(),
+		BiFunction<Img<DoubleType>, long[], MixedTransformView<DoubleType>> translateFunc = OpBuilder.matchFunction(ops.env(),
 				"transform.translateView", new Nil<Img<DoubleType>>() {
 		}, new Nil<long[]>() {
 		}, new Nil<MixedTransformView<DoubleType>>() {
@@ -93,7 +92,7 @@ public void defaultTranslateTest() {
 	@Test
 	public void testIntervalTranslate() {
 
-		BiFunction<Img<DoubleType>, long[], IntervalView<DoubleType>> translateFunc = FunctionUtils.match(ops.env(),
+		BiFunction<Img<DoubleType>, long[], IntervalView<DoubleType>> translateFunc = OpBuilder.matchFunction(ops.env(),
 				"transform.translateView", new Nil<Img<DoubleType>>() {
 				}, new Nil<long[]>() {
 				}, new Nil<IntervalView<DoubleType>>() {
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/unshearView/UnshearViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/unshearView/UnshearViewTest.java
index d3f57aecf..9725fb8cb 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/unshearView/UnshearViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/unshearView/UnshearViewTest.java
@@ -30,6 +30,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.Cursor;
 import net.imglib2.FinalInterval;
 import net.imglib2.Interval;
@@ -43,10 +44,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
-
 import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
@@ -63,8 +62,8 @@ public class UnshearViewTest extends AbstractOpTest {
 	@Test
 	public void defaultUnshearTest() {
 
-		Functions.Arity3<RandomAccessible<DoubleType>, Integer, Integer, TransformView<DoubleType>> unshearFunc = FunctionUtils
-				.match(ops.env(), "transform.unshearView", new Nil<RandomAccessible<DoubleType>>() {
+		Functions.Arity3<RandomAccessible<DoubleType>, Integer, Integer, TransformView<DoubleType>> unshearFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.unshearView", new Nil<RandomAccessible<DoubleType>>() {
 				}, new Nil<Integer>() {
 				}, new Nil<Integer>() {
 				}, new Nil<TransformView<DoubleType>>() {
@@ -93,8 +92,8 @@ public void defaultUnshearTest() {
 	@Test
 	public void UnshearIntervalTest() {
 
-		Functions.Arity4<RandomAccessible<DoubleType>, Interval, Integer, Integer, IntervalView<DoubleType>> unshearFunc = FunctionUtils
-				.match(ops.env(), "transform.unshearView", new Nil<RandomAccessible<DoubleType>>() {
+		Functions.Arity4<RandomAccessible<DoubleType>, Interval, Integer, Integer, IntervalView<DoubleType>> unshearFunc = OpBuilder
+				.matchFunction(ops.env(), "transform.unshearView", new Nil<RandomAccessible<DoubleType>>() {
 				}, new Nil<Interval>() {
 				}, new Nil<Integer>() {
 				}, new Nil<Integer>() {
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/zeroMinView/ZeroMinViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/zeroMinView/ZeroMinViewTest.java
index ad8ca3e40..112372925 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/zeroMinView/ZeroMinViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/zeroMinView/ZeroMinViewTest.java
@@ -32,6 +32,7 @@
 
 import java.util.function.Function;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.RandomAccessible;
 import net.imglib2.img.Img;
 import net.imglib2.img.array.ArrayImgFactory;
@@ -40,10 +41,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
-import org.scijava.function.Functions;
-import org.scijava.ops.util.FunctionUtils;
 
 /**
  * Tests {@link net.imagej.ops2.Ops.Transform.ZeroMinView} ops.
@@ -61,7 +60,7 @@ public class ZeroMinViewTest extends AbstractOpTest {
 	public void defaultZeroMinTest() {
 
 		Function<IntervalView<DoubleType>, IntervalView<DoubleType>> zeroMinFunc =
-			FunctionUtils.match(ops.env(), "transform.zeroMinView",
+			OpBuilder.matchFunction(ops.env(), "transform.zeroMinView",
 				new Nil<IntervalView<DoubleType>>()
 				{}, new Nil<IntervalView<DoubleType>>() {});
 		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/ComputerUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/ComputerUtils.java
deleted file mode 100644
index 1fb5af9be..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/ComputerUtils.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * This is autogenerated source code -- DO NOT EDIT. Instead, edit the
- * corresponding template in templates/ and rerun bin/generate.groovy.
- */
-
-package org.scijava.ops.util;
-
-import java.lang.reflect.Type;
-import java.util.function.Consumer;
-
-import org.scijava.function.Computers;
-import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.Hints;
-import org.scijava.types.Nil;
-import org.scijava.types.Types;
-
-/**
- * Container class for computer-style functional interfaces at various
- * <a href="https://en.wikipedia.org/wiki/Arity">arities</a>.
- * <p>
- * A computer has functional method {@code compute} with a number of arguments
- * corresponding to the arity, plus an additional argument for the preallocated
- * output to be populated by the computation.
- * </p>
- * <p>
- * Each computer interface implements a corresponding {@link Consumer}-style
- * interface (see {@link Consumers}) with arity+1; the consumer's {@code accept}
- * method simply delegates to {@code compute}. This pattern allows computer ops
- * to be used directly as consumers as needed.
- * </p>
- *
- * @author Curtis Rueden
- * @author Gabriel Selzer
- */
-public final class ComputerUtils {
-
-	private ComputerUtils() {
-		// NB: Prevent instantiation of utility class.
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <O> Computers.Arity0<O> match(final OpEnvironment env, final String opName, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Computers.Arity0.class, outType);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I, O> Computers.Arity1<I, O> match(final OpEnvironment env, final String opName, final Nil<I> inType, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Computers.Arity1.class, outType, inType);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, O> Computers.Arity2<I1, I2, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Computers.Arity2.class, outType, in1Type, in2Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, I3, O> Computers.Arity3<I1, I2, I3, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Computers.Arity3.class, outType, in1Type, in2Type, in3Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, I3, I4, O> Computers.Arity4<I1, I2, I3, I4, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Computers.Arity4.class, outType, in1Type, in2Type, in3Type, in4Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, I3, I4, I5, O> Computers.Arity5<I1, I2, I3, I4, I5, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Computers.Arity5.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, I3, I4, I5, I6, O> Computers.Arity6<I1, I2, I3, I4, I5, I6, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Computers.Arity6.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, I3, I4, I5, I6, I7, O> Computers.Arity7<I1, I2, I3, I4, I5, I6, I7, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Computers.Arity7.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, O> Computers.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Computers.Arity8.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, O> Computers.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Computers.Arity9.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> Computers.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Computers.Arity10.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> Computers.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Computers.Arity11.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> Computers.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Computers.Arity12.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> Computers.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Computers.Arity13.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> Computers.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Computers.Arity14.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> Computers.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Computers.Arity15.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> Computers.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Computers.Arity16.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <O> Computers.Arity0<O> match(final OpEnvironment env, final String opName, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Computers.Arity0.class, outType);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I, O> Computers.Arity1<I, O> match(final OpEnvironment env, final String opName, final Nil<I> inType, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Computers.Arity1.class, outType, inType);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, O> Computers.Arity2<I1, I2, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Computers.Arity2.class, outType, in1Type, in2Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, I3, O> Computers.Arity3<I1, I2, I3, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Computers.Arity3.class, outType, in1Type, in2Type, in3Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, I3, I4, O> Computers.Arity4<I1, I2, I3, I4, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Computers.Arity4.class, outType, in1Type, in2Type, in3Type, in4Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, I3, I4, I5, O> Computers.Arity5<I1, I2, I3, I4, I5, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Computers.Arity5.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, I3, I4, I5, I6, O> Computers.Arity6<I1, I2, I3, I4, I5, I6, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Computers.Arity6.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, I3, I4, I5, I6, I7, O> Computers.Arity7<I1, I2, I3, I4, I5, I6, I7, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Computers.Arity7.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, O> Computers.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Computers.Arity8.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, O> Computers.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Computers.Arity9.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> Computers.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Computers.Arity10.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> Computers.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Computers.Arity11.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> Computers.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Computers.Arity12.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> Computers.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Computers.Arity13.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> Computers.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Computers.Arity14.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> Computers.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Computers.Arity15.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> Computers.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Computers.Arity16.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	private static <T> T matchHelper(final OpEnvironment env, final String opName, final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
-	{
-		final Type[] types = new Type[inTypes.length + 1];
-		for (int i = 0; i < inTypes.length; i++)
-			types[i] = inTypes[i].getType();
-		types[types.length - 1] = outType.getType();
-		final Type specialType = Types.parameterize(opClass, types);
-		final Nil<?>[] nils = new Nil[inTypes.length + 1];
-		System.arraycopy(inTypes, 0, nils, 0, inTypes.length);
-		nils[nils.length - 1] = outType;
-		return (T) env.op(opName, Nil.of(specialType), nils, outType);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	private static <T> T matchHelper(final OpEnvironment env, final String opName, final Hints hints, final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
-	{
-		final Type[] types = new Type[inTypes.length + 1];
-		for (int i = 0; i < inTypes.length; i++)
-			types[i] = inTypes[i].getType();
-		types[types.length - 1] = outType.getType();
-		final Type specialType = Types.parameterize(opClass, types);
-		final Nil<?>[] nils = new Nil[inTypes.length + 1];
-		System.arraycopy(inTypes, 0, nils, 0, inTypes.length);
-		nils[nils.length - 1] = outType;
-		return (T) env.op(opName, Nil.of(specialType), nils, outType, hints);
-	}
-}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/FunctionUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/FunctionUtils.java
index f2c02f715..bd05a2d33 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/FunctionUtils.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/FunctionUtils.java
@@ -29,210 +29,6 @@ private FunctionUtils() {
 		// NB: Prevent instantiation of utility class.
 	}
 
-	@SuppressWarnings({ "unchecked" })
-	public static <O> Producer<O> match(final OpEnvironment env, final String opName, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Producer.class, outType);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I, O> Function<I, O> match(final OpEnvironment env, final String opName, final Nil<I> inType, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Function.class, outType, inType);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, O> BiFunction<I1, I2, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, BiFunction.class, outType, in1Type, in2Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, O> Functions.Arity3<I1, I2, I3, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Functions.Arity3.class, outType, in1Type, in2Type, in3Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, O> Functions.Arity4<I1, I2, I3, I4, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Functions.Arity4.class, outType, in1Type, in2Type, in3Type, in4Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, O> Functions.Arity5<I1, I2, I3, I4, I5, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Functions.Arity5.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, O> Functions.Arity6<I1, I2, I3, I4, I5, I6, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Functions.Arity6.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, O> Functions.Arity7<I1, I2, I3, I4, I5, I6, I7, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Functions.Arity7.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, O> Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Functions.Arity8.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, O> Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Functions.Arity9.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Functions.Arity10.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Functions.Arity11.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Functions.Arity12.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Functions.Arity13.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Functions.Arity14.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Functions.Arity15.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Nil<O> outType)
-	{
-		return matchHelper(env, opName, Functions.Arity16.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <O> Producer<O> match(final OpEnvironment env, final String opName, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Producer.class, outType);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I, O> Function<I, O> match(final OpEnvironment env, final String opName, final Nil<I> inType, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Function.class, outType, inType);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, O> BiFunction<I1, I2, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, BiFunction.class, outType, in1Type, in2Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, O> Functions.Arity3<I1, I2, I3, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Functions.Arity3.class, outType, in1Type, in2Type, in3Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, O> Functions.Arity4<I1, I2, I3, I4, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Functions.Arity4.class, outType, in1Type, in2Type, in3Type, in4Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, O> Functions.Arity5<I1, I2, I3, I4, I5, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Functions.Arity5.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, O> Functions.Arity6<I1, I2, I3, I4, I5, I6, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Functions.Arity6.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, O> Functions.Arity7<I1, I2, I3, I4, I5, I6, I7, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Functions.Arity7.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, O> Functions.Arity8<I1, I2, I3, I4, I5, I6, I7, I8, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Functions.Arity8.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, O> Functions.Arity9<I1, I2, I3, I4, I5, I6, I7, I8, I9, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Functions.Arity9.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> Functions.Arity10<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Functions.Arity10.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> Functions.Arity11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Functions.Arity11.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> Functions.Arity12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Functions.Arity12.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> Functions.Arity13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Functions.Arity13.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> Functions.Arity14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Functions.Arity14.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> Functions.Arity15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Functions.Arity15.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> Functions.Arity16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16, O> match(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Nil<O> outType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Functions.Arity16.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type);
-	}
-
 	@SuppressWarnings({ "unchecked" })
 	public static <O, T> Functions.ArityN<O> matchN(final OpEnvironment env,
 		final String opName, final Nil<O> outType, final Nil<?>... inTypes)
@@ -304,17 +100,4 @@ private static <T> T matchHelper(final OpEnvironment env, final String opName,
 		final Type specialType = Types.parameterize(opClass, types);
 		return (T) env.op(opName, Nil.of(specialType), inTypes, outType);
 	}
-
-	@SuppressWarnings({ "unchecked" })
-	private static <T> T matchHelper(final OpEnvironment env, final String opName, final Hints hints,
-		final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
-	{
-		final Type[] types = new Type[inTypes.length + 1];
-		for (int i = 0; i < inTypes.length; i++)
-			types[i] = inTypes[i].getType();
-		types[types.length - 1] = outType.getType();
-		final Type specialType = Types.parameterize(opClass, types);
-		return (T) env.op(opName, Nil.of(specialType), inTypes, outType, hints);
-	}
-
 }
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java
deleted file mode 100644
index 50132e47b..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java
+++ /dev/null
@@ -1,1731 +0,0 @@
-/*
- * This is autogenerated source code -- DO NOT EDIT. Instead, edit the
- * corresponding template in templates/ and rerun bin/generate.groovy.
- */
-
-package org.scijava.ops.util;
-
-import java.lang.reflect.Type;
-import java.util.function.Consumer;
-
-import org.scijava.function.Computers;
-import org.scijava.function.Consumers;
-import org.scijava.function.Inplaces;
-import org.scijava.function.Mutable;
-import org.scijava.function.Producer;
-import org.scijava.ops.Hints;
-import org.scijava.ops.OpEnvironment;
-import org.scijava.types.Nil;
-import org.scijava.types.Types;
-
-/**
- * Container class for inplace-style functional interfaces at various
- * <a href="https://en.wikipedia.org/wiki/Arity">arities</a>.
- * <p>
- * An inplace has functional method {@code mutate} with a number of arguments
- * corresponding to the arity. Any of the arguments annotated
- * with @{@link Mutable} may be mutated during execution. Some interfaces narrow
- * this behavior to only a specific argument; most ops in practice will
- * implement one of these narrowed interfaces. For example,
- * {@link Inplaces.Arity2_1} is a binary inplace op that mutates the first of
- * two arguments&mdash;e.g., an {@code a /= b} division operation would be an
- * {@link Inplaces.Arity2_1}, whereas {@code b = a / b} would be an
- * {@link Inplaces.Arity2_2}.
- * </p>
- * <p>
- * Each inplace interface implements a corresponding {@link Consumer}-style
- * interface (see {@link Consumers}) with same arity; the consumer's
- * {@code accept} method simply delegates to {@code mutate}. This pattern allows
- * inplace ops to be used directly as consumers as needed.
- * </p>
- * <p>
- * Note that there is no nullary (arity 0) inplace interface, because there
- * would be no arguments to mutate; see also {@link Consumers.Arity0},
- * {@link Computers.Arity0} and {@link Producer}.
- * </p>
- *
- * @author Curtis Rueden
- * @author Gabriel Selzer
- */
-public final class InplaceUtils {
-
-	private InplaceUtils() {
-		// NB: Prevent instantiation of container class.
-	}
-
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO> Inplaces.Arity1<IO> matchInplace(final OpEnvironment env, final String opName, final Nil<IO> ioType)
-	{
-		return matchHelper(env, opName, Inplaces.Arity1.class, ioType, new Nil[] {ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2> Inplaces.Arity2_1<IO, I2> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity2_1.class, ioType, new Nil[] {ioType, in2Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO> Inplaces.Arity2_2<I1, IO> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType)
-	{
-		return matchHelper(env, opName, Inplaces.Arity2_2.class, ioType, new Nil[] {in1Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3> Inplaces.Arity3_1<IO, I2, I3> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity3_1.class, ioType, new Nil[] {ioType, in2Type, in3Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3> Inplaces.Arity3_2<I1, IO, I3> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity3_2.class, ioType, new Nil[] {in1Type, ioType, in3Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO> Inplaces.Arity3_3<I1, I2, IO> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType)
-	{
-		return matchHelper(env, opName, Inplaces.Arity3_3.class, ioType, new Nil[] {in1Type, in2Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4> Inplaces.Arity4_1<IO, I2, I3, I4> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity4_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4> Inplaces.Arity4_2<I1, IO, I3, I4> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity4_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4> Inplaces.Arity4_3<I1, I2, IO, I4> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity4_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO> Inplaces.Arity4_4<I1, I2, I3, IO> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType)
-	{
-		return matchHelper(env, opName, Inplaces.Arity4_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5> Inplaces.Arity5_1<IO, I2, I3, I4, I5> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity5_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5> Inplaces.Arity5_2<I1, IO, I3, I4, I5> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity5_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5> Inplaces.Arity5_3<I1, I2, IO, I4, I5> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity5_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5> Inplaces.Arity5_4<I1, I2, I3, IO, I5> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity5_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO> Inplaces.Arity5_5<I1, I2, I3, I4, IO> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType)
-	{
-		return matchHelper(env, opName, Inplaces.Arity5_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6> Inplaces.Arity6_1<IO, I2, I3, I4, I5, I6> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity6_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6> Inplaces.Arity6_2<I1, IO, I3, I4, I5, I6> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity6_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6> Inplaces.Arity6_3<I1, I2, IO, I4, I5, I6> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity6_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6> Inplaces.Arity6_4<I1, I2, I3, IO, I5, I6> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity6_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6> Inplaces.Arity6_5<I1, I2, I3, I4, IO, I6> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity6_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO> Inplaces.Arity6_6<I1, I2, I3, I4, I5, IO> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType)
-	{
-		return matchHelper(env, opName, Inplaces.Arity6_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7> Inplaces.Arity7_1<IO, I2, I3, I4, I5, I6, I7> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity7_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7> Inplaces.Arity7_2<I1, IO, I3, I4, I5, I6, I7> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity7_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7> Inplaces.Arity7_3<I1, I2, IO, I4, I5, I6, I7> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity7_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7> Inplaces.Arity7_4<I1, I2, I3, IO, I5, I6, I7> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity7_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7> Inplaces.Arity7_5<I1, I2, I3, I4, IO, I6, I7> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity7_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7> Inplaces.Arity7_6<I1, I2, I3, I4, I5, IO, I7> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity7_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO> Inplaces.Arity7_7<I1, I2, I3, I4, I5, I6, IO> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType)
-	{
-		return matchHelper(env, opName, Inplaces.Arity7_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8> Inplaces.Arity8_1<IO, I2, I3, I4, I5, I6, I7, I8> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity8_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8> Inplaces.Arity8_2<I1, IO, I3, I4, I5, I6, I7, I8> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity8_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8> Inplaces.Arity8_3<I1, I2, IO, I4, I5, I6, I7, I8> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity8_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8> Inplaces.Arity8_4<I1, I2, I3, IO, I5, I6, I7, I8> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity8_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8> Inplaces.Arity8_5<I1, I2, I3, I4, IO, I6, I7, I8> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity8_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8> Inplaces.Arity8_6<I1, I2, I3, I4, I5, IO, I7, I8> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity8_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8> Inplaces.Arity8_7<I1, I2, I3, I4, I5, I6, IO, I8> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity8_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO> Inplaces.Arity8_8<I1, I2, I3, I4, I5, I6, I7, IO> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType)
-	{
-		return matchHelper(env, opName, Inplaces.Arity8_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9> Inplaces.Arity9_1<IO, I2, I3, I4, I5, I6, I7, I8, I9> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity9_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9> Inplaces.Arity9_2<I1, IO, I3, I4, I5, I6, I7, I8, I9> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity9_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9> Inplaces.Arity9_3<I1, I2, IO, I4, I5, I6, I7, I8, I9> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity9_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9> Inplaces.Arity9_4<I1, I2, I3, IO, I5, I6, I7, I8, I9> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity9_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9> Inplaces.Arity9_5<I1, I2, I3, I4, IO, I6, I7, I8, I9> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity9_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9> Inplaces.Arity9_6<I1, I2, I3, I4, I5, IO, I7, I8, I9> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity9_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9> Inplaces.Arity9_7<I1, I2, I3, I4, I5, I6, IO, I8, I9> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity9_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9> Inplaces.Arity9_8<I1, I2, I3, I4, I5, I6, I7, IO, I9> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity9_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO> Inplaces.Arity9_9<I1, I2, I3, I4, I5, I6, I7, I8, IO> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType)
-	{
-		return matchHelper(env, opName, Inplaces.Arity9_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity10_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity10_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity10_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity10_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10> Inplaces.Arity10_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity10_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10> Inplaces.Arity10_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity10_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10> Inplaces.Arity10_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity10_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10> Inplaces.Arity10_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity10_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10> Inplaces.Arity10_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity10_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO> Inplaces.Arity10_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType)
-	{
-		return matchHelper(env, opName, Inplaces.Arity10_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity11_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity11_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity11_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity11_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity11_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11> Inplaces.Arity11_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity11_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11> Inplaces.Arity11_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity11_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11> Inplaces.Arity11_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity11_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11> Inplaces.Arity11_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity11_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11> Inplaces.Arity11_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity11_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO> Inplaces.Arity11_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType)
-	{
-		return matchHelper(env, opName, Inplaces.Arity11_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity12_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity12_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity12_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity12_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity12_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity12_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12> Inplaces.Arity12_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity12_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12> Inplaces.Arity12_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity12_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12> Inplaces.Arity12_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity12_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12> Inplaces.Arity12_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity12_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12> Inplaces.Arity12_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity12_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO> Inplaces.Arity12_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType)
-	{
-		return matchHelper(env, opName, Inplaces.Arity12_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity13_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity13_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity13_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity13_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity13_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity13_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity13_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13> Inplaces.Arity13_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity13_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13> Inplaces.Arity13_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity13_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13> Inplaces.Arity13_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity13_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13> Inplaces.Arity13_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity13_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13> Inplaces.Arity13_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity13_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO> Inplaces.Arity13_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO> matchInplace13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType)
-	{
-		return matchHelper(env, opName, Inplaces.Arity13_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity14_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity14_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity14_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity14_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity14_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity14_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity14_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity14_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14> Inplaces.Arity14_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity14_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14> Inplaces.Arity14_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity14_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14> Inplaces.Arity14_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity14_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14> Inplaces.Arity14_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type, final Nil<I14> in14Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity14_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14> Inplaces.Arity14_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14> matchInplace13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType, final Nil<I14> in14Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity14_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO> Inplaces.Arity14_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO> matchInplace14(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<IO> ioType)
-	{
-		return matchHelper(env, opName, Inplaces.Arity14_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity15_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity15_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity15_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity15_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity15_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity15_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity15_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity15_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity15_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15> Inplaces.Arity15_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity15_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type, in15Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15> Inplaces.Arity15_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity15_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type, in15Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15> Inplaces.Arity15_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity15_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type, in15Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15> Inplaces.Arity15_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15> matchInplace13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType, final Nil<I14> in14Type, final Nil<I15> in15Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity15_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type, in15Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15> Inplaces.Arity15_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15> matchInplace14(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<IO> ioType, final Nil<I15> in15Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity15_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType, in15Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO> Inplaces.Arity15_15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO> matchInplace15(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<IO> ioType)
-	{
-		return matchHelper(env, opName, Inplaces.Arity15_15.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity16_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity16_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity16_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity16_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity16_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity16_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity16_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity16_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15, I16> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity16_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15, I16> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity16_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15, I16> Inplaces.Arity16_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15, I16> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity16_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type, in15Type, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15, I16> Inplaces.Arity16_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15, I16> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity16_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type, in15Type, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15, I16> Inplaces.Arity16_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15, I16> matchInplace13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity16_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type, in15Type, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15, I16> Inplaces.Arity16_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15, I16> matchInplace14(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<IO> ioType, final Nil<I15> in15Type, final Nil<I16> in16Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity16_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType, in15Type, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO, I16> Inplaces.Arity16_15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO, I16> matchInplace15(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<IO> ioType, final Nil<I16> in16Type)
-	{
-		return matchHelper(env, opName, Inplaces.Arity16_15.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, ioType, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO> Inplaces.Arity16_16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO> matchInplace16(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<IO> ioType)
-	{
-		return matchHelper(env, opName, Inplaces.Arity16_16.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, ioType});
-	}
-
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO> Inplaces.Arity1<IO> matchInplace(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity1.class, ioType, new Nil[] {ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2> Inplaces.Arity2_1<IO, I2> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity2_1.class, ioType, new Nil[] {ioType, in2Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO> Inplaces.Arity2_2<I1, IO> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity2_2.class, ioType, new Nil[] {in1Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3> Inplaces.Arity3_1<IO, I2, I3> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity3_1.class, ioType, new Nil[] {ioType, in2Type, in3Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3> Inplaces.Arity3_2<I1, IO, I3> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity3_2.class, ioType, new Nil[] {in1Type, ioType, in3Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO> Inplaces.Arity3_3<I1, I2, IO> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity3_3.class, ioType, new Nil[] {in1Type, in2Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4> Inplaces.Arity4_1<IO, I2, I3, I4> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity4_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4> Inplaces.Arity4_2<I1, IO, I3, I4> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity4_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4> Inplaces.Arity4_3<I1, I2, IO, I4> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity4_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO> Inplaces.Arity4_4<I1, I2, I3, IO> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity4_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5> Inplaces.Arity5_1<IO, I2, I3, I4, I5> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity5_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5> Inplaces.Arity5_2<I1, IO, I3, I4, I5> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity5_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5> Inplaces.Arity5_3<I1, I2, IO, I4, I5> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity5_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5> Inplaces.Arity5_4<I1, I2, I3, IO, I5> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity5_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO> Inplaces.Arity5_5<I1, I2, I3, I4, IO> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity5_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6> Inplaces.Arity6_1<IO, I2, I3, I4, I5, I6> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity6_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6> Inplaces.Arity6_2<I1, IO, I3, I4, I5, I6> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity6_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6> Inplaces.Arity6_3<I1, I2, IO, I4, I5, I6> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity6_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6> Inplaces.Arity6_4<I1, I2, I3, IO, I5, I6> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity6_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6> Inplaces.Arity6_5<I1, I2, I3, I4, IO, I6> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity6_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO> Inplaces.Arity6_6<I1, I2, I3, I4, I5, IO> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity6_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7> Inplaces.Arity7_1<IO, I2, I3, I4, I5, I6, I7> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity7_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7> Inplaces.Arity7_2<I1, IO, I3, I4, I5, I6, I7> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity7_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7> Inplaces.Arity7_3<I1, I2, IO, I4, I5, I6, I7> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity7_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7> Inplaces.Arity7_4<I1, I2, I3, IO, I5, I6, I7> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity7_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7> Inplaces.Arity7_5<I1, I2, I3, I4, IO, I6, I7> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity7_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7> Inplaces.Arity7_6<I1, I2, I3, I4, I5, IO, I7> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity7_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO> Inplaces.Arity7_7<I1, I2, I3, I4, I5, I6, IO> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity7_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8> Inplaces.Arity8_1<IO, I2, I3, I4, I5, I6, I7, I8> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity8_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8> Inplaces.Arity8_2<I1, IO, I3, I4, I5, I6, I7, I8> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity8_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8> Inplaces.Arity8_3<I1, I2, IO, I4, I5, I6, I7, I8> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity8_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8> Inplaces.Arity8_4<I1, I2, I3, IO, I5, I6, I7, I8> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity8_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8> Inplaces.Arity8_5<I1, I2, I3, I4, IO, I6, I7, I8> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity8_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8> Inplaces.Arity8_6<I1, I2, I3, I4, I5, IO, I7, I8> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity8_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8> Inplaces.Arity8_7<I1, I2, I3, I4, I5, I6, IO, I8> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity8_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO> Inplaces.Arity8_8<I1, I2, I3, I4, I5, I6, I7, IO> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity8_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9> Inplaces.Arity9_1<IO, I2, I3, I4, I5, I6, I7, I8, I9> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity9_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9> Inplaces.Arity9_2<I1, IO, I3, I4, I5, I6, I7, I8, I9> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity9_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9> Inplaces.Arity9_3<I1, I2, IO, I4, I5, I6, I7, I8, I9> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity9_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9> Inplaces.Arity9_4<I1, I2, I3, IO, I5, I6, I7, I8, I9> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity9_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9> Inplaces.Arity9_5<I1, I2, I3, I4, IO, I6, I7, I8, I9> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity9_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9> Inplaces.Arity9_6<I1, I2, I3, I4, I5, IO, I7, I8, I9> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity9_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9> Inplaces.Arity9_7<I1, I2, I3, I4, I5, I6, IO, I8, I9> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity9_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9> Inplaces.Arity9_8<I1, I2, I3, I4, I5, I6, I7, IO, I9> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity9_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO> Inplaces.Arity9_9<I1, I2, I3, I4, I5, I6, I7, I8, IO> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity9_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity10_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity10_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity10_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10> Inplaces.Arity10_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity10_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10> Inplaces.Arity10_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity10_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10> Inplaces.Arity10_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity10_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10> Inplaces.Arity10_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity10_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10> Inplaces.Arity10_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity10_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10> Inplaces.Arity10_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity10_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO> Inplaces.Arity10_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity10_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity11_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity11_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity11_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity11_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11> Inplaces.Arity11_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity11_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11> Inplaces.Arity11_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity11_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11> Inplaces.Arity11_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity11_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11> Inplaces.Arity11_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity11_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11> Inplaces.Arity11_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity11_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11> Inplaces.Arity11_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity11_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO> Inplaces.Arity11_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity11_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity12_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity12_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity12_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity12_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity12_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12> Inplaces.Arity12_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity12_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12> Inplaces.Arity12_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity12_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12> Inplaces.Arity12_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity12_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12> Inplaces.Arity12_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity12_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12> Inplaces.Arity12_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity12_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12> Inplaces.Arity12_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity12_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO> Inplaces.Arity12_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity12_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity13_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity13_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity13_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity13_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity13_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity13_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13> Inplaces.Arity13_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity13_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13> Inplaces.Arity13_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity13_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13> Inplaces.Arity13_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity13_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13> Inplaces.Arity13_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity13_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13> Inplaces.Arity13_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity13_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13> Inplaces.Arity13_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity13_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO> Inplaces.Arity13_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO> matchInplace13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity13_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity14_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity14_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity14_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity14_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity14_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity14_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity14_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14> Inplaces.Arity14_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity14_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14> Inplaces.Arity14_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity14_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14> Inplaces.Arity14_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity14_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14> Inplaces.Arity14_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity14_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14> Inplaces.Arity14_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type, final Nil<I14> in14Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity14_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14> Inplaces.Arity14_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14> matchInplace13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType, final Nil<I14> in14Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity14_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO> Inplaces.Arity14_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO> matchInplace14(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<IO> ioType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity14_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity15_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity15_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity15_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity15_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity15_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity15_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity15_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity15_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15> Inplaces.Arity15_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity15_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15> Inplaces.Arity15_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity15_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type, in15Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15> Inplaces.Arity15_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity15_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type, in15Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15> Inplaces.Arity15_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity15_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type, in15Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15> Inplaces.Arity15_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15> matchInplace13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType, final Nil<I14> in14Type, final Nil<I15> in15Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity15_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type, in15Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15> Inplaces.Arity15_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15> matchInplace14(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<IO> ioType, final Nil<I15> in15Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity15_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType, in15Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO> Inplaces.Arity15_15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO> matchInplace15(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<IO> ioType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity15_15.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_1<IO, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace1(final OpEnvironment env, final String opName, final Nil<IO> ioType, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity16_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_2<I1, IO, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace2(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<IO> ioType, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity16_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_3<I1, I2, IO, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace3(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<IO> ioType, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity16_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_4<I1, I2, I3, IO, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace4(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<IO> ioType, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity16_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_5<I1, I2, I3, I4, IO, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace5(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<IO> ioType, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity16_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_6<I1, I2, I3, I4, I5, IO, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace6(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<IO> ioType, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity16_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_7<I1, I2, I3, I4, I5, I6, IO, I8, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace7(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<IO> ioType, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity16_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_8<I1, I2, I3, I4, I5, I6, I7, IO, I9, I10, I11, I12, I13, I14, I15, I16> matchInplace8(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<IO> ioType, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity16_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_9<I1, I2, I3, I4, I5, I6, I7, I8, IO, I10, I11, I12, I13, I14, I15, I16> matchInplace9(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<IO> ioType, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity16_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15, I16> Inplaces.Arity16_10<I1, I2, I3, I4, I5, I6, I7, I8, I9, IO, I11, I12, I13, I14, I15, I16> matchInplace10(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<IO> ioType, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity16_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15, I16> Inplaces.Arity16_11<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, IO, I12, I13, I14, I15, I16> matchInplace11(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<IO> ioType, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity16_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type, in15Type, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15, I16> Inplaces.Arity16_12<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, IO, I13, I14, I15, I16> matchInplace12(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<IO> ioType, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity16_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type, in15Type, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15, I16> Inplaces.Arity16_13<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, IO, I14, I15, I16> matchInplace13(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<IO> ioType, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity16_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type, in15Type, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15, I16> Inplaces.Arity16_14<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, IO, I15, I16> matchInplace14(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<IO> ioType, final Nil<I15> in15Type, final Nil<I16> in16Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity16_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType, in15Type, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO, I16> Inplaces.Arity16_15<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, IO, I16> matchInplace15(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<IO> ioType, final Nil<I16> in16Type, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity16_15.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, ioType, in16Type});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO> Inplaces.Arity16_16<I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, IO> matchInplace16(final OpEnvironment env, final String opName, final Nil<I1> in1Type, final Nil<I2> in2Type, final Nil<I3> in3Type, final Nil<I4> in4Type, final Nil<I5> in5Type, final Nil<I6> in6Type, final Nil<I7> in7Type, final Nil<I8> in8Type, final Nil<I9> in9Type, final Nil<I10> in10Type, final Nil<I11> in11Type, final Nil<I12> in12Type, final Nil<I13> in13Type, final Nil<I14> in14Type, final Nil<I15> in15Type, final Nil<IO> ioType, final Hints hints)
-	{
-		return matchHelper(env, opName, hints, Inplaces.Arity16_16.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, ioType});
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	private static <T> T matchHelper(final OpEnvironment env, final String opName,
-		final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
-	{
-		final Type[] types = new Type[inTypes.length];
-		for (int i = 0; i < inTypes.length; i++)
-			types[i] = inTypes[i].getType();
-		final Type specialType = Types.parameterize(opClass, types);
-		return (T) env.op(opName, Nil.of(specialType), inTypes, outType);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	private static <T> T matchHelper(final OpEnvironment env, final String opName, final Hints hints,
-		final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
-	{
-		final Type[] types = new Type[inTypes.length];
-		for (int i = 0; i < inTypes.length; i++)
-			types[i] = inTypes[i].getType();
-		final Type specialType = Types.parameterize(opClass, types);
-		return (T) env.op(opName, Nil.of(specialType), inTypes, outType, hints);
-	}
-
-	public static class InplaceInfo {
-
-		private final int arity;
-		private final int mutablePosition;
-
-		public InplaceInfo(final int arity, final int mutablePosition) {
-			this.arity = arity;
-			this.mutablePosition = mutablePosition;
-		}
-
-		public int arity() {
-			return arity;
-		}
-
-		public int mutablePosition() {
-			return mutablePosition;
-		}
-	}
-
-}
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java
index 9cc3810a2..b349c2036 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java
@@ -10,11 +10,9 @@
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.scijava.function.Functions;
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.Op;
-import org.scijava.ops.util.FunctionUtils;
-import org.scijava.param.Parameter;
+import org.scijava.ops.OpBuilder;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
@@ -32,7 +30,7 @@ public class OpMonitorTest extends AbstractTestEnvironment {
 	 */
 	@Test(expected = CancellationException.class)
 	public void testCancellation() {
-		Function<OpMonitor, BigInteger> bigOp = FunctionUtils.match(ops.env(), "test.opMonitor", new Nil<OpMonitor>() {},
+		Function<OpMonitor, BigInteger> bigOp = OpBuilder.matchFunction(ops.env(), "test.opMonitor", new Nil<OpMonitor>() {},
 				new Nil<BigInteger>() {});
 		OpMonitor monitor = new DefaultOpMonitor();
 		monitor.cancel();
@@ -49,7 +47,7 @@ public void testCancellation() {
 	 */
 	@Test(expected = CancellationException.class)
 	public void testCancellationDifferentThread() throws InterruptedException {
-		Function<OpMonitor, BigInteger> bigOp = FunctionUtils.match(ops.env(), "test.opMonitor", new Nil<OpMonitor>() {},
+		Function<OpMonitor, BigInteger> bigOp = OpBuilder.matchFunction(ops.env(), "test.opMonitor", new Nil<OpMonitor>() {},
 				new Nil<BigInteger>() {});
 		OpMonitor monitor = new DefaultOpMonitor();
 		try {
@@ -65,7 +63,7 @@ public void testCancellationDifferentThread() throws InterruptedException {
 	
 	@Test
 	public void testProgress() throws InterruptedException, ExecutionException{
-		BiFunction<OpMonitor, BigInteger, BigInteger> bigOp = FunctionUtils.match(ops.env(), "test.progress", new Nil<OpMonitor>() {},
+		BiFunction<OpMonitor, BigInteger, BigInteger> bigOp = OpBuilder.matchFunction(ops.env(), "test.progress", new Nil<OpMonitor>() {},
 				new Nil<BigInteger>() {}, new Nil<BigInteger>() {});
 		
 		OpMonitor monitor = new DefaultOpMonitor();
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/stats/MeanTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/stats/MeanTest.java
index 82e8e75be..9e81b6d27 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/stats/MeanTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/stats/MeanTest.java
@@ -7,9 +7,8 @@
 import java.util.function.Function;
 
 import org.junit.Test;
-import org.scijava.function.Functions;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.util.FunctionUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 public class MeanTest <N extends Number> extends AbstractTestEnvironment{
@@ -17,7 +16,7 @@ public class MeanTest <N extends Number> extends AbstractTestEnvironment{
 	@Test
 	public void regressionTest() {
 
-		Function<Iterable<Integer>, Double> goodFunc = FunctionUtils.match(ops.env(), "stats.mean", new Nil<Iterable<Integer>>() {}, new Nil<Double>() {});
+		Function<Iterable<Integer>, Double> goodFunc = OpBuilder.matchFunction(ops.env(), "stats.mean", new Nil<Iterable<Integer>>() {}, new Nil<Double>() {});
 
 		List<Integer> goodNums = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
 		double expected = 5.5;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/ComputersTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/ComputersTest.java
index bd91e7664..ab40372be 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/ComputersTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/ComputersTest.java
@@ -32,7 +32,7 @@
 import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.util.ComputerUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 public class ComputersTest extends AbstractTestEnvironment {
@@ -42,7 +42,7 @@ public class ComputersTest extends AbstractTestEnvironment {
 
 	@Test
 	public void testUnaryComputers() {
-		Computers.Arity1<double[], double[]> sqrtComputer = ComputerUtils.match(ops.env(),
+		Computers.Arity1<double[], double[]> sqrtComputer = OpBuilder.matchComputer(ops.env(),
 			"math.sqrt", nilDoubleArray, nilDoubleArray);
 
 		double[] result = new double[3];
@@ -53,7 +53,7 @@ public void testUnaryComputers() {
 	@Test
 	public void testBinaryComputers() {
 		Computers.Arity2<double[], double[], double[]> addComputer = //
-			ComputerUtils.match(ops.env(), "math.add", nilDoubleArray, nilDoubleArray,
+			OpBuilder.matchComputer(ops.env(), "math.add", nilDoubleArray, nilDoubleArray,
 				nilDoubleArray);
 
 		double[] result = new double[3];
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/FunctionsTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/FunctionsTest.java
index 2d5dcac36..5243415b9 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/FunctionsTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/FunctionsTest.java
@@ -33,9 +33,8 @@
 import java.util.function.Function;
 
 import org.junit.Test;
-import org.scijava.function.Functions;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.util.FunctionUtils;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 public class FunctionsTest extends AbstractTestEnvironment {
@@ -45,19 +44,19 @@ public class FunctionsTest extends AbstractTestEnvironment {
 
 	@Test
 	public void testUnaryFunctions() {
-		Function<Double, Double> sqrtFunction = FunctionUtils.match(ops.env(), "math.sqrt", nilDouble, nilDouble);
+		Function<Double, Double> sqrtFunction = OpBuilder.matchFunction(ops.env(), "math.sqrt", nilDouble, nilDouble);
 		double answer = sqrtFunction.apply(16.0);
 		assert 4.0 == answer;
 	}
 
 	@Test
 	public void testBinaryFunctions() {
-		BiFunction<Double, Double, Double> addFunction = FunctionUtils.match(ops.env(), "math.add", nilDouble, nilDouble,
+		BiFunction<Double, Double, Double> addFunction = OpBuilder.matchFunction(ops.env(), "math.add", nilDouble, nilDouble,
 				nilDouble);
 		double answer = addFunction.apply(16.0, 14.0);
 		assert 30.0 == answer;
 
-		BiFunction<Double, Double, Double> powerFunction = FunctionUtils.match(ops.env(), "math.pow", nilDouble,
+		BiFunction<Double, Double, Double> powerFunction = OpBuilder.matchFunction(ops.env(), "math.pow", nilDouble,
 				nilDouble, nilDouble);
 		answer = powerFunction.apply(2.0, 10.0);
 		assert 1024.0 == answer;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/LiftTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/LiftTest.java
index 835fd86b5..c625f1c91 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/LiftTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/LiftTest.java
@@ -40,6 +40,7 @@
 import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 public class LiftTest extends AbstractTestEnvironment {
@@ -52,7 +53,7 @@ public class LiftTest extends AbstractTestEnvironment {
 
 	@Test
 	public void testliftFunction(){
-		Function<Double, Double> powFunction = FunctionUtils.match(ops.env(), "test.liftFunction", nilDouble, nilDouble);
+		Function<Double, Double> powFunction = OpBuilder.matchFunction(ops.env(), "test.liftFunction", nilDouble, nilDouble);
 
 		Function<Iterable<Double>, Iterable<Double>> liftedToIterable = Maps.FunctionMaps.Iterables.liftBoth(powFunction);
 		Iterable<Double> res2 = liftedToIterable.apply(Arrays.asList(1.0, 2.0, 3.0, 4.0));
@@ -70,7 +71,7 @@ private static double[] toArray(Iterable<Double> iter) {
 	@Test
 	public void testliftComputer() {
 
-		Computers.Arity1<double[], double[]> powComputer = ComputerUtils.match(ops.env(), "test.liftComputer", nilDoubleArray, nilDoubleArray);
+		Computers.Arity1<double[], double[]> powComputer = OpBuilder.matchComputer(ops.env(), "test.liftComputer", nilDoubleArray, nilDoubleArray);
 
 		Computers.Arity1<Iterable<double[]>, Iterable<double[]>> liftedToIterable = Maps.ComputerMaps.Iterables
 				.liftBoth(powComputer);
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
index 91661493e..7a916ed88 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
@@ -6,14 +6,13 @@
 import java.util.function.Function;
 
 import org.junit.Test;
-import org.scijava.function.Functions;
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpBuilder;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.types.Nil;
 import org.scijava.plugin.Plugin;
+import org.scijava.types.Nil;
 
 @Plugin(type = OpCollection.class)
 public class OpsAsParametersTest extends AbstractTestEnvironment {
@@ -50,7 +49,7 @@ public void TestOpWithOpFieldWithoutRun() {
 		list.add(20.5);
 		list.add(4.0d);
 
-		BiFunction<List<Number>, Function<Number, Double>, List<Double>> thing = FunctionUtils.match(ops.env(),
+		BiFunction<List<Number>, Function<Number, Double>, List<Double>> thing = OpBuilder.matchFunction(ops.env(),
 				"test.parameter.op", new Nil<List<Number>>() {
 				}, new Nil<Function<Number, Double>>() {
 				}, new Nil<List<Double>>() {
@@ -68,7 +67,7 @@ public void TestOpWithOpClass() {
 		list.add(20.5);
 		list.add(4.0d);
 
-		Function<Number, Double> funcClass = FunctionUtils.match(ops.env(), "test.parameter.class", new Nil<Number>() {
+		Function<Number, Double> funcClass = OpBuilder.matchFunction(ops.env(), "test.parameter.class", new Nil<Number>() {
 		}, new Nil<Double>() {
 		});
 
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.list b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.list
deleted file mode 100644
index cbfb06e6c..000000000
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.list
+++ /dev/null
@@ -1,24 +0,0 @@
-.include Globals.list
-arities = (0..maxArity).collect()
-
-[ComputerUtils.java]
-nilArgs = ```
-{ arity ->
-  names = nilNames(arity)
-  outType = names.remove(names.size() - 1)
-  names = [outType] + names
-  String.join(', ', names)
-}
-```
-matchParams = ```
-{ arity ->
-  // contains "I1, I2, ..., IN, O"
-  generics = genericParamTypes(arity)
-  // contains "in1, in2, ..., inN, out"
-  names = nilNames(arity)
-  // constructing strings of the term "final Nil<I1> in1"
-  nilArgs = (0..arity).stream().map{a -> "final Nil<${generics[a]}> ${names[a]}"}.collect()
-  String.join(', ', nilArgs)
-}
-```
-
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.vm
deleted file mode 100644
index d72c8b4ac..000000000
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.vm
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * This is autogenerated source code -- DO NOT EDIT. Instead, edit the
- * corresponding template in templates/ and rerun bin/generate.groovy.
- */
-
-package org.scijava.ops.util;
-
-import java.lang.reflect.Type;
-import java.util.function.Consumer;
-
-import org.scijava.function.Computers;
-import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.Hints;
-import org.scijava.types.Nil;
-import org.scijava.types.Types;
-
-/**
- * Container class for computer-style functional interfaces at various
- * <a href="https://en.wikipedia.org/wiki/Arity">arities</a>.
- * <p>
- * A computer has functional method {@code compute} with a number of arguments
- * corresponding to the arity, plus an additional argument for the preallocated
- * output to be populated by the computation.
- * </p>
- * <p>
- * Each computer interface implements a corresponding {@link Consumer}-style
- * interface (see {@link Consumers}) with arity+1; the consumer's {@code accept}
- * method simply delegates to {@code compute}. This pattern allows computer ops
- * to be used directly as consumers as needed.
- * </p>
- *
- * @author Curtis Rueden
- * @author Gabriel Selzer
- */
-public final class ComputerUtils {
-
-	private ComputerUtils() {
-		// NB: Prevent instantiation of utility class.
-	}
-
-#foreach($arity in [0..$maxArity])
-	@SuppressWarnings("unchecked")
-	public static $generics.call($arity) $computerArity.call($arity)$generics.call($arity) match(final OpEnvironment env, final String opName, $matchParams.call($arity))
-	{
-		return matchHelper(env, opName, ${computerArity.call($arity)}.class, $nilArgs.call($arity));
-	}
-
-#end
-#foreach($arity in [0..$maxArity])
-	@SuppressWarnings("unchecked")
-	public static $generics.call($arity) $computerArity.call($arity)$generics.call($arity) match(final OpEnvironment env, final String opName, $matchParams.call($arity), final Hints hints)
-	{
-		return matchHelper(env, opName, hints, ${computerArity.call($arity)}.class, $nilArgs.call($arity));
-	}
-
-#end
-	@SuppressWarnings({ "unchecked" })
-	private static <T> T matchHelper(final OpEnvironment env, final String opName, final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
-	{
-		final Type[] types = new Type[inTypes.length + 1];
-		for (int i = 0; i < inTypes.length; i++)
-			types[i] = inTypes[i].getType();
-		types[types.length - 1] = outType.getType();
-		final Type specialType = Types.parameterize(opClass, types);
-		final Nil<?>[] nils = new Nil[inTypes.length + 1];
-		System.arraycopy(inTypes, 0, nils, 0, inTypes.length);
-		nils[nils.length - 1] = outType;
-		return (T) env.op(opName, Nil.of(specialType), nils, outType);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	private static <T> T matchHelper(final OpEnvironment env, final String opName, final Hints hints, final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
-	{
-		final Type[] types = new Type[inTypes.length + 1];
-		for (int i = 0; i < inTypes.length; i++)
-			types[i] = inTypes[i].getType();
-		types[types.length - 1] = outType.getType();
-		final Type specialType = Types.parameterize(opClass, types);
-		final Nil<?>[] nils = new Nil[inTypes.length + 1];
-		System.arraycopy(inTypes, 0, nils, 0, inTypes.length);
-		nils[nils.length - 1] = outType;
-		return (T) env.op(opName, Nil.of(specialType), nils, outType, hints);
-	}
-}
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.vm
index f0c4061fa..d7248f865 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.vm
@@ -29,22 +29,6 @@ public final class FunctionUtils {
 		// NB: Prevent instantiation of utility class.
 	}
 
-#foreach($arity in [0..$maxArity])
-	@SuppressWarnings({ "unchecked" })
-	public static $generics.call($arity) $functionArity.call($arity)$generics.call($arity) match(final OpEnvironment env, final String opName, $matchParams.call($arity))
-	{
-		return matchHelper(env, opName, ${functionArity.call($arity)}.class, $nilArgs.call($arity));
-	}
-
-#end
-#foreach($arity in [0..$maxArity])
-	@SuppressWarnings({ "unchecked" })
-	public static $generics.call($arity) $functionArity.call($arity)$generics.call($arity) match(final OpEnvironment env, final String opName, $matchParams.call($arity), final Hints hints)
-	{
-		return matchHelper(env, opName, hints, ${functionArity.call($arity)}.class, $nilArgs.call($arity));
-	}
-
-#end
 	@SuppressWarnings({ "unchecked" })
 	public static <O, T> Functions.ArityN<O> matchN(final OpEnvironment env,
 		final String opName, final Nil<O> outType, final Nil<?>... inTypes)
@@ -77,17 +61,4 @@ public final class FunctionUtils {
 		final Type specialType = Types.parameterize(opClass, types);
 		return (T) env.op(opName, Nil.of(specialType), inTypes, outType);
 	}
-
-	@SuppressWarnings({ "unchecked" })
-	private static <T> T matchHelper(final OpEnvironment env, final String opName, final Hints hints,
-		final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
-	{
-		final Type[] types = new Type[inTypes.length + 1];
-		for (int i = 0; i < inTypes.length; i++)
-			types[i] = inTypes[i].getType();
-		types[types.length - 1] = outType.getType();
-		final Type specialType = Types.parameterize(opClass, types);
-		return (T) env.op(opName, Nil.of(specialType), inTypes, outType, hints);
-	}
-
 }
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.list b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.list
deleted file mode 100644
index 1461fe4bc..000000000
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.list
+++ /dev/null
@@ -1,83 +0,0 @@
-.include Globals.list
-arities = (1..maxArity).collect()
-
-[InplaceUtils.java]
-simplifiedClass = ```
-{ arity, num ->
-  simplifiedInplace(arity, num) + '.class'
-}
-```
-inplaceClass = ```
-{ arity, num ->
-  inplaceType(arity, num) + '.class'
-}
-```
-typeVarNums = ```
-{ arity, io ->
-  (1..arity).subList(0, io - 1) + 'O' + (1..arity).subList(io, arity)
-}
-```
-genericsList = ```
-{ arity, io ->
-  typeVarNums(arity, io).stream().map{a -> "I$a"}.collect()
-}
-```
-generics = ```
-{ arity, io ->
-  '<' + String.join(', ', genericsList(arity, io)) + '>'
-}
-```
-allMutableGenericsList = ```
-{ arity ->
-  (1..arity).stream().map{a -> "IO$a"}.collect()
-}
-```
-allMutableGenerics = ```
-{ arity ->
-  '<' + String.join(', ', allMutableGenericsList.call(arity)) + '>'
-}
-```
-basicParamsList = ```
-{ arity, io -> 
-	typeVarNums(arity, io).stream().map{a -> a == 'O' ? "ioType" : "in${a}Type"}.collect()
-}
-```
-basicParams = ```
-{ arity, io ->
-  String.join(', ', basicParamsList(arity, io))
-}
-```
-matchName = ```
-{ arity, num ->
-  arity == 1 ? "matchInplace" :
-  "matchInplace${num}"
-}
-```
-matchParams = ```
-{ arity, io ->
-  String.join(', ', genericsList(arity, io).stream().map{a -> 
-    a.charAt(1) == 'O'? 
-	"final Nil<$a> ${a.toLowerCase()}Type"  :
-	"final Nil<$a> in${a.substring(1)}Type"}.collect())
-}
-```
-typeArgs = ```
-{ arity, io ->
-  String.join(', ', basicParamsList(arity, io).stream().map{a -> "${a}.getType()"}.collect())
-}
-```
-allMutableMutateParams = ```
-{ arity ->
-  String.join(', ', allMutableGenericsList(arity).stream().map{a -> "@Mutable $a ${a.toLowerCase()}"}.collect())
-}
-```
-allMutableMutateArgs = ```
-{ arity ->
-  String.join(', ', allMutableGenericsList(arity).stream().map{a -> "${a.toLowerCase()}"}.collect())
-}
-```
-mutateArgs = ```
-{ arity, io ->
-  String.join(', ', genericsList(arity, io).stream().map{a -> a.substring(1) == 'O' ? "@Mutable IO io" : "$a in${a.substring(1)}"}.collect())
-  }
-```
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.vm
deleted file mode 100644
index c3a28c725..000000000
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.vm
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * This is autogenerated source code -- DO NOT EDIT. Instead, edit the
- * corresponding template in templates/ and rerun bin/generate.groovy.
- */
-
-package org.scijava.ops.util;
-
-import java.lang.reflect.Type;
-import java.util.function.Consumer;
-
-import org.scijava.function.Computers;
-import org.scijava.function.Consumers;
-import org.scijava.function.Inplaces;
-import org.scijava.function.Mutable;
-import org.scijava.function.Producer;
-import org.scijava.ops.Hints;
-import org.scijava.ops.OpEnvironment;
-import org.scijava.types.Nil;
-import org.scijava.types.Types;
-
-/**
- * Container class for inplace-style functional interfaces at various
- * <a href="https://en.wikipedia.org/wiki/Arity">arities</a>.
- * <p>
- * An inplace has functional method {@code mutate} with a number of arguments
- * corresponding to the arity. Any of the arguments annotated
- * with @{@link Mutable} may be mutated during execution. Some interfaces narrow
- * this behavior to only a specific argument; most ops in practice will
- * implement one of these narrowed interfaces. For example,
- * {@link Inplaces.Arity2_1} is a binary inplace op that mutates the first of
- * two arguments&mdash;e.g., an {@code a /= b} division operation would be an
- * {@link Inplaces.Arity2_1}, whereas {@code b = a / b} would be an
- * {@link Inplaces.Arity2_2}.
- * </p>
- * <p>
- * Each inplace interface implements a corresponding {@link Consumer}-style
- * interface (see {@link Consumers}) with same arity; the consumer's
- * {@code accept} method simply delegates to {@code mutate}. This pattern allows
- * inplace ops to be used directly as consumers as needed.
- * </p>
- * <p>
- * Note that there is no nullary (arity 0) inplace interface, because there
- * would be no arguments to mutate; see also {@link Consumers.Arity0},
- * {@link Computers.Arity0} and {@link Producer}.
- * </p>
- *
- * @author Curtis Rueden
- * @author Gabriel Selzer
- */
-public final class InplaceUtils {
-
-	private InplaceUtils() {
-		// NB: Prevent instantiation of container class.
-	}
-
-
-#foreach($arity in $arities)
-#foreach($a in [1..$arity])
-	@SuppressWarnings({ "unchecked" })
-	public static $generics.call($arity, $a) $inplaceType.call($arity, $a)$generics.call($arity, $a) $matchName.call($arity, $a)(final OpEnvironment env, final String opName, $matchParams.call($arity, $a))
-	{
-		return matchHelper(env, opName, ${inplaceClass.call($arity, $a)}, ioType, new Nil[] {${basicParams.call($arity, $a)}});
-	}
-
-#end
-#end
-
-#foreach($arity in $arities)
-#foreach($a in [1..$arity])
-	@SuppressWarnings({ "unchecked" })
-	public static $generics.call($arity, $a) $inplaceType.call($arity, $a)$generics.call($arity, $a) $matchName.call($arity, $a)(final OpEnvironment env, final String opName, $matchParams.call($arity, $a), final Hints hints)
-	{
-		return matchHelper(env, opName, hints, ${inplaceType.call($arity, $a)}.class, ioType, new Nil[] {${basicParams.call($arity, $a)}});
-	}
-
-#end
-#end
-	@SuppressWarnings({ "unchecked" })
-	private static <T> T matchHelper(final OpEnvironment env, final String opName,
-		final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
-	{
-		final Type[] types = new Type[inTypes.length];
-		for (int i = 0; i < inTypes.length; i++)
-			types[i] = inTypes[i].getType();
-		final Type specialType = Types.parameterize(opClass, types);
-		return (T) env.op(opName, Nil.of(specialType), inTypes, outType);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	private static <T> T matchHelper(final OpEnvironment env, final String opName, final Hints hints,
-		final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
-	{
-		final Type[] types = new Type[inTypes.length];
-		for (int i = 0; i < inTypes.length; i++)
-			types[i] = inTypes[i].getType();
-		final Type specialType = Types.parameterize(opClass, types);
-		return (T) env.op(opName, Nil.of(specialType), inTypes, outType, hints);
-	}
-
-	public static class InplaceInfo {
-
-		private final int arity;
-		private final int mutablePosition;
-
-		public InplaceInfo(final int arity, final int mutablePosition) {
-			this.arity = arity;
-			this.mutablePosition = mutablePosition;
-		}
-
-		public int arity() {
-			return arity;
-		}
-
-		public int mutablePosition() {
-			return mutablePosition;
-		}
-	}
-
-}

From c187b952616acf2a067a3dd79fb96260e8c2a71b Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Wed, 30 Jun 2021 13:12:09 -0500
Subject: [PATCH 56/91] Export MatchingUtils methods to scijava-types

These methods do not depend on Ops, so we should export them for broader
usage
---
 .../ops/impl/DefaultOpEnvironment.java        |   4 +-
 .../org/scijava/ops/matcher/DefaultOpRef.java |   3 +-
 .../scijava/ops/matcher/MatchingUtils.java    | 995 +-----------------
 .../ops/simplify/SimplificationUtils.java     |   9 +-
 .../org/scijava/param/ParameterStructs.java   |   7 +-
 .../ops/matcher/MatchingUtilsTest.java        |  17 +-
 .../src/main/java/module-info.java            |   1 +
 .../types/inference/GenericAssignability.java | 767 ++++++++++++++
 .../inference/TypeInferenceException.java     |  19 +
 .../scijava/types/inference/TypeMapping.java  | 110 ++
 .../types/inference/TypeVarAssigns.java       | 134 +++
 .../types/inference/WildcardTypeMapping.java  | 123 +++
 .../inference}/InferTypeVariablesTest.java    | 428 ++++----
 13 files changed, 1379 insertions(+), 1238 deletions(-)
 create mode 100644 scijava/scijava-types/src/main/java/org/scijava/types/inference/GenericAssignability.java
 create mode 100644 scijava/scijava-types/src/main/java/org/scijava/types/inference/TypeInferenceException.java
 create mode 100644 scijava/scijava-types/src/main/java/org/scijava/types/inference/TypeMapping.java
 create mode 100644 scijava/scijava-types/src/main/java/org/scijava/types/inference/TypeVarAssigns.java
 create mode 100644 scijava/scijava-types/src/main/java/org/scijava/types/inference/WildcardTypeMapping.java
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops/matcher => scijava-types/src/test/java/org/scijava/types/inference}/InferTypeVariablesTest.java (64%)

diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
index 6930309ee..316e442e5 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
@@ -77,7 +77,6 @@
 import org.scijava.ops.matcher.DefaultOpMatcher;
 import org.scijava.ops.matcher.DefaultOpRef;
 import org.scijava.ops.matcher.DependencyMatchingException;
-import org.scijava.ops.matcher.MatchingUtils;
 import org.scijava.ops.matcher.OpAdaptationInfo;
 import org.scijava.ops.matcher.OpClassInfo;
 import org.scijava.ops.matcher.OpFieldInfo;
@@ -95,6 +94,7 @@
 import org.scijava.types.Nil;
 import org.scijava.types.TypeService;
 import org.scijava.types.Types;
+import org.scijava.types.inference.GenericAssignability;
 import org.scijava.util.ClassUtils;
 
 /**
@@ -637,7 +637,7 @@ private boolean adaptOpOutputSatisfiesRefTypes(Type adaptTo, Map<TypeVariable<?>
 		Type opType = ref.getType();
 		// TODO: clean this logic -- can this just be ref.typesMatch() ?
 		if (opType instanceof ParameterizedType) {
-			if (!MatchingUtils.checkGenericAssignability(adaptTo,
+			if (!GenericAssignability.checkGenericAssignability(adaptTo,
 				(ParameterizedType) opType, map, true))
 			{
 				return false;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpRef.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpRef.java
index c101472e6..6f4a2d8f7 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpRef.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpRef.java
@@ -38,6 +38,7 @@
 import org.scijava.ops.Op;
 import org.scijava.ops.OpRef;
 import org.scijava.types.Types;
+import org.scijava.types.inference.GenericAssignability;
 
 /**
  * Data structure which identifies an op by name and/or type(s) and/or argument
@@ -153,7 +154,7 @@ public boolean typesMatch(final Type opType,
 	{
 		if (type == null) return true;
 		if (type instanceof ParameterizedType) {
-			if (!MatchingUtils.checkGenericAssignability(opType,
+			if (!GenericAssignability.checkGenericAssignability(opType,
 				(ParameterizedType) type, typeVarAssigns, true))
 			{
 				return false;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingUtils.java
index 0bf89a671..eee5b7fef 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingUtils.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingUtils.java
@@ -32,24 +32,14 @@
 
 package org.scijava.ops.matcher;
 
-import com.google.common.base.Objects;
-
-import java.lang.reflect.GenericArrayType;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
-import java.lang.reflect.WildcardType;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 import org.scijava.types.Any;
 import org.scijava.types.Nil;
@@ -151,294 +141,6 @@ static int checkGenericOutputsAssignability(Type[] froms, Type[] tos,
 		return -1;
 	}
 
-	/**
-	 * Checks whether it would be legal to assign the {@link Type} source to the
-	 * specified {@link ParameterizedType} destination (which could possibly be a
-	 * supertype of the source type). Thereby, possible {@link TypeVariable}s
-	 * contained in the parameters of the source are tried to be inferred in the
-	 * sense of empty angle brackets when a new object is created:
-	 *
-	 * <pre>
-	 * 
-	 * List&lt;Integer&gt; listOfInts = new ArrayList&lt;&gt;();
-	 * </pre>
-	 *
-	 * Hence, the types to put between the brackets are tried to be determined.
-	 * Inference will be done by simple matching of an encountered
-	 * {@link TypeVariable} in the source to the corresponding type in the
-	 * parameters of the destination. If an {@link TypeVariable} is encountered
-	 * more than once, the corresponding type in the destination needs to
-	 * perfectly match. Else, false will be returned.</br>
-	 * </br>
-	 * Examples:
-	 * <ul>
-	 * If we have a class:
-	 * <li>
-	 *
-	 * <pre>
-	 * class NumberSupplier&lt;M extends Number&gt; implements Supplier&lt;M&gt;
-	 * </li>
-	 * </ul>
-	 * <ul>
-	 * The following check will return true:
-	 * <li>
-	 *
-	 * <pre>
-	 * checkGenericAssignability(NumberSupplier.class, new
-	 * Nil&lt;Supplier&lt;Double&gt;&gt;() {}.getType())</li>
-	 * </ul>
-	 * </ul>
-	 * <ul>
-	 * Which will check if the following assignment would be legal:
-	 * <li>
-	 *
-	 * <pre>
-	 * Supplier&lt;Double&gt; list = new NumberSupplier&lt;&gt;()</li>
-	 * </ul>
-	 * </ul>
-	 * <ul>
-	 * Here, the parameter {@code <M extends Number>} can be inferred to be of
-	 * type {@code Double} from the type {@code Supplier<Double>}
-	 * </ul>
-	 * <ul>
-	 * Consequently the following will return false:
-	 * <li>
-	 *
-	 * <pre>
-	 * checkGenericAssignability(NumberSupplier.class, new
-	 * Nil&lt;Supplier&lt;String&gt;&gt;() {}.getType())</li>
-	 * </ul>
-	 * <ul>
-	 * {@code <M extends Number>} can't be inferred, as type {@code String} is not
-	 * within the bounds of {@code M}.
-	 * </ul>
-	 * <ul>
-	 * Furthermore, the following will return false for:
-	 * {@code class NumberFunc<M extends Number> implements Function<M, M>}:
-	 * <li>
-	 *
-	 * <pre>
-	 * checkGenericAssignability(NumberSupplier.class, new
-	 * Nil&lt;Function&lt;Double, Integer&gt;&gt;() {}.getType())</li>
-	 * </ul>
-	 * <ul>
-	 * {@code <M extends Number>} can't be inferred, as types {@code Double} and
-	 * {@code Integer} are ambiguous for {@code M}.
-	 * </ul>
-	 *
-	 * @param src the type for which assignment should be checked from
-	 * @param dest the parameterized type for which assignment should be checked
-	 *          to
-	 * @param typeVarAssigns the map of {@link TypeVariable}s to {@link Type}s to
-	 *          populate with what would occur in this scenario; must be empty or
-	 *          null
-	 * @param safeAssignability used to determine if we want to check if the
-	 *          src->dest assignment would be safely assignable even though it
-	 *          would cause a compiler error if we explicitly tried to do this
-	 *          (useful pretty much only for Op matching)
-	 * @return whether and assignment of source to destination would be a legal
-	 *         java statement
-	 */
-	public static boolean checkGenericAssignability(Type src,
-		ParameterizedType dest, Map<TypeVariable<?>, Type> typeVarAssigns,
-		boolean safeAssignability)
-	{
-		if (typeVarAssigns == null) {
-			typeVarAssigns = new HashMap<>();
-		}
-		else if (!typeVarAssigns.isEmpty()) {
-			throw new IllegalArgumentException(
-				"Expected empty typeVarAssigns but contained " + typeVarAssigns.size() +
-					" entries");
-		}
-
-		// fail fast when raw types are not assignable
-		if (!Types.isAssignable(Types.raw(src), Types.raw(dest))) return false;
-
-		// when raw types are assignable, check the type variables of src and dest
-		Type[] srcTypes = typeParamsAgainstClass(src, Types.raw(dest));
-		Type[] destTypes = dest.getActualTypeArguments();
-
-		// if there are no type parameters in src (w.r.t. dest), do a basic
-		// assignability check.
-		if (srcTypes.length == 0) return Types.isAssignable(src, dest);
-		// if there are type parameters, do a more complicated assignability check.
-		boolean result = checkGenericAssignability(srcTypes, destTypes, src, dest,
-			typeVarAssigns, safeAssignability);
-		return result;
-	}
-
-	/**
-	 * Obtains the type parameters of {@link Type} {@code src} <b>with respect
-	 * to</b> the {@link Class} {@code dest}. When {@code src} has no type
-	 * parameters (or is not a subclass of {@code dest}), an empty array is
-	 * returned.
-	 *
-	 * @param src - the {@code Type} whose type parameters will be returned.
-	 * @param superclass - the {@code Class} against which we want the type parameters of {@code src}
-	 * @return an array of {@code Type}s denoting the type
-	 */
-	private static Type[] typeParamsAgainstClass(Type src, Class<?> superclass) {
-		// only classes and ParameterizedTypes can have type parameters
-		if (!(src instanceof Class || src instanceof ParameterizedType)) return new Type[0];
-		Type superSrc = superType(src, superclass);
-		if (superSrc == null) return new Type[0];
-		if (superSrc instanceof ParameterizedType) return ((ParameterizedType) superSrc).getActualTypeArguments();
-		return getParams(Types.raw(src), superclass);
-	}
-
-	/**
-	 * This method is designed to handle edge cases when calling
-	 * {@link Types#getExactSuperType(Type, Class)}. When
-	 * {@code getExactSuperType} returns an error, this usually implies some funny
-	 * business going on with the {@link Type} that was passed to it. We are not
-	 * interested in supporting this business, since it usually results from poor
-	 * practice in Class construction. TODO: determine some way of conveying to
-	 * the user that GenTyRef doesn't like their inputs.
-	 *
-	 * @param src
-	 * @param superClass
-	 * @return - the supertype of {@code src} with rawtype {@code superClass}, or
-	 *         {@code null} if no such supertype exists.
-	 */
-	private static Type superType(Type src, Class<?> superClass) {
-			try {
-				return Types.getExactSuperType(src, superClass);
-			} catch (AssertionError e) {
-				// can be thrown when
-				return null;
-			}
-	}
-
-	/**
-	 * @param src
-	 *            the type for which assignment should be checked from
-	 * @param dest
-	 *            the parameterized type for which assignment should be checked to
-	 * @param safeAssignability
-	 *            used to determine if we want to check if the src->dest assignment
-	 *            would be safely assignable even though it would cause a compiler
-	 *            error if we explicitly tried to do this (useful pretty much only
-	 *            for Op matching)
-	 * @return whether and assignment of source to destination would be a legal java
-	 *         statement
-	 */
-	public static boolean checkGenericAssignability(Type src, ParameterizedType dest, boolean safeAssignability) {
-		return checkGenericAssignability(src, dest, null, safeAssignability);
-	}
-
-	/**
-	 * @param srcTypes the Type arguments for the source Type
-	 * @param destTypes the Type arguments for the destination Type
-	 * @param src the type for which assignment should be checked from
-	 * @param dest the parameterized type for which assignment should be checked
-	 *          to
-	 * @param typeVarAssigns the map of {@link TypeVariable}s to
-	 *          {@link TypeMapping}s that would occur in this scenario
-	 * @param safeAssignability used to determine if we want to check if the
-	 *          src->dest assignment would be safely assignable even though it
-	 *          would cause a compiler error if we explicitly tried to do this
-	 *          (useful pretty much only for Op matching)
-	 * @return whether and assignment of source to destination would be a legal
-	 *         java statement
-	 */
-	private static boolean checkGenericAssignability(Type[] srcTypes, Type[] destTypes, Type src, Type dest,
-			Map<TypeVariable<?>, Type> typeVarAssigns, boolean safeAssignability) {
-		// if the number of type arguments does not match, the types can't be
-		// assignable
-		if (srcTypes.length != destTypes.length) {
-			return false;
-		}
-		
-		try {
-			// Try to infer type variables contained in the type arguments of
-			// sry
-			inferTypeVariables(srcTypes, destTypes, typeVarAssigns);
-		} catch (IllegalArgumentException e) {
-			// types can't be inferred
-			// TODO: Consider the situations in which it is okay that the type
-			// variables cannot be inferred. For example, if we have a
-			// Function<Comparable<T>, Comparable<T>> and we ask for a
-			// Function<Double, Object>, it is okay that we cannot infer the T of
-			// Comparable<T> from Object since a Comparable<T> is an Object for any T.
-			// It would be nice if we could just return false any time we catch a
-			// TypeInferenceException, but until we sort this out, we cannot do so.
-			return safeAssignability && isSafeAssignable(destTypes, typeVarAssigns, src, dest);
-		}
-
-		// Map TypeVariables in src to Types
-		Class<?> matchingRawType = Types.raw(dest);
-		Type[] mappedSrcTypes = mapVarToTypes(srcTypes, typeVarAssigns);
-		Type inferredSrcType = Types.parameterize(matchingRawType, mappedSrcTypes);
-
-		// Check assignability
-		if (Types.isAssignable(inferredSrcType, dest, typeVarAssigns)) return true;
-
-		return safeAssignability && isSafeAssignable(destTypes, typeVarAssigns, src,
-			dest);
-	}
-
-	/**
-	 * We know that the special types for the Op candidate and what we asked for are
-	 * the same (i.e. that we are trying to determine if one Function can be
-	 * assigned to another Function). There are some situations (that are
-	 * particularly common when using ops.run()) where the Function SHOULD NOT
-	 * NORMALLY MATCH UP but WE KNOW IT WILL BE SAFE TO ASSIGN. This method attempts
-	 * to tease those situations out as a last resort.
-	 * 
-	 * @param destTypes
-	 *            - the array of Parameterized types of the OpInfo we called the
-	 *            matcher on (in the case of ops.run(), it is a Type array of the
-	 *            types of the args we passed through.)
-	 * @param typeVarAssigns
-	 *            - a Map of all of the Type Variables already determined.
-	 * @param dest
-	 *            - the speical type of the Op that we want to find a match for
-	 *            (determined by the user / ops.run())
-	 * @return boolean - true if we can safely match this Op even though the types
-	 *         do not directly match up. False otherwise.
-	 */
-	public static boolean isSafeAssignable(Type[] destTypes, Map<TypeVariable<?>, Type> typeVarAssigns, Type src,
-			Type dest) {
-
-		Method[] destMethods = Arrays.stream(Types.raw(dest).getDeclaredMethods())
-				.filter(method -> Modifier.isAbstract(method.getModifiers())).toArray(Method[]::new);
-		if (destMethods.length == 0) {
-			throw new IllegalArgumentException(src + " does not have an abstract method!");
-		}
-		Type[] params = Types.getExactParameterTypes(destMethods[0], src);
-		Type returnType = Types.getExactReturnType(destMethods[0], src);
-		for (int i = 0; i < params.length; i++) {
-			if (!Types.isAssignable(destTypes[i], params[i], typeVarAssigns))
-				return false;
-		}
-
-		// Computers will have void as their return type, meaning that there is no
-		// output to check.
-		if (returnType == void.class)
-			return true;
-
-		return Types.isAssignable(returnType, destTypes[destTypes.length - 1], typeVarAssigns);
-	}
-
-	/**
-	 * Exception indicating that type vars could not be inferred.
-	 */
-	static class TypeInferenceException extends RuntimeException {
-		/**
-		 *
-		 */
-		private static final long serialVersionUID = 7147530827546663700L;
-		
-		public TypeInferenceException() {
-			super();
-		}
-		
-		public TypeInferenceException(String message) {
-			super(message);
-		}
-	}
-
 	/**
 	 * Map type vars in specified type list to types using the specified map. In
 	 * doing so, type vars mapping to other type vars will not be followed but
@@ -450,386 +152,11 @@ public TypeInferenceException(String message) {
 	 *         (that are present in {@code typeAssigns}) are mapped to the
 	 *         associated values within the {@code Map}.
 	 */
-	private static Type[] mapVarToTypes(Type[] typesToMap, Map<TypeVariable<?>, Type> typeAssigns) {
+	public static Type[] mapVarToTypes(Type[] typesToMap, Map<TypeVariable<?>, Type> typeAssigns) {
 		return Arrays.stream(typesToMap).map(type -> Types.unrollVariables(typeAssigns, type, false))
 				.toArray(Type[]::new);
 	}
 
-	/**
-	 * Tries to infer type vars contained in types from corresponding types from
-	 * inferFrom, putting them into the specified map. <b>When a
-	 * {@link TypeInferenceException} is thrown, the caller should assume that
-	 * some of the mappings within {@code typeMappings} are incorrect.</b>
-	 *
-	 * @param types - the types containing {@link TypeVariable}s
-	 * @param inferFroms - the types used to infer the {@link TypeVariable}s
-	 *          within {@code types}
-	 * @param typeVarAssigns - the mapping of {@link TypeVariable}s to
-	 *          {@link Type}s
-	 */
-	public static void inferTypeVariables(Type[] types, Type[] inferFroms, Map<TypeVariable<?>, Type> typeVarAssigns) {
-		Map<TypeVariable<?>, TypeMapping> typeMappings = new HashMap<>();
-		try {
-			inferTypeVariables(types, inferFroms, typeMappings, true);
-			typeVarAssigns.putAll(new TypeVarAssigns(typeMappings));
-		}
-		catch (TypeInferenceException e) {
-			throw new IllegalArgumentException(e);
-		}
-	}
-	
-	private static void inferTypeVariables(Type[] types, Type[] inferFroms,
-		Map<TypeVariable<?>, TypeMapping> typeMappings, boolean malleable) 
-	{
-		// Ensure that the user has not passed a null map
-		if (typeMappings == null) throw new IllegalArgumentException(
-			"Type Variable map is null, cannot store mappings of TypeVariables to Types!");
-
-		if (types.length != inferFroms.length) throw new TypeInferenceException(
-			"Could not infer type variables: Type arrays must be of the same size");
-
-		for (int i = 0; i < types.length; i++) {
-			inferTypeVariables(types[i], inferFroms[i], typeMappings, malleable);
-		}
-		// Check if the inferred types satisfy their bounds
-		// TODO: can we do this in an efficient manner?
-		TypeVarAssigns typeVarAssigns = new TypeVarAssigns(typeMappings);
-		if (!Types.typesSatisfyVariables(typeVarAssigns)) {
-			throw new TypeInferenceException();
-		}
-	}
-	
-	/**
-	 * Tries to infer type vars contained in types from corresponding types from
-	 * inferFrom, putting them into the specified map. <b>When a
-	 * {@link TypeInferenceException} is thrown, the caller should assume that
-	 * some of the mappings within {@code typeMappings} are incorrect.</b>
-	 *
-	 * @param type
-	 * @param inferFrom
-	 * @param typeMappings
-	 */
-	static void inferTypeVariablesWithTypeMappings(Type type[], Type[] inferFrom,
-		Map<TypeVariable<?>, TypeMapping> typeMappings)
-	{
-		inferTypeVariables(type, inferFrom, typeMappings, true);
-	}
-	
-	/**
-	 * Tries to infer type vars contained in types from corresponding types from
-	 * inferFrom, putting them into the specified map. <b>When a
-	 * {@link TypeInferenceException} is thrown, the caller should assume that
-	 * some of the mappings within {@code typeMappings} are incorrect.</b>
-	 *
-	 * @param type
-	 * @param inferFrom
-	 * @param typeMappings
-	 */
-	static void inferTypeVariables(Type type, Type inferFrom, Map<TypeVariable<?>, TypeMapping> typeMappings) {
-		inferTypeVariables(type, inferFrom, typeMappings, true);
-	}
-
-	private static void inferTypeVariables(Type type, Type inferFrom,
-		Map<TypeVariable<?>, TypeMapping> typeMappings, boolean malleable) 
-	{
-		if (type instanceof TypeVariable) {
-			inferTypeVariables((TypeVariable<?>) type, inferFrom, typeMappings, malleable);
-		}
-		else if (type instanceof ParameterizedType) {
-			inferTypeVariables((ParameterizedType) type, inferFrom, typeMappings);
-		}
-		else if (type instanceof WildcardType) {
-			inferTypeVariables((WildcardType) type, inferFrom, typeMappings);
-		}
-		else if (type instanceof GenericArrayType) {
-			inferTypeVariables((GenericArrayType) type, inferFrom, typeMappings);
-		}
-		else if (type instanceof Class) {
-			inferTypeVariables((Class<?>) type, inferFrom, typeMappings);
-		}
-
-	}
-
-	private static void inferTypeVariables(TypeVariable<?> type, Type inferFrom,
-		Map<TypeVariable<?>, TypeMapping> typeMappings, boolean malleable)
-	{
-		TypeMapping typeData = typeMappings.get(type);
-		// If current is not null then we have already encountered that
-		// variable. If so, we require them to be exactly the same, and throw a
-		// TypeInferenceException if they are not.
-		if (typeData != null) {
-			typeData.refine(inferFrom, malleable);
-		}
-		else {
-			resolveTypeInMap(type, inferFrom, typeMappings, malleable);
-			// Bounds could also contain type vars, hence possibly go into
-			// recursion
-			for (Type bound : type.getBounds()) {
-				if (bound instanceof TypeVariable && typeMappings.get(bound) != null) {
-					// If the bound of the current var (let's call it A) to
-					// infer is also a var (let's call it B):
-					// If we already encountered B, we check if the current
-					// type to infer from is assignable to
-					// the already inferred type for B. In this case we do
-					// not require equality as one var is
-					// bounded by another and it is not the same. E.g.
-					// assume we want to infer the types of vars:
-					// - - - A extends Number, B extends A
-					// From types:
-					// - - - Number, Double
-					// First A is bound to Number, next B to Double. Then we
-					// check the bounds for B. We encounter A,
-					// for which we already inferred Number. Hence, it
-					// suffices to check whether Double can be assigned
-					// to Number, it does not have to be equal as it is just
-					// a transitive bound for B.
-					Type typeAssignForBound = typeMappings.get(bound).getType();
-					if (!Types.isAssignable(inferFrom, typeAssignForBound)) {
-						throw new TypeInferenceException();
-					}
-				}
-				else {
-					// Else go into recursion as we encountered a new var.
-					inferTypeVariables(bound, inferFrom, typeMappings);
-				}
-			}
-
-		}
-	}
-
-	private static void inferTypeVariables(ParameterizedType type, Type inferFrom,
-		Map<TypeVariable<?>, TypeMapping> typeMappings)
-	{
-		if (inferFrom instanceof WildcardType) {
-			inferFrom = getInferrableBound((WildcardType) inferFrom);
-		}
-		if (inferFrom instanceof Any) {
-			Any any = (Any) inferFrom;
-			mapTypeVarsToAny(type, any, typeMappings);
-			return;
-		}
-		// Finding the supertype here is really important. Suppose that we are
-		// inferring from a StrangeThing<Long> extends Thing<Double> and our
-		// Op requires a Thing<T>. We need to ensure that T gets
-		// resolved to a Double and NOT a Long.
-		Type superInferFrom = Types.getExactSuperType(inferFrom, Types.raw(type));
-		if (superInferFrom instanceof ParameterizedType) {
-			ParameterizedType paramInferFrom = (ParameterizedType) superInferFrom;
-			inferTypeVariables(type.getActualTypeArguments(), paramInferFrom
-				.getActualTypeArguments(), typeMappings, false);
-		}
-		else if (superInferFrom instanceof Class) {
-			TypeVarAssigns typeVarAssigns = new TypeVarAssigns(typeMappings);
-			Type mappedType = Types.mapVarToTypes(type, typeVarAssigns);
-			// Use isAssignable to attempt to infer the type variables present in type
-			if (!Types.isAssignable(superInferFrom, mappedType, typeVarAssigns)) {
-				throw new TypeInferenceException(inferFrom +
-					" cannot be implicitly cast to " + mappedType +
-					", thus it is impossible to infer type variables for " + inferFrom);
-			}
-			// for all remaining unmapped type vars, map to Any
-			mapTypeVarsToAny(type, typeMappings);
-		}
-		// -- edge cases -> do our best -- //
-		else if (superInferFrom == null) {
-			// edge case 1: if inferFrom is an Object, superInferFrom will be null
-			// when type is some interface.
-			if (Object.class.equals(inferFrom)) {
-				mapTypeVarsToAny(type, typeMappings);
-				return;
-			}
-			// edge case 2: if inferFrom is a superType of type, we can get (some of)
-			// the types of type by finding the exact superType of type w.r.t.
-			// inferFrom.
-			Type superTypeOfType = Types.getExactSuperType(type, Types.raw(
-				inferFrom));
-			if (superTypeOfType == null) {
-				throw new TypeInferenceException(inferFrom +
-					" cannot be implicitly cast to " + type +
-					", thus it is impossible to infer type variables for " + inferFrom);
-			}
-			inferTypeVariables(superTypeOfType, inferFrom, typeMappings, false);
-			mapTypeVarsToAny(type, typeMappings);
-		}
-		// TODO: elaborate
-		else throw new IllegalStateException(superInferFrom +
-			" is the supertype of " + inferFrom + " with respect to " + type +
-			", however this cannot be (since " + type +
-			" is a ParamterizedType)! (Only a ParameterizedType, Class, or null " +
-			"can be returned from Types.getExactSuperType when it is called with a ParameterizedType!)");
-	}
-
-	private static void mapTypeVarsToAny(Type type,
-		Map<TypeVariable<?>, TypeMapping> typeMappings)
-	{
-		mapTypeVarsToAny(type, new Any(), typeMappings);
-	}
-
-	private static void mapTypeVarsToAny(Type type, Any any,
-		Map<TypeVariable<?>, TypeMapping> typeMappings)
-	{
-		if (!Types.containsTypeVars(type)) return;
-
-		if (type instanceof TypeVariable) {
-			if (typeMappings.containsKey(type)) return;
-			TypeVariable<?> typeVar = (TypeVariable<?>) type;
-			typeMappings.put(typeVar, suitableTypeMapping(typeVar, any, true));
-		}
-		else if (type instanceof ParameterizedType) {
-			ParameterizedType pType = (ParameterizedType) type;
-			Type[] typeParams = pType.getActualTypeArguments();
-			for (Type typeParam : typeParams) {
-				mapTypeVarsToAny(typeParam, typeMappings);
-			}
-		}
-		else if (type instanceof WildcardType) {
-			WildcardType wildcard = (WildcardType) type;
-			for (Type lowerBound : wildcard.getLowerBounds())
-				mapTypeVarsToAny(lowerBound, typeMappings);
-			for (Type upperBound : wildcard.getUpperBounds())
-				mapTypeVarsToAny(upperBound, typeMappings);
-		}
-		else if (type instanceof Class) {
-			Class<?> clazz = (Class<?>) type;
-			for (Type typeParam : clazz.getTypeParameters())
-				mapTypeVarsToAny(typeParam, typeMappings);
-		}
-	}
-
-	private static void inferTypeVariables(WildcardType type, Type inferFrom, Map<TypeVariable<?>, TypeMapping> typeMappings) {
-		Type inferrableBound = getInferrableBound(type);
-		if (inferFrom instanceof WildcardType) {
-			// NB if both type and inferFrom are Wildcards, it doesn't really matter
-			// (for the purpose of Type inference) whether those Wildcards have a
-			// defined upper or lower bound. It is only important that we compare
-			// those defined bounds, even if one is an upper bound and the other is a
-			// lower bound. If the Wildcards are not assignable (which is (always?)
-			// the case when one bound is an upper bound and the other is a lower
-			// bound), it is still possible to infer the type variables; despite doing
-			// so, checkGenericAssignability will return false.
-			inferFrom = getInferrableBound((WildcardType) inferFrom);
-		}
-		if (inferrableBound instanceof TypeVariable<?>) {
-			resolveTypeInMap((TypeVariable<?>) inferrableBound, inferFrom, typeMappings, true);
-		}
-		else if (inferrableBound instanceof ParameterizedType) {
-			ParameterizedType parameterizedUpperBound =
-				(ParameterizedType) inferrableBound;
-			inferTypeVariables(parameterizedUpperBound, inferFrom, typeMappings,
-				true);
-		}
-		// TODO: consider checking inferrableBounds instanceof Class
-	}
-	
-	private static void resolveTypeInMap(TypeVariable<?> typeVar, Type newType,
-		Map<TypeVariable<?>, TypeMapping> typeMappings, boolean malleability)
-	{
-		if (typeMappings.containsKey(typeVar)) {
-			typeMappings.get(typeVar).refine(newType, malleability);
-		}
-		else {
-			typeMappings.put(typeVar, suitableTypeMapping(typeVar, newType,
-				malleability));
-		}
-	}
-	
-	private static TypeMapping suitableTypeMapping(TypeVariable<?> typeVar,
-		Type newType, boolean malleability) 
-	{
-		if (newType instanceof WildcardType) {
-			return new WildcardTypeMapping(typeVar, (WildcardType) newType,
-				malleability);
-		}
-		return new TypeMapping(typeVar, newType, malleability);
-	}
-
-	private static void inferTypeVariables(Class<?> type, Type inferFrom, Map<TypeVariable<?>, TypeMapping> typeMappings) {
-		if( inferFrom instanceof TypeVariable<?>){
-			TypeVarAssigns typeVarAssigns = new TypeVarAssigns(typeMappings);
-			// If current type var is absent put it to the map. Otherwise,
-			// we already encountered that var.
-			// Hence, we require them to be exactly the same.
-			if(Types.isAssignable(type, inferFrom, typeVarAssigns)) {
-			Type current = typeVarAssigns.putIfAbsent((TypeVariable<?>) inferFrom, type);
-				if (current != null) {
-					if (current instanceof Any) {
-						typeVarAssigns.put((TypeVariable<?>) inferFrom, type);
-					}
-					else if (!Objects.equal(type, current)) {
-						throw new TypeInferenceException();
-					}
-				}
-			}
-		}
-	}
-
-	private static void inferTypeVariables(GenericArrayType type, Type inferFrom,
-		Map<TypeVariable<?>, TypeMapping> typeMappings)
-	{
-		if (inferFrom instanceof Class<?> && ((Class<?>) inferFrom).isArray()) {
-			Type componentType = type.getGenericComponentType();
-			Type componentInferFrom = ((Class<?>) inferFrom).getComponentType();
-			inferTypeVariables(componentType, componentInferFrom, typeMappings);
-		}
-		else if (inferFrom instanceof WildcardType) {
-			Type inferrableBound = getInferrableBound((WildcardType) inferFrom);
-			inferTypeVariables(type, inferrableBound, typeMappings);
-		}
-		else throw new TypeInferenceException(inferFrom +
-			" cannot be implicitly cast to " + type +
-			", thus it is impossible to infer type variables for " + inferFrom);
-	}
-
-	/**
-	 * Current java language specifications allow either:
-	 * <ul>
-	 * <li>one {@code Object} upper bound and one lower bound
-	 * <li>one (arbitrary) upper bound and no lower bounds
-	 * </ul>
-	 * We rely on this fact for the purposes of inferring type variables.
-	 *
-	 * @param type
-	 * @return the <b>singular</b> {@link Type} that bounds this
-	 *         {@link TypeVariable}. The returned {@code Type} could be
-	 *         <b>either</b> a lower <b>or</b> upper bound (we do not care for the
-	 *         sole purpose of type inference).
-	 */
-	private static Type getInferrableBound(WildcardType type) {
-		Type[] lBounds = type.getLowerBounds();
-		Type[] uBounds = type.getUpperBounds();
-		if (lBounds.length == 1 && uBounds.length == 1 &&
-			uBounds[0] == Object.class) return lBounds[0];
-		else if (lBounds.length == 0 && uBounds.length == 1) return uBounds[0];
-		else throw new IllegalArgumentException(
-			"Illegal WildcardType: Current Java Language Specification does not allow " +
-				type + " to simultaneously have upper bounds " + uBounds +
-				" and lower bounds " + lBounds);
-	}
-
-	/**
-	 * Finds the type parameters of the most specific super type of the specified
-	 * subType whose erasure is the specified superErasure. Hence, will return the
-	 * type parameters of superErasure possibly narrowed down by subType. If
-	 * superErasure is not raw or not a super type of subType, an empty array will
-	 * be returned.
-	 *
-	 * @param subType
-	 *            the type to narrow down type parameters
-	 * @param superErasure
-	 *            the erasure of an super type of subType to get the parameters from
-	 * @return type parameters of superErasure possibly narrowed down by subType, or
-	 *         empty type array if no exists or superErasure is not a super type of
-	 *         subtype
-	 */
-	public static Type[] getParams(Class<?> subType, Class<?> superErasure) {
-		Type pt = Types.parameterizeRaw(subType);
-		Type superType = Types.getExactSuperType(pt, superErasure);
-		if (superType != null && superType instanceof ParameterizedType) {
-			return ((ParameterizedType) superType).getActualTypeArguments();
-		}
-		return new Type[0];
-	}
-
 	/**
 	 * Gets the "useful" class information carries on the given object, which
 	 * depends on the actual type of the object.
@@ -893,324 +220,4 @@ public static int findCastLevels(final Class<?> dest, final Class<?> origin) {
 		}
 		return -1;
 	}
-	
-	/**
-	 * A data structure retaining information about the mapping of a
-	 * {@link TypeVariable} to a {@link Type} within a type-inferring context.
-	 * 
-	 * @author Gabriel Selzer
-	 */
-	static class TypeMapping {
-
-		protected final TypeVariable<?> typeVar;
-		protected Type mappedType;
-
-		/**
-		 * A boolean describing whether {@code mappedType} can be mutated in within
-		 * this set of {@link Type}s. The most common scenario in which a
-		 * {@link Type} <b>cannot</b> be mutated is when it is a type parameter of a
-		 * {@link ParameterizedType}. Once {@code malleable} is set to
-		 * {@code false}, {@code mappedType} <b>cannot</b> change, and
-		 * {@link TypeMapping#refine(Type, boolean)} will throw a
-		 * {@link TypeInferenceException} so long as {@code newType} is not the
-		 * exact same {@code Type} as {@mappedType}.
-		 */
-		boolean malleable;
-
-		public TypeMapping(TypeVariable<?> typeVar, Type mappedType,
-			boolean malleable)
-		{
-			this.typeVar = typeVar;
-			this.mappedType = mappedType;
-			this.malleable = malleable;
-		}
-
-		/**
-		 * Attempts to accommodate {@code newType} into the current mapping between
-		 * {@code typeVar} and {@code mappedType} <em>given</em> the existing
-		 * malleability of {@code mappedType} and the malleability imposed by
-		 * {@code newType}. If {@code newType} cannot be accommodated, a
-		 * {@link TypeInferenceException} will be thrown. Note that it is not a
-		 * guarantee that either the existing {@code mappedType} or {@code newType}
-		 * will become the new {@link #mappedType} after the method ends;
-		 * {@link #mappedType} could be a supertype of these two {@link Type}s.
-		 * 
-		 * @param otherType - the type that will be refined into {@link #mappedType}
-		 * @param newTypeMalleability - the malleability of {@code otherType},
-		 *          determined by the context from which {@code otherType} came.
-		 */
-		public void refine(Type otherType, boolean newTypeMalleability)
-		{
-			malleable &= newTypeMalleability;
-			if (mappedType instanceof Any) {
-				mappedType = otherType;
-				return;
-			}
-			if (otherType instanceof Any) {
-				return;
-			}
-			if (malleable) {
-				// TODO: consider the correct value of that boolean
-				Type superType = Types.greatestCommonSuperType(new Type[] { otherType,
-					mappedType }, false);
-				if (Types.isAssignable(superType, typeVar)) {
-					mappedType = superType;
-					return;
-				}
-				throw new TypeInferenceException(typeVar +
-					" cannot simultaneoustly be mapped to " + otherType + " and " +
-					mappedType);
-			}
-			if (Objects.equal(mappedType, otherType)) return;
-			throw new TypeInferenceException(typeVar +
-				" cannot simultaneoustly be mapped to " + otherType + " and " +
-				mappedType);
-		}
-
-		/**
-		 * @return the {@link Type} associated with this {@link TypeVariable}
-		 */
-		public Type getType() {
-			return mappedType;
-		}
-
-		@Override
-		public int hashCode() {
-			return Objects.hashCode(typeVar, mappedType, malleable);
-		}
-
-		@Override
-		public boolean equals(Object o) {
-			if (!(o instanceof TypeMapping)) return false;
-			final TypeMapping that = (TypeMapping) o;
-			return Objects.equal(typeVar, that.typeVar) && //
-				Objects.equal(mappedType, that.mappedType) && //
-				Objects.equal(malleable, that.malleable);
-		}
-
-		@Override
-		public String toString() {
-			return mappedType.toString();
-		}
-	}
-	
-	/**
-	 * A data structure retaining information about the mapping of a
-	 * {@link TypeVariable} to a {@link Type} bounded by a {@link WildcardType}
-	 * within a type-inferring context.
-	 * 
-	 * @author Gabriel Selzer
-	 */
-	static class WildcardTypeMapping extends TypeMapping {
-		
-		private List<Type> lowerBoundList;
-
-		public WildcardTypeMapping(TypeVariable<?> typeVar, WildcardType mappedType,
-			boolean malleable) 
-		{
-			super(typeVar, getUpperBound(mappedType), malleable);
-			lowerBoundList = new ArrayList<>();
-			Type mappedTypeLowerBound = getLowerBound(mappedType);
-			if (mappedTypeLowerBound != null) {
-				lowerBoundList.add(mappedTypeLowerBound);
-			}
-		}	
-		
-		/**
-		 * Attempts to accommodate {@code newType} into the current mapping between
-		 * {@code typeVar} and {@code mappedType} <em>given</em> the existing
-		 * malleability of {@code mappedType} and the malleability imposed by
-		 * {@code newType}. If {@code newType} cannot be accommodated, a
-		 * {@link TypeInferenceException} will be thrown. Note that it is not a
-		 * guarantee that either the existing {@code mappedType} or {@code newType}
-		 * will become the new {@link #mappedType} after the method ends;
-		 * {@link #mappedType} could be a supertype of these two {@link Type}s.
-		 * 
-		 * @param otherType - the type that will be refined into {@link #mappedType}
-		 * @param newTypeMalleability - the malleability of {@code otherType},
-		 *          determined by the context from which {@code otherType} came.
-		 */
-		@Override
-		public void refine(Type otherType, boolean newTypeMalleability)
-		{
-			if (otherType instanceof WildcardType) {
-				refineWildcard((WildcardType) otherType, newTypeMalleability);
-			}
-			else {
-				super.refine(otherType, newTypeMalleability);
-			}
-			for (Type lowerBound : lowerBoundList) {
-				if (!Types.isAssignable(lowerBound, mappedType))
-					throw new TypeInferenceException(typeVar +
-						" cannot simultaneoustly be mapped to " + otherType + " and " +
-						mappedType);
-			}
-		}
-
-		private void refineWildcard(WildcardType otherType,
-			boolean newTypeMalleability)
-		{
-			Type otherLowerBound = getLowerBound(otherType);
-			if (otherLowerBound != null) {
-				lowerBoundList.add(otherLowerBound);
-			}
-			Type otherUpperBound = getUpperBound(otherType);
-			super.refine(otherUpperBound, newTypeMalleability);
-		}
-
-		/**
-		 * Current Java Language Specifications allow only one upper bound on any
-		 * {@link WildcardType}. This method returns that singular bound, or
-		 * {@code null} if this {@code WildcardType} has no upper bound.
-		 *
-		 * @param newType - the {@link WildcardType} for which we will find the
-		 *          upper bound
-		 * @return the upper bound of {@code newType}
-		 */
-		private static Type getUpperBound(WildcardType newType) {
-			Type[] upperBounds = newType.getUpperBounds();
-			if (upperBounds.length == 0) {
-				return Object.class;
-			}
-			else if (upperBounds.length == 1) {
-				return upperBounds[0];
-			}
-			else {
-				throw new TypeInferenceException(newType + //
-					" is an impossible WildcardType. " + //
-					"The Java language specification currently prevents multiple upper bounds " + //
-					Arrays.toString(upperBounds)); //
-			}
-		}
-
-		/**
-		 * Current Java Language Specifications allow only one lower bound on any
-		 * {@link WildcardType}. This method returns that singular bound, or
-		 * {@code null} if this {@code WildcardType} has no lower bound.
-		 *
-		 * @param newType - the {@link WildcardType} for which we will find the
-		 *          lower bound
-		 * @return the lower bound of {@code newType}
-		 */
-		private static Type getLowerBound(WildcardType newType) {
-			Type[] lowerBounds = newType.getLowerBounds();
-			if (lowerBounds.length == 0) {
-				return null;
-			}
-			else if (lowerBounds.length == 1) {
-				return lowerBounds[0];
-			}
-			throw new TypeInferenceException(newType + //
-				" is an impossible WildcardType. " + //
-				"The Java language specification currently prevents multiple lower bounds " + //
-				Arrays.toString(lowerBounds)); //
-		}
-	}
-	
-	/**
-	 * Adapter class wrapping a {@code Map<TypeVariable, TypeMapping>} into a
-	 * {@code Map<TypeVariable, Type>} for use with {@link Types} API.
-	 */
-	private static class TypeVarAssigns implements Map<TypeVariable<?>, Type> {
-
-		private Map<TypeVariable<?>, TypeMapping> map;
-
-		public TypeVarAssigns(Map<TypeVariable<?>, TypeMapping> map) {
-			this.map = map;
-		}
-
-		@Override
-		public boolean containsKey( Object key) {
-			return map.containsKey(key);
-		}
-
-		@Override
-		public Type put(TypeVariable<?> typeVar, Type type) {
-			final TypeMapping previousMapping = //
-				map.put(typeVar, suitableTypeMapping(typeVar, type, isMalleable(typeVar)));
-			return previousMapping == null ? null : previousMapping.getType();
-		}
-
-		@Override
-		public Type putIfAbsent(TypeVariable<?> typeVar, Type type) {
-			if (!map.containsKey(typeVar)) return put(typeVar, type);
-			return get(typeVar);
-		}
-
-		@Override
-		public Type get(Object key) {
-			TypeMapping value = map.get(key);
-			return value == null ? null : value.getType();
-		}
-		
-		@Override
-		public int size() {
-			return map.size();
-		}
-
-		@Override
-		public boolean isEmpty() {
-			return map.isEmpty();
-		}
-
-		@Override
-		public boolean containsValue(Object value) {
-			return map.containsValue(value);
-		}
-
-		@Override
-		public Type remove(Object key) {
-			TypeMapping value = map.remove(key);
-			return value == null ? null : value.getType();
-		}
-
-		@Override
-		public void putAll(Map<? extends TypeVariable<?>, ? extends Type> m) {
-			for (Map.Entry<? extends TypeVariable<?>, ? extends Type> e : m.entrySet()) {
-				put(e.getKey(), e.getValue());
-			}
-		}
-
-		@Override
-		public void clear() {
-			map.clear();
-		}
-
-		@Override
-		public Set<TypeVariable<?>> keySet() {
-			return map.keySet();
-		}
-
-		@Override
-		public Collection<Type> values() {
-			return map.values().stream().map(v -> v.getType()).collect(Collectors.toList());
-		}
-
-		@Override
-		public Set<Entry<TypeVariable<?>, Type>> entrySet() {
-			return map.entrySet().stream().map(e -> {
-				return new Map.Entry<TypeVariable<?>, Type>() {
-
-					@Override
-					public TypeVariable<?> getKey() {
-						return e.getKey();
-					}
-
-					@Override
-					public Type getValue() {
-						return get(getKey());
-					}
-
-					@Override
-					public Type setValue(Type value) {
-						return put(getKey(), value);
-					}
-				};
-			}).collect(Collectors.toSet());
-		}
-
-		private boolean isMalleable(TypeVariable<?> typeVar) {
-			return map.containsKey(typeVar) && map.get(typeVar).malleable;
-		}
-	}
 }
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java
index 42c1cbf00..b9bd9f7f9 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java
@@ -29,6 +29,7 @@
 import org.scijava.param.ParameterStructs;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
+import org.scijava.types.inference.GenericAssignability;
 
 import javassist.CannotCompileException;
 import javassist.ClassPool;
@@ -72,12 +73,12 @@ public static ParameterizedType retypeOpType(Type originalOpType, Type[] newArgs
 
 			// solve input types
 			Type[] genericParameterTypes = paramTypesFromOpType(opType, fMethod);
-			MatchingUtils.inferTypeVariables(genericParameterTypes, newArgs, typeVarAssigns);
+			GenericAssignability.inferTypeVariables(genericParameterTypes, newArgs, typeVarAssigns);
 
 			// solve output type
 			Type genericReturnType = returnTypeFromOpType(opType, fMethod);
 			if (genericReturnType != void.class) {
-				MatchingUtils.inferTypeVariables(new Type[] {genericReturnType}, new Type[] {newOutType}, typeVarAssigns);
+				GenericAssignability.inferTypeVariables(new Type[] {genericReturnType}, new Type[] {newOutType}, typeVarAssigns);
 			}
 
 			// build new (read: simplified) Op type
@@ -109,7 +110,7 @@ private static Type[] typesFromOpType(Class<?> opType, Method fMethod, Type... t
 		Type genericDeclaringClass = Types.parameterizeRaw(declaringClass);
 		Type genericClass = Types.parameterizeRaw(opType);
 		Type superGenericClass = Types.getExactSuperType(genericClass, declaringClass);
-		MatchingUtils.inferTypeVariables(new Type[] {genericDeclaringClass}, new Type[] {superGenericClass}, map);
+		GenericAssignability.inferTypeVariables(new Type[] {genericDeclaringClass}, new Type[] {superGenericClass}, map);
 
 		return Types.mapVarToTypes(types, map);
 	}
@@ -163,7 +164,7 @@ public static int findMutableArgIndex(Class<?> c) {
 	public static Type resolveMutatorTypeArgs(Type inferFrom, Type mutatorInferFrom, Type unresolvedType) {
 		if(!Types.containsTypeVars(unresolvedType)) return unresolvedType;
 		Map<TypeVariable<?>, Type> map = new HashMap<>();
-		MatchingUtils.inferTypeVariables(new Type[] {mutatorInferFrom}, new Type[] {inferFrom}, map);
+		GenericAssignability.inferTypeVariables(new Type[] {mutatorInferFrom}, new Type[] {inferFrom}, map);
 		return Types.mapVarToTypes(unresolvedType, map);
 	}
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java
index 96b5a8322..77e0a78f2 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java
@@ -4,7 +4,6 @@
 import io.leangen.geantyref.AnnotationFormatException;
 import io.leangen.geantyref.TypeFactory;
 
-import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -30,7 +29,6 @@
 import org.scijava.ops.OpDependencyMember;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpMethod;
-import org.scijava.ops.matcher.MatchingUtils;
 import org.scijava.ops.simplify.Simplifier;
 import org.scijava.ops.util.AnnotationUtils;
 import org.scijava.struct.ItemIO;
@@ -38,6 +36,7 @@
 import org.scijava.struct.Struct;
 import org.scijava.struct.StructInstance;
 import org.scijava.types.Types;
+import org.scijava.types.inference.GenericAssignability;
 import org.scijava.util.ClassUtils;
 
 /**
@@ -302,9 +301,9 @@ public static Type getOpMethodType(Class<?> opClass, Method opMethod)
 		// map params of OpMethod to type variables of abstract method of functional
 		// interface (along with return type if applicable)
 		// TODO: not sure how this handles when there are type variables.
-		MatchingUtils.inferTypeVariables(typeMethodParams, getOpParamTypes(opMethodParams), typeVarAssigns);
+		GenericAssignability.inferTypeVariables(typeMethodParams, getOpParamTypes(opMethodParams), typeVarAssigns);
 		if (abstractMethod.getReturnType() != void.class) {
-			MatchingUtils.inferTypeVariables(new Type[] {abstractMethod.getGenericReturnType()}, new Type[] {opMethod.getGenericReturnType()}, typeVarAssigns);
+			GenericAssignability.inferTypeVariables(new Type[] {abstractMethod.getGenericReturnType()}, new Type[] {opMethod.getGenericReturnType()}, typeVarAssigns);
 		}
 		
 		// parameterize opClass 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingUtilsTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingUtilsTest.java
index 84c753df2..b0dda7a94 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingUtilsTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingUtilsTest.java
@@ -46,6 +46,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
+import org.scijava.types.inference.GenericAssignability;
 
 public class MatchingUtilsTest {
 
@@ -58,7 +59,7 @@ private void assertAll(Class<?> from, boolean condition, Nil<?>... tos) {
 	private void assertAll(Class<?> from, boolean condition, Type... tos) {
 		for (Type to : tos) {
 			if (to instanceof ParameterizedType) {
-				assertTrue(MatchingUtils.checkGenericAssignability(from, (ParameterizedType) to, false) == condition);
+				assertTrue(GenericAssignability.checkGenericAssignability(from, (ParameterizedType) to, false) == condition);
 			} else {
 				assertTrue(Types.isAssignable(from, to, new HashMap<TypeVariable<?>, Type>()) == condition);
 			}
@@ -508,7 +509,7 @@ public <T extends Number> void testSuperWildcardToSuperWildcard() {
 
 		// unfortunately we cannot use assertAll since it is impossible to create a
 		// Class implementing List<? super T>
-		boolean success = MatchingUtils.checkGenericAssignability(listT.getType(),
+		boolean success = GenericAssignability.checkGenericAssignability(listT.getType(),
 			(ParameterizedType) listWildcard.getType(), false);
 		Assert.assertTrue(success);
 	}
@@ -519,22 +520,22 @@ public void testNonReifiableFunction() {
 		final Nil<Function<Double[], Double[]>> doubleFunc = new Nil<>() {};
 		final Nil<Function<Integer[], Integer[]>> integerFunc = new Nil<>() {};
 
-		boolean successDouble = MatchingUtils.checkGenericAssignability(fooFunc
+		boolean successDouble = GenericAssignability.checkGenericAssignability(fooFunc
 			.getClass(), (ParameterizedType) doubleFunc.getType(), false);
 		Assert.assertTrue(successDouble);
-		boolean successInteger = MatchingUtils.checkGenericAssignability(fooFunc
+		boolean successInteger = GenericAssignability.checkGenericAssignability(fooFunc
 			.getClass(), (ParameterizedType) integerFunc.getType(), false);
 		Assert.assertTrue(successInteger);
 	}
 
 	@Test(expected = NullPointerException.class)
 	public void testIsAssignableNullToNull() {
-		MatchingUtils.checkGenericAssignability(null, null, false);
+		GenericAssignability.checkGenericAssignability(null, null, false);
 	}
 
 	@Test(expected = NullPointerException.class)
 	public void testIsAssignableClassToNull() {
-		MatchingUtils.checkGenericAssignability(Object.class, null, false);
+		GenericAssignability.checkGenericAssignability(Object.class, null, false);
 	}
 
 	@Test
@@ -554,9 +555,9 @@ public <T extends Number> void testIsAssignableOutputToObject() {
 		final Type fooSource = new Nil<Function<T, List<T>>>() {}.getType();
 		final Type fooFunc = new Nil<Function<Double, Object>>() {}.getType();
 
-		Assertions.assertFalse(MatchingUtils.checkGenericAssignability(fooSource,
+		Assertions.assertFalse(GenericAssignability.checkGenericAssignability(fooSource,
 			(ParameterizedType) fooFunc, false));
-		Assertions.assertTrue(MatchingUtils.checkGenericAssignability(fooSource,
+		Assertions.assertTrue(GenericAssignability.checkGenericAssignability(fooSource,
 			(ParameterizedType) fooFunc, true));
 
 	}
diff --git a/scijava/scijava-types/src/main/java/module-info.java b/scijava/scijava-types/src/main/java/module-info.java
index 0a51f22fc..92fa052b8 100644
--- a/scijava/scijava-types/src/main/java/module-info.java
+++ b/scijava/scijava-types/src/main/java/module-info.java
@@ -1,6 +1,7 @@
 module org.scijava.types {
 
 	exports org.scijava.types;
+	exports org.scijava.types.inference;
 
 	opens org.scijava.types.extractors to org.scijava;
 	opens org.scijava.types to org.scijava;
diff --git a/scijava/scijava-types/src/main/java/org/scijava/types/inference/GenericAssignability.java b/scijava/scijava-types/src/main/java/org/scijava/types/inference/GenericAssignability.java
new file mode 100644
index 000000000..33f8fd093
--- /dev/null
+++ b/scijava/scijava-types/src/main/java/org/scijava/types/inference/GenericAssignability.java
@@ -0,0 +1,767 @@
+
+package org.scijava.types.inference;
+
+import com.google.common.base.Objects;
+
+import java.lang.reflect.GenericArrayType;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.lang.reflect.WildcardType;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+
+import org.scijava.types.Any;
+import org.scijava.types.Nil;
+import org.scijava.types.Types;
+
+public class GenericAssignability {
+
+	/**
+	 * @param src the type for which assignment should be checked from
+	 * @param dest the parameterized type for which assignment should be checked
+	 *          to
+	 * @param safeAssignability used to determine if we want to check if the
+	 *          src->dest assignment would be safely assignable even though it
+	 *          would cause a compiler error if we explicitly tried to do this
+	 *          (useful pretty much only for Op matching)
+	 * @return whether and assignment of source to destination would be a legal
+	 *         java statement
+	 */
+	public static boolean checkGenericAssignability(Type src,
+		ParameterizedType dest, boolean safeAssignability)
+	{
+		return GenericAssignability.checkGenericAssignability(src, dest, null,
+			safeAssignability);
+	}
+
+	/**
+	 * Checks whether it would be legal to assign the {@link Type} source to the
+	 * specified {@link ParameterizedType} destination (which could possibly be a
+	 * supertype of the source type). Thereby, possible {@link TypeVariable}s
+	 * contained in the parameters of the source are tried to be inferred in the
+	 * sense of empty angle brackets when a new object is created:
+	 *
+	 * <pre>
+	 * 
+	 * List&lt;Integer&gt; listOfInts = new ArrayList&lt;&gt;();
+	 * </pre>
+	 *
+	 * Hence, the types to put between the brackets are tried to be determined.
+	 * Inference will be done by simple matching of an encountered
+	 * {@link TypeVariable} in the source to the corresponding type in the
+	 * parameters of the destination. If an {@link TypeVariable} is encountered
+	 * more than once, the corresponding type in the destination needs to
+	 * perfectly match. Else, false will be returned.</br>
+	 * </br>
+	 * Examples:
+	 * <ul>
+	 * If we have a class:
+	 * <li>
+	 *
+	 * <pre>
+	 * class NumberSupplier&lt;M extends Number&gt; implements Supplier&lt;M&gt;
+	 * </li>
+	 * </ul>
+	 * <ul>
+	 * The following check will return true:
+	 * <li>
+	 *
+	 * <pre>
+	 * checkGenericAssignability(NumberSupplier.class, new
+	 * Nil&lt;Supplier&lt;Double&gt;&gt;() {}.getType())</li>
+	 * </ul>
+	 * </ul>
+	 * <ul>
+	 * Which will check if the following assignment would be legal:
+	 * <li>
+	 *
+	 * <pre>
+	 * Supplier&lt;Double&gt; list = new NumberSupplier&lt;&gt;()</li>
+	 * </ul>
+	 * </ul>
+	 * <ul>
+	 * Here, the parameter {@code <M extends Number>} can be inferred to be of
+	 * type {@code Double} from the type {@code Supplier<Double>}
+	 * </ul>
+	 * <ul>
+	 * Consequently the following will return false:
+	 * <li>
+	 *
+	 * <pre>
+	 * checkGenericAssignability(NumberSupplier.class, new
+	 * Nil&lt;Supplier&lt;String&gt;&gt;() {}.getType())</li>
+	 * </ul>
+	 * <ul>
+	 * {@code <M extends Number>} can't be inferred, as type {@code String} is not
+	 * within the bounds of {@code M}.
+	 * </ul>
+	 * <ul>
+	 * Furthermore, the following will return false for:
+	 * {@code class NumberFunc<M extends Number> implements Function<M, M>}:
+	 * <li>
+	 *
+	 * <pre>
+	 * checkGenericAssignability(NumberSupplier.class, new
+	 * Nil&lt;Function&lt;Double, Integer&gt;&gt;() {}.getType())</li>
+	 * </ul>
+	 * <ul>
+	 * {@code <M extends Number>} can't be inferred, as types {@code Double} and
+	 * {@code Integer} are ambiguous for {@code M}.
+	 * </ul>
+	 *
+	 * @param src the type for which assignment should be checked from
+	 * @param dest the parameterized type for which assignment should be checked
+	 *          to
+	 * @param typeVarAssigns the map of {@link TypeVariable}s to {@link Type}s to
+	 *          populate with what would occur in this scenario; must be empty or
+	 *          null
+	 * @param safeAssignability used to determine if we want to check if the
+	 *          src->dest assignment would be safely assignable even though it
+	 *          would cause a compiler error if we explicitly tried to do this
+	 *          (useful pretty much only for Op matching)
+	 * @return whether and assignment of source to destination would be a legal
+	 *         java statement
+	 */
+	public static boolean checkGenericAssignability(Type src,
+		ParameterizedType dest, Map<TypeVariable<?>, Type> typeVarAssigns,
+		boolean safeAssignability)
+	{
+		if (typeVarAssigns == null) {
+			typeVarAssigns = new HashMap<>();
+		}
+		else if (!typeVarAssigns.isEmpty()) {
+			throw new IllegalArgumentException(
+				"Expected empty typeVarAssigns but contained " + typeVarAssigns.size() +
+					" entries");
+		}
+
+		// fail fast when raw types are not assignable
+		if (!Types.isAssignable(Types.raw(src), Types.raw(dest))) return false;
+
+		// when raw types are assignable, check the type variables of src and dest
+		Type[] srcTypes = typeParamsAgainstClass(src, Types.raw(dest));
+		Type[] destTypes = dest.getActualTypeArguments();
+
+		// if there are no type parameters in src (w.r.t. dest), do a basic
+		// assignability check.
+		if (srcTypes.length == 0) return Types.isAssignable(src, dest);
+		// if there are type parameters, do a more complicated assignability check.
+		boolean result = checkGenericAssignability(srcTypes, destTypes, src, dest,
+			typeVarAssigns, safeAssignability);
+		return result;
+	}
+
+	/**
+	 * Finds the levels of casting between <code>origin</code> and
+	 * <code>dest</code>. Returns 0 if dest and origin are the same. Returns -1 if
+	 * dest is not assignable from origin.
+	 */
+	public static int findCastLevels(final Class<?> dest, final Class<?> origin) {
+		if (dest.equals(origin)) return 0;
+
+		int level = 1;
+		Class<?> currType = origin;
+		// BFS if dest is an interface
+		if (dest.isInterface()) {
+			final HashSet<String> seen = new HashSet<>();
+			final ArrayList<Type> currIfaces = new ArrayList<>(Arrays.asList(currType
+				.getGenericInterfaces()));
+			do {
+				final ArrayList<Type> nextIfaces = new ArrayList<>();
+				for (final Type iface : currIfaces) {
+					if (seen.contains(iface.getTypeName())) continue;
+
+					final Class<?> cls = getClass(iface);
+					if (cls.equals(dest)) return level;
+					seen.add(iface.getTypeName());
+					nextIfaces.addAll(Arrays.asList(cls.getGenericInterfaces()));
+				}
+				currIfaces.clear();
+				currIfaces.addAll(nextIfaces);
+				if (currType.getSuperclass() != null) {
+					currType = currType.getSuperclass();
+					currIfaces.addAll(Arrays.asList(currType.getGenericInterfaces()));
+				}
+				level++;
+			}
+			while (!currIfaces.isEmpty() || currType.getSuperclass() != null);
+		}
+		// otherwise dest is a class, so search the list of ancestors
+		else {
+			while (currType.getSuperclass() != null) {
+				currType = currType.getSuperclass();
+				if (currType.equals(dest)) return level;
+				level++;
+			}
+		}
+		return -1;
+	}
+
+	/**
+	 * Gets the "useful" class information carries on the given object, which
+	 * depends on the actual type of the object.
+	 */
+	public static Class<?> getClass(final Object obj) {
+		if (obj == null) return null;
+		if (obj instanceof Nil) return getClass(((Nil<?>) obj).getType());
+		if (obj instanceof Class) return (Class<?>) obj;
+		if (obj instanceof ParameterizedType)
+			return (Class<?>) ((ParameterizedType) obj).getRawType();
+		return obj.getClass();
+	}
+
+	/**
+	 * Finds the type parameters of the most specific super type of the specified
+	 * subType whose erasure is the specified superErasure. Hence, will return the
+	 * type parameters of superErasure possibly narrowed down by subType. If
+	 * superErasure is not raw or not a super type of subType, an empty array will
+	 * be returned.
+	 *
+	 * @param subType the type to narrow down type parameters
+	 * @param superErasure the erasure of an super type of subType to get the
+	 *          parameters from
+	 * @return type parameters of superErasure possibly narrowed down by subType,
+	 *         or empty type array if no exists or superErasure is not a super
+	 *         type of subtype
+	 */
+	public static Type[] getParams(Class<?> subType, Class<?> superErasure) {
+		Type pt = Types.parameterizeRaw(subType);
+		Type superType = Types.getExactSuperType(pt, superErasure);
+		if (superType != null && superType instanceof ParameterizedType) {
+			return ((ParameterizedType) superType).getActualTypeArguments();
+		}
+		return new Type[0];
+	}
+
+	/**
+	 * Tries to infer type vars contained in types from corresponding types from
+	 * inferFrom, putting them into the specified map. <b>When a
+	 * {@link TypeInferenceException} is thrown, the caller should assume that
+	 * some of the mappings within {@code typeMappings} are incorrect.</b>
+	 *
+	 * @param types - the types containing {@link TypeVariable}s
+	 * @param inferFroms - the types used to infer the {@link TypeVariable}s
+	 *          within {@code types}
+	 * @param typeVarAssigns - the mapping of {@link TypeVariable}s to
+	 *          {@link Type}s
+	 */
+	public static void inferTypeVariables(Type[] types, Type[] inferFroms,
+		Map<TypeVariable<?>, Type> typeVarAssigns)
+	{
+		Map<TypeVariable<?>, TypeMapping> typeMappings = new HashMap<>();
+		try {
+			inferTypeVariables(types, inferFroms, typeMappings, true);
+			typeVarAssigns.putAll(new TypeVarAssigns(typeMappings));
+		}
+		catch (TypeInferenceException e) {
+			throw new IllegalArgumentException(e);
+		}
+	}
+
+	/**
+	 * We know that the special types for the Op candidate and what we asked for
+	 * are the same (i.e. that we are trying to determine if one Function can be
+	 * assigned to another Function). There are some situations (that are
+	 * particularly common when using ops.run()) where the Function SHOULD NOT
+	 * NORMALLY MATCH UP but WE KNOW IT WILL BE SAFE TO ASSIGN. This method
+	 * attempts to tease those situations out as a last resort.
+	 * 
+	 * @param destTypes - the array of Parameterized types of the OpInfo we called
+	 *          the matcher on (in the case of ops.run(), it is a Type array of
+	 *          the types of the args we passed through.)
+	 * @param typeVarAssigns - a Map of all of the Type Variables already
+	 *          determined.
+	 * @param dest - the speical type of the Op that we want to find a match for
+	 *          (determined by the user / ops.run())
+	 * @return boolean - true if we can safely match this Op even though the types
+	 *         do not directly match up. False otherwise.
+	 */
+	public static boolean isSafeAssignable(Type[] destTypes,
+		Map<TypeVariable<?>, Type> typeVarAssigns, Type src, Type dest)
+	{
+
+		Method[] destMethods = Arrays.stream(Types.raw(dest).getDeclaredMethods())
+			.filter(method -> Modifier.isAbstract(method.getModifiers())).toArray(
+				Method[]::new);
+		if (destMethods.length == 0) {
+			throw new IllegalArgumentException(src +
+				" does not have an abstract method!");
+		}
+		Type[] params = Types.getExactParameterTypes(destMethods[0], src);
+		Type returnType = Types.getExactReturnType(destMethods[0], src);
+		for (int i = 0; i < params.length; i++) {
+			if (!Types.isAssignable(destTypes[i], params[i], typeVarAssigns))
+				return false;
+		}
+
+		// Computers will have void as their return type, meaning that there is no
+		// output to check.
+		if (returnType == void.class) return true;
+
+		return Types.isAssignable(returnType, destTypes[destTypes.length - 1],
+			typeVarAssigns);
+	}
+
+	/**
+	 * Map type vars in specified type list to types using the specified map. In
+	 * doing so, type vars mapping to other type vars will not be followed but
+	 * just replaced.
+	 *
+	 * @param typesToMap
+	 * @param typeAssigns
+	 * @return a copy of {@code typesToMap} in which the {@link TypeVariable}s
+	 *         (that are present in {@code typeAssigns}) are mapped to the
+	 *         associated values within the {@code Map}.
+	 */
+	public static Type[] mapVarToTypes(Type[] typesToMap,
+		Map<TypeVariable<?>, Type> typeAssigns)
+	{
+		return Arrays.stream(typesToMap).map(type -> Types.unrollVariables(
+			typeAssigns, type, false)).toArray(Type[]::new);
+	}
+
+	/**
+	 * Obtains the type parameters of {@link Type} {@code src} <b>with respect
+	 * to</b> the {@link Class} {@code dest}. When {@code src} has no type
+	 * parameters (or is not a subclass of {@code dest}), an empty array is
+	 * returned.
+	 *
+	 * @param src - the {@code Type} whose type parameters will be returned.
+	 * @param superclass - the {@code Class} against which we want the type
+	 *          parameters of {@code src}
+	 * @return an array of {@code Type}s denoting the type
+	 */
+	public static Type[] typeParamsAgainstClass(Type src, Class<?> superclass) {
+		// only classes and ParameterizedTypes can have type parameters
+		if (!(src instanceof Class || src instanceof ParameterizedType))
+			return new Type[0];
+		Type superSrc = superType(src, superclass);
+		if (superSrc == null) return new Type[0];
+		if (superSrc instanceof ParameterizedType)
+			return ((ParameterizedType) superSrc).getActualTypeArguments();
+		return getParams(Types.raw(src), superclass);
+	}
+
+	/**
+	 * @param srcTypes the Type arguments for the source Type
+	 * @param destTypes the Type arguments for the destination Type
+	 * @param src the type for which assignment should be checked from
+	 * @param dest the parameterized type for which assignment should be checked
+	 *          to
+	 * @param typeVarAssigns the map of {@link TypeVariable}s to
+	 *          {@link TypeMapping}s that would occur in this scenario
+	 * @param safeAssignability used to determine if we want to check if the
+	 *          src->dest assignment would be safely assignable even though it
+	 *          would cause a compiler error if we explicitly tried to do this
+	 *          (useful pretty much only for Op matching)
+	 * @return whether and assignment of source to destination would be a legal
+	 *         java statement
+	 */
+	private static boolean checkGenericAssignability(Type[] srcTypes,
+		Type[] destTypes, Type src, Type dest,
+		Map<TypeVariable<?>, Type> typeVarAssigns, boolean safeAssignability)
+	{
+		// if the number of type arguments does not match, the types can't be
+		// assignable
+		if (srcTypes.length != destTypes.length) {
+			return false;
+		}
+
+		try {
+			// Try to infer type variables contained in the type arguments of
+			// sry
+			inferTypeVariables(srcTypes, destTypes, typeVarAssigns);
+		}
+		catch (IllegalArgumentException e) {
+			// types can't be inferred
+			// TODO: Consider the situations in which it is okay that the type
+			// variables cannot be inferred. For example, if we have a
+			// Function<Comparable<T>, Comparable<T>> and we ask for a
+			// Function<Double, Object>, it is okay that we cannot infer the T of
+			// Comparable<T> from Object since a Comparable<T> is an Object for any T.
+			// It would be nice if we could just return false any time we catch a
+			// TypeInferenceException, but until we sort this out, we cannot do so.
+			return safeAssignability && isSafeAssignable(destTypes, typeVarAssigns,
+				src, dest);
+		}
+
+		// Map TypeVariables in src to Types
+		Class<?> matchingRawType = Types.raw(dest);
+		Type[] mappedSrcTypes = mapVarToTypes(srcTypes, typeVarAssigns);
+		Type inferredSrcType = Types.parameterize(matchingRawType, mappedSrcTypes);
+
+		// Check assignability
+		if (Types.isAssignable(inferredSrcType, dest, typeVarAssigns)) return true;
+
+		return safeAssignability && isSafeAssignable(destTypes, typeVarAssigns, src,
+			dest);
+	}
+
+	/**
+	 * Current java language specifications allow either:
+	 * <ul>
+	 * <li>one {@code Object} upper bound and one lower bound
+	 * <li>one (arbitrary) upper bound and no lower bounds
+	 * </ul>
+	 * We rely on this fact for the purposes of inferring type variables.
+	 *
+	 * @param type
+	 * @return the <b>singular</b> {@link Type} that bounds this
+	 *         {@link TypeVariable}. The returned {@code Type} could be
+	 *         <b>either</b> a lower <b>or</b> upper bound (we do not care for the
+	 *         sole purpose of type inference).
+	 */
+	private static Type getInferrableBound(WildcardType type) {
+		Type[] lBounds = type.getLowerBounds();
+		Type[] uBounds = type.getUpperBounds();
+		if (lBounds.length == 1 && uBounds.length == 1 &&
+			uBounds[0] == Object.class) return lBounds[0];
+		else if (lBounds.length == 0 && uBounds.length == 1) return uBounds[0];
+		else throw new IllegalArgumentException(
+			"Illegal WildcardType: Current Java Language Specification does not allow " +
+				type + " to simultaneously have upper bounds " + uBounds +
+				" and lower bounds " + lBounds);
+	}
+
+	private static void inferTypeVariables(Class<?> type, Type inferFrom,
+		Map<TypeVariable<?>, TypeMapping> typeMappings)
+	{
+		if (inferFrom instanceof TypeVariable<?>) {
+			TypeVarAssigns typeVarAssigns = new TypeVarAssigns(typeMappings);
+			// If current type var is absent put it to the map. Otherwise,
+			// we already encountered that var.
+			// Hence, we require them to be exactly the same.
+			if (Types.isAssignable(type, inferFrom, typeVarAssigns)) {
+				Type current = typeVarAssigns.putIfAbsent((TypeVariable<?>) inferFrom,
+					type);
+				if (current != null) {
+					if (current instanceof Any) {
+						typeVarAssigns.put((TypeVariable<?>) inferFrom, type);
+					}
+					else if (!Objects.equal(type, current)) {
+						throw new TypeInferenceException();
+					}
+				}
+			}
+		}
+	}
+
+	private static void inferTypeVariables(GenericArrayType type, Type inferFrom,
+		Map<TypeVariable<?>, TypeMapping> typeMappings)
+	{
+		if (inferFrom instanceof Class<?> && ((Class<?>) inferFrom).isArray()) {
+			Type componentType = type.getGenericComponentType();
+			Type componentInferFrom = ((Class<?>) inferFrom).getComponentType();
+			inferTypeVariables(componentType, componentInferFrom, typeMappings);
+		}
+		else if (inferFrom instanceof WildcardType) {
+			Type inferrableBound = getInferrableBound((WildcardType) inferFrom);
+			inferTypeVariables(type, inferrableBound, typeMappings);
+		}
+		else throw new TypeInferenceException(inferFrom +
+			" cannot be implicitly cast to " + type +
+			", thus it is impossible to infer type variables for " + inferFrom);
+	}
+
+	private static void inferTypeVariables(ParameterizedType type, Type inferFrom,
+		Map<TypeVariable<?>, TypeMapping> typeMappings)
+	{
+		if (inferFrom instanceof WildcardType) {
+			inferFrom = getInferrableBound((WildcardType) inferFrom);
+		}
+		if (inferFrom instanceof Any) {
+			Any any = (Any) inferFrom;
+			mapTypeVarsToAny(type, any, typeMappings);
+			return;
+		}
+		// Finding the supertype here is really important. Suppose that we are
+		// inferring from a StrangeThing<Long> extends Thing<Double> and our
+		// Op requires a Thing<T>. We need to ensure that T gets
+		// resolved to a Double and NOT a Long.
+		Type superInferFrom = Types.getExactSuperType(inferFrom, Types.raw(type));
+		if (superInferFrom instanceof ParameterizedType) {
+			ParameterizedType paramInferFrom = (ParameterizedType) superInferFrom;
+			inferTypeVariables(type.getActualTypeArguments(), paramInferFrom
+				.getActualTypeArguments(), typeMappings, false);
+		}
+		else if (superInferFrom instanceof Class) {
+			TypeVarAssigns typeVarAssigns = new TypeVarAssigns(typeMappings);
+			Type mappedType = Types.mapVarToTypes(type, typeVarAssigns);
+			// Use isAssignable to attempt to infer the type variables present in type
+			if (!Types.isAssignable(superInferFrom, mappedType, typeVarAssigns)) {
+				throw new TypeInferenceException(inferFrom +
+					" cannot be implicitly cast to " + mappedType +
+					", thus it is impossible to infer type variables for " + inferFrom);
+			}
+			// for all remaining unmapped type vars, map to Any
+			mapTypeVarsToAny(type, typeMappings);
+		}
+		// -- edge cases -> do our best -- //
+		else if (superInferFrom == null) {
+			// edge case 1: if inferFrom is an Object, superInferFrom will be null
+			// when type is some interface.
+			if (Object.class.equals(inferFrom)) {
+				mapTypeVarsToAny(type, typeMappings);
+				return;
+			}
+			// edge case 2: if inferFrom is a superType of type, we can get (some of)
+			// the types of type by finding the exact superType of type w.r.t.
+			// inferFrom.
+			Type superTypeOfType = Types.getExactSuperType(type, Types.raw(
+				inferFrom));
+			if (superTypeOfType == null) {
+				throw new TypeInferenceException(inferFrom +
+					" cannot be implicitly cast to " + type +
+					", thus it is impossible to infer type variables for " + inferFrom);
+			}
+			inferTypeVariables(superTypeOfType, inferFrom, typeMappings, false);
+			mapTypeVarsToAny(type, typeMappings);
+		}
+		// TODO: elaborate
+		else throw new IllegalStateException(superInferFrom +
+			" is the supertype of " + inferFrom + " with respect to " + type +
+			", however this cannot be (since " + type +
+			" is a ParamterizedType)! (Only a ParameterizedType, Class, or null " +
+			"can be returned from Types.getExactSuperType when it is called with a ParameterizedType!)");
+	}
+
+	private static void inferTypeVariables(Type type, Type inferFrom,
+		Map<TypeVariable<?>, TypeMapping> typeMappings, boolean malleable)
+	{
+		if (type instanceof TypeVariable) {
+			inferTypeVariables((TypeVariable<?>) type, inferFrom, typeMappings,
+				malleable);
+		}
+		else if (type instanceof ParameterizedType) {
+			inferTypeVariables((ParameterizedType) type, inferFrom, typeMappings);
+		}
+		else if (type instanceof WildcardType) {
+			inferTypeVariables((WildcardType) type, inferFrom, typeMappings);
+		}
+		else if (type instanceof GenericArrayType) {
+			inferTypeVariables((GenericArrayType) type, inferFrom, typeMappings);
+		}
+		else if (type instanceof Class) {
+			inferTypeVariables((Class<?>) type, inferFrom, typeMappings);
+		}
+
+	}
+
+	private static void inferTypeVariables(Type[] types, Type[] inferFroms,
+		Map<TypeVariable<?>, TypeMapping> typeMappings, boolean malleable)
+	{
+		// Ensure that the user has not passed a null map
+		if (typeMappings == null) throw new IllegalArgumentException(
+			"Type Variable map is null, cannot store mappings of TypeVariables to Types!");
+
+		if (types.length != inferFroms.length) throw new TypeInferenceException(
+			"Could not infer type variables: Type arrays must be of the same size");
+
+		for (int i = 0; i < types.length; i++) {
+			inferTypeVariables(types[i], inferFroms[i], typeMappings, malleable);
+		}
+		// Check if the inferred types satisfy their bounds
+		// TODO: can we do this in an efficient manner?
+		TypeVarAssigns typeVarAssigns = new TypeVarAssigns(typeMappings);
+		if (!Types.typesSatisfyVariables(typeVarAssigns)) {
+			throw new TypeInferenceException();
+		}
+	}
+
+	private static void inferTypeVariables(TypeVariable<?> type, Type inferFrom,
+		Map<TypeVariable<?>, TypeMapping> typeMappings, boolean malleable)
+	{
+		TypeMapping typeData = typeMappings.get(type);
+		// If current is not null then we have already encountered that
+		// variable. If so, we require them to be exactly the same, and throw a
+		// TypeInferenceException if they are not.
+		if (typeData != null) {
+			typeData.refine(inferFrom, malleable);
+		}
+		else {
+			resolveTypeInMap(type, inferFrom, typeMappings, malleable);
+			// Bounds could also contain type vars, hence possibly go into
+			// recursion
+			for (Type bound : type.getBounds()) {
+				if (bound instanceof TypeVariable && typeMappings.get(bound) != null) {
+					// If the bound of the current var (let's call it A) to
+					// infer is also a var (let's call it B):
+					// If we already encountered B, we check if the current
+					// type to infer from is assignable to
+					// the already inferred type for B. In this case we do
+					// not require equality as one var is
+					// bounded by another and it is not the same. E.g.
+					// assume we want to infer the types of vars:
+					// - - - A extends Number, B extends A
+					// From types:
+					// - - - Number, Double
+					// First A is bound to Number, next B to Double. Then we
+					// check the bounds for B. We encounter A,
+					// for which we already inferred Number. Hence, it
+					// suffices to check whether Double can be assigned
+					// to Number, it does not have to be equal as it is just
+					// a transitive bound for B.
+					Type typeAssignForBound = typeMappings.get(bound).getType();
+					if (!Types.isAssignable(inferFrom, typeAssignForBound)) {
+						throw new TypeInferenceException();
+					}
+				}
+				else {
+					// Else go into recursion as we encountered a new var.
+					inferTypeVariables(bound, inferFrom, typeMappings);
+				}
+			}
+
+		}
+	}
+
+	private static void inferTypeVariables(WildcardType type, Type inferFrom,
+		Map<TypeVariable<?>, TypeMapping> typeMappings)
+	{
+		Type inferrableBound = getInferrableBound(type);
+		if (inferFrom instanceof WildcardType) {
+			// NB if both type and inferFrom are Wildcards, it doesn't really matter
+			// (for the purpose of Type inference) whether those Wildcards have a
+			// defined upper or lower bound. It is only important that we compare
+			// those defined bounds, even if one is an upper bound and the other is a
+			// lower bound. If the Wildcards are not assignable (which is (always?)
+			// the case when one bound is an upper bound and the other is a lower
+			// bound), it is still possible to infer the type variables; despite doing
+			// so, checkGenericAssignability will return false.
+			inferFrom = getInferrableBound((WildcardType) inferFrom);
+		}
+		if (inferrableBound instanceof TypeVariable<?>) {
+			resolveTypeInMap((TypeVariable<?>) inferrableBound, inferFrom,
+				typeMappings, true);
+		}
+		else if (inferrableBound instanceof ParameterizedType) {
+			ParameterizedType parameterizedUpperBound =
+				(ParameterizedType) inferrableBound;
+			inferTypeVariables(parameterizedUpperBound, inferFrom, typeMappings,
+				true);
+		}
+		// TODO: consider checking inferrableBounds instanceof Class
+	}
+
+	private static void mapTypeVarsToAny(Type type, Any any,
+		Map<TypeVariable<?>, TypeMapping> typeMappings)
+	{
+		if (!Types.containsTypeVars(type)) return;
+
+		if (type instanceof TypeVariable) {
+			if (typeMappings.containsKey(type)) return;
+			TypeVariable<?> typeVar = (TypeVariable<?>) type;
+			typeMappings.put(typeVar, suitableTypeMapping(typeVar, any, true));
+		}
+		else if (type instanceof ParameterizedType) {
+			ParameterizedType pType = (ParameterizedType) type;
+			Type[] typeParams = pType.getActualTypeArguments();
+			for (Type typeParam : typeParams) {
+				mapTypeVarsToAny(typeParam, typeMappings);
+			}
+		}
+		else if (type instanceof WildcardType) {
+			WildcardType wildcard = (WildcardType) type;
+			for (Type lowerBound : wildcard.getLowerBounds())
+				mapTypeVarsToAny(lowerBound, typeMappings);
+			for (Type upperBound : wildcard.getUpperBounds())
+				mapTypeVarsToAny(upperBound, typeMappings);
+		}
+		else if (type instanceof Class) {
+			Class<?> clazz = (Class<?>) type;
+			for (Type typeParam : clazz.getTypeParameters())
+				mapTypeVarsToAny(typeParam, typeMappings);
+		}
+	}
+
+	private static void mapTypeVarsToAny(Type type,
+		Map<TypeVariable<?>, TypeMapping> typeMappings)
+	{
+		mapTypeVarsToAny(type, new Any(), typeMappings);
+	}
+
+	private static void resolveTypeInMap(TypeVariable<?> typeVar, Type newType,
+		Map<TypeVariable<?>, TypeMapping> typeMappings, boolean malleability)
+	{
+		if (typeMappings.containsKey(typeVar)) {
+			typeMappings.get(typeVar).refine(newType, malleability);
+		}
+		else {
+			typeMappings.put(typeVar, suitableTypeMapping(typeVar, newType,
+				malleability));
+		}
+	}
+
+	private static TypeMapping suitableTypeMapping(TypeVariable<?> typeVar,
+		Type newType, boolean malleability)
+	{
+		if (newType instanceof WildcardType) {
+			return new WildcardTypeMapping(typeVar, (WildcardType) newType,
+				malleability);
+		}
+		return new TypeMapping(typeVar, newType, malleability);
+	}
+
+	/**
+	 * This method is designed to handle edge cases when calling
+	 * {@link Types#getExactSuperType(Type, Class)}. When
+	 * {@code getExactSuperType} returns an error, this usually implies some funny
+	 * business going on with the {@link Type} that was passed to it. We are not
+	 * interested in supporting this business, since it usually results from poor
+	 * practice in Class construction. TODO: determine some way of conveying to
+	 * the user that GenTyRef doesn't like their inputs.
+	 *
+	 * @param src
+	 * @param superClass
+	 * @return - the supertype of {@code src} with rawtype {@code superClass}, or
+	 *         {@code null} if no such supertype exists.
+	 */
+	private static Type superType(Type src, Class<?> superClass) {
+		try {
+			return Types.getExactSuperType(src, superClass);
+		}
+		catch (AssertionError e) {
+			// can be thrown when
+			return null;
+		}
+	}
+
+	/**
+	 * Tries to infer type vars contained in types from corresponding types from
+	 * inferFrom, putting them into the specified map. <b>When a
+	 * {@link TypeInferenceException} is thrown, the caller should assume that
+	 * some of the mappings within {@code typeMappings} are incorrect.</b>
+	 *
+	 * @param type
+	 * @param inferFrom
+	 * @param typeMappings
+	 */
+	static void inferTypeVariables(Type type, Type inferFrom,
+		Map<TypeVariable<?>, TypeMapping> typeMappings)
+	{
+		inferTypeVariables(type, inferFrom, typeMappings, true);
+	}
+
+	/**
+	 * Tries to infer type vars contained in types from corresponding types from
+	 * inferFrom, putting them into the specified map. <b>When a
+	 * {@link TypeInferenceException} is thrown, the caller should assume that
+	 * some of the mappings within {@code typeMappings} are incorrect.</b>
+	 *
+	 * @param type
+	 * @param inferFrom
+	 * @param typeMappings
+	 */
+	static void inferTypeVariablesWithTypeMappings(Type type[], Type[] inferFrom,
+		Map<TypeVariable<?>, TypeMapping> typeMappings)
+	{
+		inferTypeVariables(type, inferFrom, typeMappings, true);
+	}
+
+}
diff --git a/scijava/scijava-types/src/main/java/org/scijava/types/inference/TypeInferenceException.java b/scijava/scijava-types/src/main/java/org/scijava/types/inference/TypeInferenceException.java
new file mode 100644
index 000000000..a9c9fe7f9
--- /dev/null
+++ b/scijava/scijava-types/src/main/java/org/scijava/types/inference/TypeInferenceException.java
@@ -0,0 +1,19 @@
+package org.scijava.types.inference;
+
+/**
+ * Exception indicating that type vars could not be inferred.
+ */
+public class TypeInferenceException extends RuntimeException {
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 7147530827546663700L;
+	
+	public TypeInferenceException() {
+		super();
+	}
+	
+	public TypeInferenceException(String message) {
+		super(message);
+	}
+}
diff --git a/scijava/scijava-types/src/main/java/org/scijava/types/inference/TypeMapping.java b/scijava/scijava-types/src/main/java/org/scijava/types/inference/TypeMapping.java
new file mode 100644
index 000000000..7daf310bc
--- /dev/null
+++ b/scijava/scijava-types/src/main/java/org/scijava/types/inference/TypeMapping.java
@@ -0,0 +1,110 @@
+package org.scijava.types.inference;
+
+import com.google.common.base.Objects;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+
+import org.scijava.types.Any;
+import org.scijava.types.Types;
+
+/**
+ * A data structure retaining information about the mapping of a
+ * {@link TypeVariable} to a {@link Type} within a type-inferring context.
+ * 
+ * @author Gabriel Selzer
+ */
+public class TypeMapping {
+
+	protected final TypeVariable<?> typeVar;
+	protected Type mappedType;
+
+	/**
+	 * A boolean describing whether {@code mappedType} can be mutated in within
+	 * this set of {@link Type}s. The most common scenario in which a
+	 * {@link Type} <b>cannot</b> be mutated is when it is a type parameter of a
+	 * {@link ParameterizedType}. Once {@code malleable} is set to
+	 * {@code false}, {@code mappedType} <b>cannot</b> change, and
+	 * {@link TypeMapping#refine(Type, boolean)} will throw a
+	 * {@link TypeInferenceException} so long as {@code newType} is not the
+	 * exact same {@code Type} as {@mappedType}.
+	 */
+	boolean malleable;
+
+	public TypeMapping(TypeVariable<?> typeVar, Type mappedType,
+		boolean malleable)
+	{
+		this.typeVar = typeVar;
+		this.mappedType = mappedType;
+		this.malleable = malleable;
+	}
+
+	/**
+	 * Attempts to accommodate {@code newType} into the current mapping between
+	 * {@code typeVar} and {@code mappedType} <em>given</em> the existing
+	 * malleability of {@code mappedType} and the malleability imposed by
+	 * {@code newType}. If {@code newType} cannot be accommodated, a
+	 * {@link TypeInferenceException} will be thrown. Note that it is not a
+	 * guarantee that either the existing {@code mappedType} or {@code newType}
+	 * will become the new {@link #mappedType} after the method ends;
+	 * {@link #mappedType} could be a supertype of these two {@link Type}s.
+	 * 
+	 * @param otherType - the type that will be refined into {@link #mappedType}
+	 * @param newTypeMalleability - the malleability of {@code otherType},
+	 *          determined by the context from which {@code otherType} came.
+	 */
+	public void refine(Type otherType, boolean newTypeMalleability)
+	{
+		malleable &= newTypeMalleability;
+		if (mappedType instanceof Any) {
+			mappedType = otherType;
+			return;
+		}
+		if (otherType instanceof Any) {
+			return;
+		}
+		if (malleable) {
+			// TODO: consider the correct value of that boolean
+			Type superType = Types.greatestCommonSuperType(new Type[] { otherType,
+				mappedType }, false);
+			if (Types.isAssignable(superType, typeVar)) {
+				mappedType = superType;
+				return;
+			}
+			throw new TypeInferenceException(typeVar +
+				" cannot simultaneoustly be mapped to " + otherType + " and " +
+				mappedType);
+		}
+		if (Objects.equal(mappedType, otherType)) return;
+		throw new TypeInferenceException(typeVar +
+			" cannot simultaneoustly be mapped to " + otherType + " and " +
+			mappedType);
+	}
+
+	/**
+	 * @return the {@link Type} associated with this {@link TypeVariable}
+	 */
+	public Type getType() {
+		return mappedType;
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hashCode(typeVar, mappedType, malleable);
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (!(o instanceof TypeMapping)) return false;
+		final TypeMapping that = (TypeMapping) o;
+		return Objects.equal(typeVar, that.typeVar) && //
+			Objects.equal(mappedType, that.mappedType) && //
+			Objects.equal(malleable, that.malleable);
+	}
+
+	@Override
+	public String toString() {
+		return mappedType.toString();
+	}
+}
diff --git a/scijava/scijava-types/src/main/java/org/scijava/types/inference/TypeVarAssigns.java b/scijava/scijava-types/src/main/java/org/scijava/types/inference/TypeVarAssigns.java
new file mode 100644
index 000000000..5ee45ba7e
--- /dev/null
+++ b/scijava/scijava-types/src/main/java/org/scijava/types/inference/TypeVarAssigns.java
@@ -0,0 +1,134 @@
+
+package org.scijava.types.inference;
+
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.lang.reflect.WildcardType;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.scijava.types.Types;
+
+/**
+ * Adapter class wrapping a {@code Map<TypeVariable, TypeMapping>} into a
+ * {@code Map<TypeVariable, Type>} for use with {@link Types} API.
+ */
+public class TypeVarAssigns implements Map<TypeVariable<?>, Type> {
+
+	private static TypeMapping suitableTypeMapping(TypeVariable<?> typeVar,
+		Type newType, boolean malleability)
+	{
+		if (newType instanceof WildcardType) {
+			return new WildcardTypeMapping(typeVar, (WildcardType) newType,
+				malleability);
+		}
+		return new TypeMapping(typeVar, newType, malleability);
+	}
+
+	private Map<TypeVariable<?>, TypeMapping> map;
+
+	public TypeVarAssigns(Map<TypeVariable<?>, TypeMapping> map) {
+		this.map = map;
+	}
+
+	@Override
+	public void clear() {
+		map.clear();
+	}
+
+	@Override
+	public boolean containsKey(Object key) {
+		return map.containsKey(key);
+	}
+
+	@Override
+	public boolean containsValue(Object value) {
+		return map.containsValue(value);
+	}
+
+	@Override
+	public Set<Entry<TypeVariable<?>, Type>> entrySet() {
+		return map.entrySet().stream().map(e -> {
+			return new Map.Entry<TypeVariable<?>, Type>() {
+
+				@Override
+				public TypeVariable<?> getKey() {
+					return e.getKey();
+				}
+
+				@Override
+				public Type getValue() {
+					return get(getKey());
+				}
+
+				@Override
+				public Type setValue(Type value) {
+					return put(getKey(), value);
+				}
+			};
+		}).collect(Collectors.toSet());
+	}
+
+	@Override
+	public Type get(Object key) {
+		TypeMapping value = map.get(key);
+		return value == null ? null : value.getType();
+	}
+
+	@Override
+	public boolean isEmpty() {
+		return map.isEmpty();
+	}
+
+	@Override
+	public Set<TypeVariable<?>> keySet() {
+		return map.keySet();
+	}
+
+	@Override
+	public Type put(TypeVariable<?> typeVar, Type type) {
+		final TypeMapping previousMapping = //
+			map.put(typeVar, suitableTypeMapping(typeVar, type, isMalleable(
+				typeVar)));
+		return previousMapping == null ? null : previousMapping.getType();
+	}
+
+	@Override
+	public void putAll(Map<? extends TypeVariable<?>, ? extends Type> m) {
+		for (Map.Entry<? extends TypeVariable<?>, ? extends Type> e : m
+			.entrySet())
+		{
+			put(e.getKey(), e.getValue());
+		}
+	}
+
+	@Override
+	public Type putIfAbsent(TypeVariable<?> typeVar, Type type) {
+		if (!map.containsKey(typeVar)) return put(typeVar, type);
+		return get(typeVar);
+	}
+
+	@Override
+	public Type remove(Object key) {
+		TypeMapping value = map.remove(key);
+		return value == null ? null : value.getType();
+	}
+
+	@Override
+	public int size() {
+		return map.size();
+	}
+
+	@Override
+	public Collection<Type> values() {
+		return map.values().stream().map(v -> v.getType()).collect(Collectors
+			.toList());
+	}
+
+	private boolean isMalleable(TypeVariable<?> typeVar) {
+		return map.containsKey(typeVar) && map.get(typeVar).malleable;
+	}
+
+}
diff --git a/scijava/scijava-types/src/main/java/org/scijava/types/inference/WildcardTypeMapping.java b/scijava/scijava-types/src/main/java/org/scijava/types/inference/WildcardTypeMapping.java
new file mode 100644
index 000000000..be01f3869
--- /dev/null
+++ b/scijava/scijava-types/src/main/java/org/scijava/types/inference/WildcardTypeMapping.java
@@ -0,0 +1,123 @@
+
+package org.scijava.types.inference;
+
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.lang.reflect.WildcardType;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.scijava.types.Types;
+
+/**
+ * A data structure retaining information about the mapping of a
+ * {@link TypeVariable} to a {@link Type} bounded by a {@link WildcardType}
+ * within a type-inferring context.
+ * 
+ * @author Gabriel Selzer
+ */
+public class WildcardTypeMapping extends TypeMapping {
+
+	/**
+	 * Current Java Language Specifications allow only one lower bound on any
+	 * {@link WildcardType}. This method returns that singular bound, or
+	 * {@code null} if this {@code WildcardType} has no lower bound.
+	 *
+	 * @param newType - the {@link WildcardType} for which we will find the lower
+	 *          bound
+	 * @return the lower bound of {@code newType}
+	 */
+	private static Type getLowerBound(WildcardType newType) {
+		Type[] lowerBounds = newType.getLowerBounds();
+		if (lowerBounds.length == 0) {
+			return null;
+		}
+		else if (lowerBounds.length == 1) {
+			return lowerBounds[0];
+		}
+		throw new TypeInferenceException(newType + //
+			" is an impossible WildcardType. " + //
+			"The Java language specification currently prevents multiple lower bounds " + //
+			Arrays.toString(lowerBounds)); //
+	}
+
+	/**
+	 * Current Java Language Specifications allow only one upper bound on any
+	 * {@link WildcardType}. This method returns that singular bound, or
+	 * {@code null} if this {@code WildcardType} has no upper bound.
+	 *
+	 * @param newType - the {@link WildcardType} for which we will find the upper
+	 *          bound
+	 * @return the upper bound of {@code newType}
+	 */
+	private static Type getUpperBound(WildcardType newType) {
+		Type[] upperBounds = newType.getUpperBounds();
+		if (upperBounds.length == 0) {
+			return Object.class;
+		}
+		else if (upperBounds.length == 1) {
+			return upperBounds[0];
+		}
+		else {
+			throw new TypeInferenceException(newType + //
+				" is an impossible WildcardType. " + //
+				"The Java language specification currently prevents multiple upper bounds " + //
+				Arrays.toString(upperBounds)); //
+		}
+	}
+
+	private List<Type> lowerBoundList;
+
+	public WildcardTypeMapping(TypeVariable<?> typeVar, WildcardType mappedType,
+		boolean malleable)
+	{
+		super(typeVar, getUpperBound(mappedType), malleable);
+		lowerBoundList = new ArrayList<>();
+		Type mappedTypeLowerBound = getLowerBound(mappedType);
+		if (mappedTypeLowerBound != null) {
+			lowerBoundList.add(mappedTypeLowerBound);
+		}
+	}
+
+	/**
+	 * Attempts to accommodate {@code newType} into the current mapping between
+	 * {@code typeVar} and {@code mappedType} <em>given</em> the existing
+	 * malleability of {@code mappedType} and the malleability imposed by
+	 * {@code newType}. If {@code newType} cannot be accommodated, a
+	 * {@link TypeInferenceException} will be thrown. Note that it is not a
+	 * guarantee that either the existing {@code mappedType} or {@code newType}
+	 * will become the new {@link #mappedType} after the method ends;
+	 * {@link #mappedType} could be a supertype of these two {@link Type}s.
+	 * 
+	 * @param otherType - the type that will be refined into {@link #mappedType}
+	 * @param newTypeMalleability - the malleability of {@code otherType},
+	 *          determined by the context from which {@code otherType} came.
+	 */
+	@Override
+	public void refine(Type otherType, boolean newTypeMalleability) {
+		if (otherType instanceof WildcardType) {
+			refineWildcard((WildcardType) otherType, newTypeMalleability);
+		}
+		else {
+			super.refine(otherType, newTypeMalleability);
+		}
+		for (Type lowerBound : lowerBoundList) {
+			if (!Types.isAssignable(lowerBound, mappedType))
+				throw new TypeInferenceException(typeVar +
+					" cannot simultaneoustly be mapped to " + otherType + " and " +
+					mappedType);
+		}
+	}
+
+	private void refineWildcard(WildcardType otherType,
+		boolean newTypeMalleability)
+	{
+		Type otherLowerBound = getLowerBound(otherType);
+		if (otherLowerBound != null) {
+			lowerBoundList.add(otherLowerBound);
+		}
+		Type otherUpperBound = getUpperBound(otherType);
+		super.refine(otherUpperBound, newTypeMalleability);
+	}
+}
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/InferTypeVariablesTest.java b/scijava/scijava-types/src/test/java/org/scijava/types/inference/InferTypeVariablesTest.java
similarity index 64%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/InferTypeVariablesTest.java
rename to scijava/scijava-types/src/test/java/org/scijava/types/inference/InferTypeVariablesTest.java
index 5a5d7c0e4..7a2b953e0 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/InferTypeVariablesTest.java
+++ b/scijava/scijava-types/src/test/java/org/scijava/types/inference/InferTypeVariablesTest.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops.matcher;
+package org.scijava.types.inference;
 
 import static org.junit.Assert.assertEquals;
 
@@ -14,107 +14,39 @@
 import java.util.function.Function;
 
 import org.junit.Test;
-import org.scijava.ops.matcher.MatchingUtils.TypeInferenceException;
-import org.scijava.ops.matcher.MatchingUtils.TypeMapping;
-import org.scijava.ops.matcher.MatchingUtilsTest.StrangeThing;
-import org.scijava.ops.matcher.MatchingUtilsTest.Thing;
 import org.scijava.types.Any;
 import org.scijava.types.Nil;
 
 public class InferTypeVariablesTest {
 
-	@Test
-	public <I, O> void testSupertypeTypeInference()
-		throws TypeInferenceException
-	{
-		final Type t = new Nil<Function<Thing<I>, List<O>>>() {}.getType();
-		final Type[] tArgs = ((ParameterizedType) t).getActualTypeArguments();
-		final Type dest =
-			new Nil<Function<StrangeThing<Double, String>, List<Double>>>()
-			{}.getType();
-		final Type[] destArgs = ((ParameterizedType) dest).getActualTypeArguments();
-
-		final Map<TypeVariable<?>, MatchingUtils.TypeMapping> typeAssigns =
-			new HashMap<>();
-		MatchingUtils.inferTypeVariablesWithTypeMappings(tArgs, destArgs, typeAssigns);
-
-		// We expect I=String, O=Double
-		final Map<TypeVariable<?>, MatchingUtils.TypeMapping> expected =
-			new HashMap<>();
-		TypeVariable<?> typeVarI = (TypeVariable<?>) ((ParameterizedType) tArgs[0])
-			.getActualTypeArguments()[0];
-		expected.put(typeVarI, new TypeMapping(typeVarI, String.class, false));
-		TypeVariable<?> typeVarO = (TypeVariable<?>) ((ParameterizedType) tArgs[1])
-			.getActualTypeArguments()[0];
-		expected.put(typeVarO, new TypeMapping(typeVarO, Double.class, false));
+	class Bar {}
 
-		assertEquals(typeAssigns, expected);
-	}
+	static class FooThing extends RecursiveThing<FooThing> {}
 
-	@Test
-	public <T> void testWildcardTypeInference() throws TypeInferenceException {
-		final Type t = new Nil<T>() {}.getType();
-		final Type listWild = new Nil<List<? extends T>>() {}.getType();
-		final Type integer = new Nil<Integer>() {}.getType();
-		final Type listDouble = new Nil<List<Double>>() {}.getType();
-
-		final Type[] types = { listWild, t };
-		final Type[] inferFroms = { listDouble, integer };
+	static abstract class RecursiveThing<T extends RecursiveThing<T>> {}
 
-		final Map<TypeVariable<?>, MatchingUtils.TypeMapping> typeAssigns =
-			new HashMap<>();
-		MatchingUtils.inferTypeVariablesWithTypeMappings(types, inferFroms, typeAssigns);
+	class StrangeThing<N extends Number, T> extends Thing<T> {}
 
-		// We expect T=Number
-		final Map<TypeVariable<?>, MatchingUtils.TypeMapping> expected =
-			new HashMap<>();
-		TypeVariable<?> typeVar = (TypeVariable<?>) t;
-		expected.put(typeVar, new TypeMapping(typeVar, Number.class, true));
+	class Thing<T> {}
 
-		assertEquals(expected, typeAssigns);
-
-		final Type[] types2 = { t, t };
-		final Type listWildcardNumber = new Nil<List<? extends Number>>() {}
-			.getType();
-		final Type wildcardNumber = ((ParameterizedType) listWildcardNumber)
-			.getActualTypeArguments()[0];
-		final Type listWildcardDouble = new Nil<List<? extends Double>>() {}
-			.getType();
-		final Type wildcardDouble = ((ParameterizedType) listWildcardDouble)
-			.getActualTypeArguments()[0];
-
-		final Type[] inferFroms2 = { wildcardNumber, wildcardDouble };
-
-		final Map<TypeVariable<?>, MatchingUtils.TypeMapping> typeAssigns2 =
-			new HashMap<>();
-		MatchingUtils.inferTypeVariablesWithTypeMappings(types2, inferFroms2, typeAssigns2);
-
-		// We expect T=Number
-		final Map<TypeVariable<?>, MatchingUtils.TypeMapping> expected2 =
-			new HashMap<>();
-		TypeVariable<?> typeVar2 = (TypeVariable<?>) t;
-		expected2.put(typeVar2, new TypeMapping(typeVar, Number.class, true));
+	class TypedBar<E> extends Bar {
 
-		assertEquals(expected2, typeAssigns2);
+		E type;
 	}
 
 	@Test
-	public <T extends Number> void
-		testInferFromWildcardExtendingParameterizedType()
-			throws TypeInferenceException
+	public <T, U extends Comparable<Double>> void testInferFromTypeVar()
+		throws TypeInferenceException
 	{
-		final Nil<List<? extends Comparable<T>>> listT = new Nil<>() {};
-		final Nil<List<? extends Comparable<Double>>> listWildcard = new Nil<>() {};
+		final Type compT = new Nil<Comparable<T>>() {}.getType();
+		final Type u = new Nil<U>() {}.getType();
 
-		final Map<TypeVariable<?>, MatchingUtils.TypeMapping> typeAssigns =
-			new HashMap<>();
-		MatchingUtils.inferTypeVariables(listT.getType(), listWildcard.getType(),
-			typeAssigns);
+		final Map<TypeVariable<?>, TypeMapping> typeAssigns = new HashMap<>();
+		GenericAssignability.inferTypeVariables(compT, u, typeAssigns);
 
 		// We expect T=Double
 		final Type t = new Nil<T>() {}.getType();
-		final Map<TypeVariable<?>, MatchingUtils.TypeMapping> expected =
-			new HashMap<>();
+		final Map<TypeVariable<?>, TypeMapping> expected = new HashMap<>();
 		TypeVariable<?> typeVarT = (TypeVariable<?>) t;
 		expected.put(typeVarT, new TypeMapping(typeVarT, Double.class, false));
 
@@ -128,112 +60,44 @@ public <T extends Number> void testInferFromWildcardExtendingClass()
 		final Nil<List<? extends T>> listT = new Nil<>() {};
 		final Nil<List<? extends Double>> listWildcard = new Nil<>() {};
 
-		final Map<TypeVariable<?>, MatchingUtils.TypeMapping> typeAssigns =
-			new HashMap<>();
-		MatchingUtils.inferTypeVariables(listT.getType(), listWildcard.getType(),
-			typeAssigns);
+		final Map<TypeVariable<?>, TypeMapping> typeAssigns = new HashMap<>();
+		GenericAssignability.inferTypeVariables(listT.getType(), listWildcard
+			.getType(), typeAssigns);
 
 		// We expect T= (? extends Double)
 		final Type t = new Nil<T>() {}.getType();
-		final Map<TypeVariable<?>, MatchingUtils.TypeMapping> expected =
-			new HashMap<>();
+		final Map<TypeVariable<?>, TypeMapping> expected = new HashMap<>();
 		TypeVariable<?> typeVarT = (TypeVariable<?>) t;
 		Type mappedType = ((ParameterizedType) listWildcard.getType())
 			.getActualTypeArguments()[0];
 		WildcardType mappedWildcard = (WildcardType) mappedType;
-		expected.put(typeVarT, new MatchingUtils.WildcardTypeMapping(typeVarT,
-			mappedWildcard, true));
-
-		assertEquals(expected, typeAssigns);
-	}
-
-	@Test
-	public <T extends Number> void testInferWildcardAndClass()
-		throws TypeInferenceException
-	{
-		final Nil<List<? super T>> listT = new Nil<>() {};
-		final Nil<T> t = new Nil<>() {};
-		final Nil<List<? super Number>> listWildcard = new Nil<>() {};
-
-		Type[] types = new Type[] { listT.getType(), t.getType() };
-		Type[] inferFroms = new Type[] { listWildcard.getType(), Double.class };
-
-		final Map<TypeVariable<?>, MatchingUtils.TypeMapping> typeAssigns =
-			new HashMap<>();
-		MatchingUtils.inferTypeVariablesWithTypeMappings(types, inferFroms, typeAssigns);
-
-		// We expect T=Number
-		final Map<TypeVariable<?>, MatchingUtils.TypeMapping> expected =
-			new HashMap<>();
-		TypeVariable<?> typeVarT = (TypeVariable<?>) t.getType();
-		expected.put(typeVarT, new TypeMapping(typeVarT, Number.class, true));
+		expected.put(typeVarT, new WildcardTypeMapping(typeVarT, mappedWildcard,
+			true));
 
 		assertEquals(expected, typeAssigns);
 	}
 
 	@Test
-	public <T extends Number> void testInferSuperWildcard()
-		throws TypeInferenceException
-	{
-		final Nil<List<? super T>> listT = new Nil<>() {};
-		final Nil<List<? super Number>> listWildcard = new Nil<>() {};
-
-		final Map<TypeVariable<?>, MatchingUtils.TypeMapping> typeAssigns =
-			new HashMap<>();
-		MatchingUtils.inferTypeVariables(listT.getType(), listWildcard.getType(), typeAssigns);
-
-		// We expect T=Number
-		final Map<TypeVariable<?>, MatchingUtils.TypeMapping> expected =
-			new HashMap<>();
-		TypeVariable<?> typeVarT = (TypeVariable<?>) new Nil<T>() {}.getType();
-		expected.put(typeVarT, new TypeMapping(typeVarT, Number.class, true));
-
-		assertEquals(expected, typeAssigns);
-	}
-
-	@Test
-	public <T, U extends Comparable<Double>> void testInferFromTypeVar()
-		throws TypeInferenceException
+	public <T extends Number> void
+		testInferFromWildcardExtendingParameterizedType()
+			throws TypeInferenceException
 	{
-		final Type compT = new Nil<Comparable<T>>() {}.getType();
-		final Type u = new Nil<U>() {}.getType();
+		final Nil<List<? extends Comparable<T>>> listT = new Nil<>() {};
+		final Nil<List<? extends Comparable<Double>>> listWildcard = new Nil<>() {};
 
-		final Map<TypeVariable<?>, MatchingUtils.TypeMapping> typeAssigns =
-			new HashMap<>();
-		MatchingUtils.inferTypeVariables(compT, u, typeAssigns);
+		final Map<TypeVariable<?>, TypeMapping> typeAssigns = new HashMap<>();
+		GenericAssignability.inferTypeVariables(listT.getType(), listWildcard
+			.getType(), typeAssigns);
 
 		// We expect T=Double
 		final Type t = new Nil<T>() {}.getType();
-		final Map<TypeVariable<?>, MatchingUtils.TypeMapping> expected =
-			new HashMap<>();
+		final Map<TypeVariable<?>, TypeMapping> expected = new HashMap<>();
 		TypeVariable<?> typeVarT = (TypeVariable<?>) t;
 		expected.put(typeVarT, new TypeMapping(typeVarT, Double.class, false));
 
 		assertEquals(expected, typeAssigns);
 	}
 
-	@Test
-	public <T extends Number> void testInferTypeVarInconsistentMapping()
-		throws TypeInferenceException
-	{
-
-		final Type t = new Nil<T>() {}.getType();
-
-		final Type[] tArr = { t, t };
-		final Type[] badInferFrom = { Integer.class, Double.class };
-
-		Map<TypeVariable<?>, MatchingUtils.TypeMapping> typeAssigns =
-			new HashMap<>();
-		MatchingUtils.inferTypeVariablesWithTypeMappings(tArr, badInferFrom, typeAssigns);
-
-		// We expect T=Number
-		TypeVariable<?> typeVarT = (TypeVariable<?>) t;
-		Map<TypeVariable<?>, MatchingUtils.TypeMapping> expected = new HashMap<>();
-		expected.put(typeVarT, new TypeMapping(typeVarT, Number.class, true));
-
-		assertEquals(expected, typeAssigns);
-	}
-
 	@Test
 	public <T extends Number> void
 		testInferGenericArrayTypeFromExtendingWildcardType()
@@ -242,13 +106,12 @@ public <T extends Number> void testInferTypeVarInconsistentMapping()
 		final Type type = new Nil<List<T[]>>() {}.getType();
 		final Type inferFrom = new Nil<List<? extends Double[]>>() {}.getType();
 
-		Map<TypeVariable<?>, MatchingUtils.TypeMapping> typeAssigns =
-			new HashMap<>();
-		MatchingUtils.inferTypeVariables(type, inferFrom, typeAssigns);
+		Map<TypeVariable<?>, TypeMapping> typeAssigns = new HashMap<>();
+		GenericAssignability.inferTypeVariables(type, inferFrom, typeAssigns);
 
 		// We expect T=Double
 		TypeVariable<?> typeVarT = (TypeVariable<?>) new Nil<T>() {}.getType();
-		Map<TypeVariable<?>, MatchingUtils.TypeMapping> expected = new HashMap<>();
+		Map<TypeVariable<?>, TypeMapping> expected = new HashMap<>();
 		expected.put(typeVarT, new TypeMapping(typeVarT, Double.class, true));
 
 		assertEquals(expected, typeAssigns);
@@ -262,13 +125,12 @@ public <T extends Number> void testInferTypeVarInconsistentMapping()
 		final Type type = new Nil<List<T[]>>() {}.getType();
 		final Type inferFrom = new Nil<List<? super Double[]>>() {}.getType();
 
-		Map<TypeVariable<?>, MatchingUtils.TypeMapping> typeAssigns =
-			new HashMap<>();
-		MatchingUtils.inferTypeVariables(type, inferFrom, typeAssigns);
+		Map<TypeVariable<?>, TypeMapping> typeAssigns = new HashMap<>();
+		GenericAssignability.inferTypeVariables(type, inferFrom, typeAssigns);
 
 		// We expect T=Double
 		TypeVariable<?> typeVarT = (TypeVariable<?>) new Nil<T>() {}.getType();
-		Map<TypeVariable<?>, MatchingUtils.TypeMapping> expected = new HashMap<>();
+		Map<TypeVariable<?>, TypeMapping> expected = new HashMap<>();
 		expected.put(typeVarT, new TypeMapping(typeVarT, Double.class, true));
 
 		assertEquals(expected, typeAssigns);
@@ -281,56 +143,53 @@ public <O extends Number> void testInferOToAny()
 		final Type iterableO = new Nil<Iterable<O>>() {}.getType();
 		final Type object = Object.class;
 
-		Map<TypeVariable<?>, MatchingUtils.TypeMapping> typeAssigns =
-			new HashMap<>();
-		MatchingUtils.inferTypeVariables(iterableO, object, typeAssigns);
+		Map<TypeVariable<?>, TypeMapping> typeAssigns = new HashMap<>();
+		GenericAssignability.inferTypeVariables(iterableO, object, typeAssigns);
 
 		// We expect O = Any
 		TypeVariable<?> typeVarO = (TypeVariable<?>) new Nil<O>() {}.getType();
-		Map<TypeVariable<?>, MatchingUtils.TypeMapping> expected = new HashMap<>();
+		Map<TypeVariable<?>, TypeMapping> expected = new HashMap<>();
 		expected.put(typeVarO, new TypeMapping(typeVarO, new Any(), true));
 
 		assertEquals(expected, typeAssigns);
 	}
 
 	@Test
-	public <O extends Number> void testInferOToAnyWithInterface()
+	public <O extends Number> void testInferOToAnyWithClass()
 		throws TypeInferenceException
 	{
-		final Type type = new Nil<ArrayList<O>>() {}.getType();
-		final Type inferFrom = Cloneable.class;
+		final Type type = new Nil<TypedBar<O>>() {}.getType();
+		final Type inferFrom = Bar.class;
 
-		Map<TypeVariable<?>, MatchingUtils.TypeMapping> typeAssigns =
-			new HashMap<>();
-		MatchingUtils.inferTypeVariables(type, inferFrom, typeAssigns);
+		Map<TypeVariable<?>, TypeMapping> typeAssigns = new HashMap<>();
+		GenericAssignability.inferTypeVariables(type, inferFrom, typeAssigns);
 
 		// We expect O = Any
 		TypeVariable<?> typeVarO = (TypeVariable<?>) new Nil<O>() {}.getType();
-		Map<TypeVariable<?>, MatchingUtils.TypeMapping> expected = new HashMap<>();
+		Map<TypeVariable<?>, TypeMapping> expected = new HashMap<>();
 		expected.put(typeVarO, new TypeMapping(typeVarO, new Any(), true));
 
 		assertEquals(expected, typeAssigns);
 	}
-	
+
 	@Test
-	public <O extends Number> void testInferOToAnyWithClass()
+	public <O extends Number> void testInferOToAnyWithInterface()
 		throws TypeInferenceException
 	{
-		final Type type = new Nil<TypedBar<O>>() {}.getType();
-		final Type inferFrom = Bar.class;
+		final Type type = new Nil<ArrayList<O>>() {}.getType();
+		final Type inferFrom = Cloneable.class;
 
-		Map<TypeVariable<?>, MatchingUtils.TypeMapping> typeAssigns =
-			new HashMap<>();
-		MatchingUtils.inferTypeVariables(type, inferFrom, typeAssigns);
+		Map<TypeVariable<?>, TypeMapping> typeAssigns = new HashMap<>();
+		GenericAssignability.inferTypeVariables(type, inferFrom, typeAssigns);
 
 		// We expect O = Any
 		TypeVariable<?> typeVarO = (TypeVariable<?>) new Nil<O>() {}.getType();
-		Map<TypeVariable<?>, MatchingUtils.TypeMapping> expected = new HashMap<>();
+		Map<TypeVariable<?>, TypeMapping> expected = new HashMap<>();
 		expected.put(typeVarO, new TypeMapping(typeVarO, new Any(), true));
 
 		assertEquals(expected, typeAssigns);
 	}
-	
+
 	@Test
 	public <O extends Number> void testInferOToAnyWithRawType()
 		throws TypeInferenceException
@@ -338,29 +197,64 @@ public <O extends Number> void testInferOToAnyWithRawType()
 		final Type type = new Nil<TypedBar<O>>() {}.getType();
 		final Type inferFrom = TypedBar.class;
 
-		Map<TypeVariable<?>, MatchingUtils.TypeMapping> typeAssigns =
-			new HashMap<>();
-		MatchingUtils.inferTypeVariables(type, inferFrom, typeAssigns);
+		Map<TypeVariable<?>, TypeMapping> typeAssigns = new HashMap<>();
+		GenericAssignability.inferTypeVariables(type, inferFrom, typeAssigns);
 
 		// We expect O = Any
 		TypeVariable<?> typeVarO = (TypeVariable<?>) new Nil<O>() {}.getType();
-		Map<TypeVariable<?>, MatchingUtils.TypeMapping> expected = new HashMap<>();
+		Map<TypeVariable<?>, TypeMapping> expected = new HashMap<>();
 		expected.put(typeVarO, new TypeMapping(typeVarO, new Any(), true));
 
 		assertEquals(expected, typeAssigns);
 	}
 
 	@Test
-	public <O extends Number, I extends O> void testInferTypeVarExtendingTypeVar() {
+	public <O extends RecursiveThing<O>> void testInferRecursiveTypeVar() {
+		final Type type = new Nil<O>() {}.getType();
+		final Type inferFrom = FooThing.class;
+
+		Map<TypeVariable<?>, TypeMapping> typeAssigns = new HashMap<>();
+		GenericAssignability.inferTypeVariables(type, inferFrom, typeAssigns);
+
+		// We expect O = FooThing
+		TypeVariable<?> typeVarO = (TypeVariable<?>) new Nil<O>() {}.getType();
+		Map<TypeVariable<?>, TypeMapping> expected = new HashMap<>();
+		expected.put(typeVarO, new TypeMapping(typeVarO, FooThing.class, false));
+
+		assertEquals(expected, typeAssigns);
+	}
+
+	@Test
+	public <T extends Number> void testInferSuperWildcard()
+		throws TypeInferenceException
+	{
+		final Nil<List<? super T>> listT = new Nil<>() {};
+		final Nil<List<? super Number>> listWildcard = new Nil<>() {};
+
+		final Map<TypeVariable<?>, TypeMapping> typeAssigns = new HashMap<>();
+		GenericAssignability.inferTypeVariables(listT.getType(), listWildcard
+			.getType(), typeAssigns);
+
+		// We expect T=Number
+		final Map<TypeVariable<?>, TypeMapping> expected = new HashMap<>();
+		TypeVariable<?> typeVarT = (TypeVariable<?>) new Nil<T>() {}.getType();
+		expected.put(typeVarT, new TypeMapping(typeVarT, Number.class, true));
+
+		assertEquals(expected, typeAssigns);
+	}
+
+	@Test
+	public <O extends Number, I extends O> void
+		testInferTypeVarExtendingTypeVar()
+	{
 		final Type type = new Nil<I>() {}.getType();
 		final Type inferFrom = Double.class;
 
-		Map<TypeVariable<?>, MatchingUtils.TypeMapping> typeAssigns =
-			new HashMap<>();
-		MatchingUtils.inferTypeVariables(type, inferFrom, typeAssigns);
+		Map<TypeVariable<?>, TypeMapping> typeAssigns = new HashMap<>();
+		GenericAssignability.inferTypeVariables(type, inferFrom, typeAssigns);
 
 		// We expect I= Double, O = Double
-		Map<TypeVariable<?>, MatchingUtils.TypeMapping> expected = new HashMap<>();
+		Map<TypeVariable<?>, TypeMapping> expected = new HashMap<>();
 		TypeVariable<?> typeVarI = (TypeVariable<?>) new Nil<I>() {}.getType();
 		expected.put(typeVarI, new TypeMapping(typeVarI, Double.class, true));
 		TypeVariable<?> typeVarO = (TypeVariable<?>) new Nil<O>() {}.getType();
@@ -368,38 +262,122 @@ public <O extends Number, I extends O> void testInferTypeVarExtendingTypeVar() {
 
 		assertEquals(expected, typeAssigns);
 	}
-	
+
 	@Test
-	public <O extends RecursiveThing<O>> void testInferRecursiveTypeVar() {
-		final Type type = new Nil<O>() {}.getType();
-		final Type inferFrom = FooThing.class;
+	public <T extends Number> void testInferTypeVarInconsistentMapping()
+		throws TypeInferenceException
+	{
 
-		Map<TypeVariable<?>, MatchingUtils.TypeMapping> typeAssigns =
-			new HashMap<>();
-		MatchingUtils.inferTypeVariables(type, inferFrom, typeAssigns);
+		final Type t = new Nil<T>() {}.getType();
 
-		// We expect O = FooThing
-		TypeVariable<?> typeVarO = (TypeVariable<?>) new Nil<O>() {}.getType();
-		Map<TypeVariable<?>, MatchingUtils.TypeMapping> expected = new HashMap<>();
-		expected.put(typeVarO, new TypeMapping(typeVarO, FooThing.class, false));
+		final Type[] tArr = { t, t };
+		final Type[] badInferFrom = { Integer.class, Double.class };
+
+		Map<TypeVariable<?>, TypeMapping> typeAssigns = new HashMap<>();
+		GenericAssignability.inferTypeVariablesWithTypeMappings(tArr, badInferFrom,
+			typeAssigns);
+
+		// We expect T=Number
+		TypeVariable<?> typeVarT = (TypeVariable<?>) t;
+		Map<TypeVariable<?>, TypeMapping> expected = new HashMap<>();
+		expected.put(typeVarT, new TypeMapping(typeVarT, Number.class, true));
 
 		assertEquals(expected, typeAssigns);
 	}
 
-	class Bar {
-		
-	}
-	
-	class TypedBar<E> extends Bar {
-		E type;
+	@Test
+	public <T extends Number> void testInferWildcardAndClass()
+		throws TypeInferenceException
+	{
+		final Nil<List<? super T>> listT = new Nil<>() {};
+		final Nil<T> t = new Nil<>() {};
+		final Nil<List<? super Number>> listWildcard = new Nil<>() {};
+
+		Type[] types = new Type[] { listT.getType(), t.getType() };
+		Type[] inferFroms = new Type[] { listWildcard.getType(), Double.class };
+
+		final Map<TypeVariable<?>, TypeMapping> typeAssigns = new HashMap<>();
+		GenericAssignability.inferTypeVariablesWithTypeMappings(types, inferFroms,
+			typeAssigns);
+
+		// We expect T=Number
+		final Map<TypeVariable<?>, TypeMapping> expected = new HashMap<>();
+		TypeVariable<?> typeVarT = (TypeVariable<?>) t.getType();
+		expected.put(typeVarT, new TypeMapping(typeVarT, Number.class, true));
+
+		assertEquals(expected, typeAssigns);
 	}
 
-	static abstract class RecursiveThing<T extends RecursiveThing<T>> {
-		
+	@Test
+	public <I, O> void testSupertypeTypeInference()
+		throws TypeInferenceException
+	{
+		final Type t = new Nil<Function<Thing<I>, List<O>>>() {}.getType();
+		final Type[] tArgs = ((ParameterizedType) t).getActualTypeArguments();
+		final Type dest =
+			new Nil<Function<StrangeThing<Double, String>, List<Double>>>()
+			{}.getType();
+		final Type[] destArgs = ((ParameterizedType) dest).getActualTypeArguments();
+
+		final Map<TypeVariable<?>, TypeMapping> typeAssigns = new HashMap<>();
+		GenericAssignability.inferTypeVariablesWithTypeMappings(tArgs, destArgs,
+			typeAssigns);
+
+		// We expect I=String, O=Double
+		final Map<TypeVariable<?>, TypeMapping> expected = new HashMap<>();
+		TypeVariable<?> typeVarI = (TypeVariable<?>) ((ParameterizedType) tArgs[0])
+			.getActualTypeArguments()[0];
+		expected.put(typeVarI, new TypeMapping(typeVarI, String.class, false));
+		TypeVariable<?> typeVarO = (TypeVariable<?>) ((ParameterizedType) tArgs[1])
+			.getActualTypeArguments()[0];
+		expected.put(typeVarO, new TypeMapping(typeVarO, Double.class, false));
+
+		assertEquals(typeAssigns, expected);
 	}
-	
-	static class FooThing extends RecursiveThing<FooThing> {
-		
+
+	@Test
+	public <T> void testWildcardTypeInference() throws TypeInferenceException {
+		final Type t = new Nil<T>() {}.getType();
+		final Type listWild = new Nil<List<? extends T>>() {}.getType();
+		final Type integer = new Nil<Integer>() {}.getType();
+		final Type listDouble = new Nil<List<Double>>() {}.getType();
+
+		final Type[] types = { listWild, t };
+		final Type[] inferFroms = { listDouble, integer };
+
+		final Map<TypeVariable<?>, TypeMapping> typeAssigns = new HashMap<>();
+		GenericAssignability.inferTypeVariablesWithTypeMappings(types, inferFroms,
+			typeAssigns);
+
+		// We expect T=Number
+		final Map<TypeVariable<?>, TypeMapping> expected = new HashMap<>();
+		TypeVariable<?> typeVar = (TypeVariable<?>) t;
+		expected.put(typeVar, new TypeMapping(typeVar, Number.class, true));
+
+		assertEquals(expected, typeAssigns);
+
+		final Type[] types2 = { t, t };
+		final Type listWildcardNumber = new Nil<List<? extends Number>>() {}
+			.getType();
+		final Type wildcardNumber = ((ParameterizedType) listWildcardNumber)
+			.getActualTypeArguments()[0];
+		final Type listWildcardDouble = new Nil<List<? extends Double>>() {}
+			.getType();
+		final Type wildcardDouble = ((ParameterizedType) listWildcardDouble)
+			.getActualTypeArguments()[0];
+
+		final Type[] inferFroms2 = { wildcardNumber, wildcardDouble };
+
+		final Map<TypeVariable<?>, TypeMapping> typeAssigns2 = new HashMap<>();
+		GenericAssignability.inferTypeVariablesWithTypeMappings(types2, inferFroms2,
+			typeAssigns2);
+
+		// We expect T=Number
+		final Map<TypeVariable<?>, TypeMapping> expected2 = new HashMap<>();
+		TypeVariable<?> typeVar2 = (TypeVariable<?>) t;
+		expected2.put(typeVar2, new TypeMapping(typeVar, Number.class, true));
+
+		assertEquals(expected2, typeAssigns2);
 	}
 
 }

From 400e979f9fc9d8abeac4cc560317c9d57c0a605a Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Wed, 30 Jun 2021 15:17:32 -0500
Subject: [PATCH 57/91] Remove Parameter annotation

This allows us to later remove the org.scijava.param fork
---
 .../ops2/coloc/maxTKendallTau/MTKT.java       |   1 -
 .../ops2/coloc/pValue/DefaultPValue.java      |   1 -
 .../net/imagej/ops2/convert/ConvertTypes.java |   1 -
 .../net/imagej/ops2/convert/Converters.java   |   1 -
 .../ops2/convert/clip/ClipRealTypes.java      |   1 -
 .../ops2/convert/copy/CopyRealTypes.java      |   1 -
 .../net/imagej/ops2/copy/CopyArrayImg.java    |   1 -
 .../java/net/imagej/ops2/copy/CopyImg.java    |   1 -
 .../net/imagej/ops2/copy/CopyImgLabeling.java |   1 -
 .../imagej/ops2/copy/CopyLabelingMapping.java |   1 -
 .../java/net/imagej/ops2/copy/CopyRAI.java    |   1 -
 .../java/net/imagej/ops2/copy/CopyType.java   |   1 -
 .../net/imagej/ops2/create/CreateTypes.java   |   1 -
 .../deconvolve/NonCirculantFirstGuess.java    |   1 -
 .../NonCirculantNormalizationFactor.java      |   1 -
 .../ops2/deconvolve/RichardsonLucyC.java      |   1 -
 .../deconvolve/RichardsonLucyCorrection.java  |   1 -
 .../ops2/deconvolve/RichardsonLucyF.java      |   1 -
 .../ops2/deconvolve/RichardsonLucyTVF.java    |   1 -
 .../deconvolve/RichardsonLucyTVUpdate.java    |   1 -
 .../ops2/deconvolve/RichardsonLucyUpdate.java |   1 -
 .../net/imagej/ops2/eval/DefaultEval.java     |   1 -
 .../ops2/features/haralick/DefaultICM1.java   |   1 -
 .../ops2/features/haralick/DefaultICM2.java   |   1 -
 .../features/haralick/DefaultSumVariance.java |   1 -
 .../hog/HistogramOfOrientedGradients2D.java   |   1 -
 .../ops2/features/lbp2d/DefaultLBP2D.java     |   1 -
 .../tamura2d/DefaultCoarsenessFeature.java    |   1 -
 .../tamura2d/DefaultContrastFeature.java      |   1 -
 .../DefaultDirectionalityFeature.java         |   1 -
 .../zernike/DefaultMagnitudeFeature.java      |   1 -
 .../features/zernike/DefaultPhaseFeature.java |   1 -
 .../zernike/helper/ZernikeComputer.java       |   1 -
 .../filter/FFTMethodsLinearFFTFilterC.java    |   1 -
 .../ops2/filter/addNoise/NoiseAdders.java     |   1 -
 .../filter/bilateral/DefaultBilateral.java    |   1 -
 .../ops2/filter/convolve/ConvolveFFTC.java    |   1 -
 .../ops2/filter/convolve/ConvolveFFTF.java    |   1 -
 .../ops2/filter/convolve/ConvolveNaiveC.java  |   1 -
 .../ops2/filter/convolve/ConvolveNaiveF.java  |   1 -
 .../ops2/filter/correlate/CorrelateFFTC.java  |   1 -
 .../ops2/filter/correlate/CorrelateFFTF.java  |   1 -
 .../derivative/PartialDerivativeRAI.java      |   1 -
 .../derivative/PartialDerivativesRAI.java     |   1 -
 .../DefaultDerivativeGauss.java               |   1 -
 .../imagej/ops2/filter/dog/DefaultDoG.java    |   1 -
 .../ops2/filter/dog/DoGVaryingSigmas.java     |   1 -
 .../filter/fft/CreateOutputFFTMethods.java    |   1 -
 .../imagej/ops2/filter/fft/FFTMethodsOpC.java |   1 -
 .../imagej/ops2/filter/fft/FFTMethodsOpF.java |   1 -
 .../filter/fftSize/ComputeFFTMethodsSize.java |   1 -
 .../ops2/filter/fftSize/ComputeFFTSize.java   |   1 -
 .../imagej/ops2/filter/gauss/Gaussians.java   |   1 -
 .../ops2/filter/hessian/HessianRAI.java       |   1 -
 .../ops2/filter/ifft/IFFTMethodsOpC.java      |   1 -
 .../ops2/filter/ifft/IFFTMethodsOpI.java      |   1 -
 .../ops2/filter/max/DefaultMaxFilter.java     |   1 -
 .../ops2/filter/mean/DefaultMeanFilter.java   |   1 -
 .../filter/median/DefaultMedianFilter.java    |   1 -
 .../ops2/filter/min/DefaultMinFilter.java     |   1 -
 .../net/imagej/ops2/filter/pad/PadInput.java  |   1 -
 .../ops2/filter/sigma/DefaultSigmaFilter.java |   1 -
 .../imagej/ops2/filter/sobel/SobelRAI.java    |   1 -
 .../ops2/filter/tubeness/DefaultTubeness.java |   1 -
 .../variance/DefaultVarianceFilter.java       |   1 -
 .../ops2/filter/vesselness/DefaultFrangi.java |   1 -
 .../ops2/geom/geom2d/DefaultCircularity.java  |   1 -
 .../ops2/geom/geom2d/DefaultEccentricity.java |   1 -
 .../ops2/geom/geom2d/DefaultElongation.java   |   1 -
 .../ops2/geom/geom2d/DefaultFeretsAngle.java  |   1 -
 .../geom/geom2d/DefaultFeretsDiameter.java    |   1 -
 .../geom2d/DefaultFeretsDiameterForAngle.java |   1 -
 .../ops2/geom/geom2d/DefaultMajorAxis.java    |   1 -
 .../geom/geom2d/DefaultMaximumFeretAngle.java |   1 -
 .../geom2d/DefaultMaximumFeretDiameter.java   |   1 -
 .../geom/geom2d/DefaultMinimumFeretAngle.java |   1 -
 .../geom2d/DefaultMinimumFeretDiameter.java   |   1 -
 .../ops2/geom/geom2d/DefaultMinorAxis.java    |   1 -
 .../geom/geom2d/DefaultPerimeterLength.java   |   1 -
 .../ops2/geom/geom2d/DefaultRoundness.java    |   1 -
 .../ops2/geom/geom2d/DefaultSizePolygon.java  |   1 -
 ...DefaultVerticesCountConvexHullPolygon.java |   1 -
 .../geom2d/DefaultVerticesCountPolygon.java   |   1 -
 .../ops2/geom/geom3d/DefaultCompactness.java  |   1 -
 .../geom/geom3d/DefaultMainElongation.java    |   1 -
 .../geom/geom3d/DefaultMarchingCubes.java     |   1 -
 .../geom/geom3d/DefaultMedianElongation.java  |   1 -
 .../geom/geom3d/DefaultSparenessMesh.java     |   1 -
 .../ops2/geom/geom3d/DefaultSphericity.java   |   1 -
 .../ops2/geom/geom3d/DefaultSurfaceArea.java  |   1 -
 .../DefaultVerticesCountConvexHullMesh.java   |   1 -
 .../geom/geom3d/DefaultVerticesCountMesh.java |   1 -
 .../geom/geom3d/DefaultVoxelization3D.java    |   1 -
 .../imagej/ops2/identity/DefaultIdentity.java |   1 -
 .../imagej/ops2/image/ascii/DefaultASCII.java |   1 -
 .../CooccurrenceMatrix.java                   |   1 -
 .../CalibratedDistanceTransformer.java        |   1 -
 .../DefaultDistanceTransformCalibration.java  |   1 -
 .../DistanceTransformer.java                  |   1 -
 .../equation/DefaultCoordinatesEquation.java  |   1 -
 .../ops2/image/equation/DefaultEquation.java  |   1 -
 .../imagej/ops2/image/fill/DefaultFill.java   |   1 -
 .../net/imagej/ops2/image/fill/FillRAI.java   |   1 -
 .../image/integral/DefaultIntegralImg.java    |   1 -
 .../image/integral/SquareIntegralImg.java     |   1 -
 .../imagej/ops2/image/invert/InvertII.java    |   1 -
 .../ops2/image/invert/InvertIIInteger.java    |   1 -
 .../image/normalize/NormalizeIIComputer.java  |   1 -
 .../image/normalize/NormalizeIIFunction.java  |   1 -
 .../ops2/image/normalize/NormalizeIILazy.java |   1 -
 .../normalize/NormalizeIILazyFunction.java    |   1 -
 .../ops2/image/watershed/Watershed.java       |   1 -
 .../ops2/image/watershed/WatershedBinary.java |   1 -
 .../watershed/WatershedBinarySingleSigma.java |   1 -
 .../ops2/image/watershed/WatershedSeeded.java |   1 -
 .../DefaultCentralMoment00.java               |   1 -
 .../DefaultCentralMoment02.java               |   1 -
 .../DefaultCentralMoment03.java               |   1 -
 .../DefaultCentralMoment11.java               |   1 -
 .../DefaultCentralMoment12.java               |   1 -
 .../DefaultCentralMoment20.java               |   1 -
 .../DefaultCentralMoment21.java               |   1 -
 .../DefaultCentralMoment30.java               |   1 -
 .../IterableCentralMoment00.java              |   1 -
 .../IterableCentralMoment11.java              |   1 -
 .../imagemoments/hu/DefaultHuMoment1.java     |   1 -
 .../imagemoments/hu/DefaultHuMoment2.java     |   1 -
 .../imagemoments/hu/DefaultHuMoment3.java     |   1 -
 .../imagemoments/hu/DefaultHuMoment4.java     |   1 -
 .../imagemoments/hu/DefaultHuMoment5.java     |   1 -
 .../imagemoments/hu/DefaultHuMoment6.java     |   1 -
 .../imagemoments/hu/DefaultHuMoment7.java     |   1 -
 .../DefaultNormalizedCentralMoment02.java     |   1 -
 .../DefaultNormalizedCentralMoment03.java     |   1 -
 .../DefaultNormalizedCentralMoment11.java     |   1 -
 .../DefaultNormalizedCentralMoment12.java     |   1 -
 .../DefaultNormalizedCentralMoment20.java     |   1 -
 .../DefaultNormalizedCentralMoment21.java     |   1 -
 .../DefaultNormalizedCentralMoment30.java     |   1 -
 .../imagej/ops2/labeling/MergeLabeling.java   |   1 -
 .../imagej/ops2/labeling/cca/DefaultCCA.java  |   1 -
 .../imagej/ops2/linalg/rotate/Rotations.java  |   1 -
 .../imagej/ops2/logic/BooleanTypeLogic.java   |   1 -
 .../java/net/imagej/ops2/logic/Default.java   |   1 -
 .../java/net/imagej/ops2/logic/Ternary.java   |   1 -
 .../neighborhood/DefaultMapNeighborhood.java  |   1 -
 .../MapNeighborhoodWithCenter.java            |   1 -
 .../ops2/math/BinaryNumericTypeMath.java      |   1 -
 .../imagej/ops2/math/BinaryRealTypeMath.java  |   1 -
 .../ops2/math/NullaryNumericTypeMath.java     |   1 -
 .../multiply/ComplexConjugateMultiplyOp.java  |   1 -
 .../ops2/morphology/DistanceTransforms.java   |   1 -
 .../imagej/ops2/morphology/ExtractHoles.java  |   1 -
 .../net/imagej/ops2/morphology/FillHoles.java |   1 -
 .../imagej/ops2/morphology/FloodFills.java    |   1 -
 .../net/imagej/ops2/morphology/Outline.java   |   1 -
 .../net/imagej/ops2/morphology/Table2Ds.java  |   1 -
 .../ops2/project/DefaultProjectParallel.java  |   1 -
 .../project/ProjectRAIToIterableInterval.java |   1 -
 .../detectRidges/DefaultDetectRidges.java     |   1 -
 .../net/imagej/ops2/slice/SliceRAI2RAI.java   |   1 -
 .../ops2/stats/DefaultGeometricMean.java      |   1 -
 .../ops2/stats/DefaultHarmonicMean.java       |   1 -
 .../imagej/ops2/stats/DefaultKurtosis.java    |   1 -
 .../net/imagej/ops2/stats/DefaultMax.java     |   1 -
 .../net/imagej/ops2/stats/DefaultMean.java    |   1 -
 .../net/imagej/ops2/stats/DefaultMedian.java  |   1 -
 .../net/imagej/ops2/stats/DefaultMin.java     |   1 -
 .../ops2/stats/DefaultMoment1AboutMean.java   |   1 -
 .../ops2/stats/DefaultMoment2AboutMean.java   |   1 -
 .../ops2/stats/DefaultMoment3AboutMean.java   |   1 -
 .../ops2/stats/DefaultMoment4AboutMean.java   |   1 -
 .../ops2/stats/DefaultMomentNAboutMean.java   |   1 -
 .../imagej/ops2/stats/DefaultPercentile.java  |   1 -
 .../imagej/ops2/stats/DefaultQuantile.java    |   1 -
 .../net/imagej/ops2/stats/DefaultSize.java    |   1 -
 .../imagej/ops2/stats/DefaultSkewness.java    |   1 -
 .../ops2/stats/DefaultStandardDeviation.java  |   1 -
 .../net/imagej/ops2/stats/DefaultSum.java     |   1 -
 .../ops2/stats/DefaultSumOfInverses.java      |   1 -
 .../imagej/ops2/stats/DefaultSumOfLogs.java   |   1 -
 .../ops2/stats/DefaultSumOfSquares.java       |   1 -
 .../imagej/ops2/stats/DefaultVariance.java    |   1 -
 .../net/imagej/ops2/stats/IntegralMean.java   |   1 -
 .../net/imagej/ops2/stats/IntegralSum.java    |   1 -
 .../imagej/ops2/stats/IntegralVariance.java   |   1 -
 .../ops2/stats/IterableGeometricMean.java     |   1 -
 .../ops2/stats/IterableHarmonicMean.java      |   1 -
 .../net/imagej/ops2/stats/IterableMax.java    |   1 -
 .../net/imagej/ops2/stats/IterableMean.java   |   1 -
 .../net/imagej/ops2/stats/IterableMin.java    |   1 -
 .../ops2/stats/IterableMoment3AboutMean.java  |   1 -
 .../ops2/stats/IterableMoment4AboutMean.java  |   1 -
 .../net/imagej/ops2/stats/IterableSize.java   |   1 -
 .../ops2/stats/IterableStandardDeviation.java |   1 -
 .../net/imagej/ops2/stats/IterableSum.java    |   1 -
 .../ops2/stats/IterableSumOfInverses.java     |   1 -
 .../imagej/ops2/stats/IterableSumOfLogs.java  |   1 -
 .../ops2/stats/IterableSumOfSquares.java      |   1 -
 .../imagej/ops2/stats/IterableVariance.java   |   1 -
 .../thread/chunker/ChunkerInterleaved.java    |   1 -
 .../ops2/thread/chunker/DefaultChunker.java   |   1 -
 .../threshold/ApplyThresholdMethodLocal.java  |   1 -
 .../apply/ApplyThresholdComparable.java       |   1 -
 .../apply/ApplyThresholdComparator.java       |   1 -
 .../ComputeLocalBernsenThreshold.java         |   1 -
 .../localBernsen/LocalBernsenThreshold.java   |   1 -
 .../ComputeLocalContrastThreshold.java        |   1 -
 .../localContrast/LocalContrastThreshold.java |   1 -
 .../localMean/ComputeLocalMeanThreshold.java  |   1 -
 .../ComputeLocalMeanThresholdIntegral.java    |   1 -
 .../localMean/LocalMeanThreshold.java         |   1 -
 .../ComputeLocalMedianThreshold.java          |   1 -
 .../localMedian/LocalMedianThreshold.java     |   1 -
 .../ComputeLocalMidGreyThreshold.java         |   1 -
 .../localMidGrey/LocalMidGreyThreshold.java   |   1 -
 .../ComputeLocalNiblackThreshold.java         |   1 -
 .../ComputeLocalNiblackThresholdIntegral.java |   1 -
 .../localNiblack/LocalNiblackThreshold.java   |   1 -
 .../ComputeLocalPhansalkarThreshold.java      |   1 -
 ...mputeLocalPhansalkarThresholdIntegral.java |   1 -
 .../LocalPhansalkarThreshold.java             |   1 -
 .../ComputeLocalSauvolaThreshold.java         |   1 -
 .../ComputeLocalSauvolaThresholdIntegral.java |   1 -
 .../localSauvola/LocalSauvolaThreshold.java   |   1 -
 .../net/imagej/ops2/topology/BoxCount.java    |   1 -
 .../EulerCharacteristic26N.java               |   1 -
 .../EulerCharacteristic26NFloating.java       |   1 -
 .../eulerCharacteristic/EulerCorrection.java  |   1 -
 .../ops2/types/adapt/LiftComputersToRAI.java  |   1 -
 .../ops2/types/adapt/LiftFunctionsToRAI.java  |   1 -
 .../src/main/java/module-info.java            |   1 +
 .../ops/adapt/lift/ComputerToIterables.java   |   1 -
 .../org/scijava/ops/core/OneToOneCommand.java |  22 --
 .../ops/create/CreateOpCollection.java        |   1 -
 .../java/org/scijava/ops/math/Normalize.java  |   1 -
 .../main/java/org/scijava/ops/math/Zero.java  |   1 -
 .../main/java/org/scijava/ops/util/Adapt.java |  13 -
 .../org/scijava/ops/util/AnnotationUtils.java |  19 -
 .../param/AnnotatedParameterMember.java       | 140 --------
 .../param/DefaultMutableParameterMember.java  | 330 ------------------
 .../scijava/param/FieldParameterMember.java   | 123 -------
 .../param/FunctionalParameterMember.java      |  39 ---
 .../scijava/param/JavadocParameterData.java   | 122 ++++---
 .../scijava/param/MutableParameterMember.java |  55 ---
 .../java/org/scijava/param/Parameter.java     | 185 ----------
 .../java/org/scijava/param/ParameterData.java |   4 +-
 .../org/scijava/param/ParameterStructs.java   | 122 +------
 .../java/org/scijava/param/Parameters.java    |  48 ---
 .../param/SynthesizedParameterData.java       |  62 ++--
 .../param/SynthesizedParameterMember.java     |  64 ++++
 .../scijava/ops/OpBuilderNoOutputTest.java    |   7 +-
 .../test/java/org/scijava/ops/TestOps.java    |   1 -
 .../ops/adapt/OpAdaptationPriorityTest.java   |   1 -
 .../ops/matcher/DefaultMatchingErrorTest.java |  31 +-
 .../ops/matcher/MatchingWithAnyTest.java      |   1 -
 256 files changed, 190 insertions(+), 1435 deletions(-)
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/core/OneToOneCommand.java
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/AnnotatedParameterMember.java
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/DefaultMutableParameterMember.java
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/FieldParameterMember.java
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/FunctionalParameterMember.java
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/MutableParameterMember.java
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/Parameter.java
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/Parameters.java
 create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterMember.java

diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java
index e0ad20bf4..e1669bc7b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java
@@ -51,7 +51,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.util.IntArray;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java
index 58f305dde..08afcec5e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java
@@ -50,7 +50,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java
index 17d604834..2ffe18766 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java
@@ -54,7 +54,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java
index d07d9a303..712e2b337 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java
@@ -8,7 +8,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java
index 34515e1d5..89b59a3d4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java
@@ -33,7 +33,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java
index 18b4c638f..8e7e796ed 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java
@@ -33,7 +33,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java
index 814923429..63501e636 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java
@@ -41,7 +41,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java
index 0cb0dfcef..6effa322d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java
@@ -37,7 +37,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java
index dddee6cfa..7b93b3365 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java
@@ -40,7 +40,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java
index 39dc59340..b179298c5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java
@@ -38,7 +38,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java
index d0bebd24d..353ee023b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java
@@ -37,7 +37,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java
index ddcb0417e..49471381a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java
@@ -33,7 +33,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java
index 8e6305b6a..5980ef8de 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java
@@ -21,7 +21,6 @@
 import org.scijava.function.Producer;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java
index ad3eb4d89..5b770504f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java
@@ -44,7 +44,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java
index 6fbb947a0..fe93429b3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java
@@ -52,7 +52,6 @@
 import org.scijava.function.Inplaces;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java
index 15e690fed..a9aba9759 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java
@@ -47,7 +47,6 @@
 import org.scijava.function.Inplaces;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java
index e207f9a30..5bae9dbd2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java
@@ -46,7 +46,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java
index 2855491ea..bf39470cc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java
@@ -49,7 +49,6 @@
 import org.scijava.function.Inplaces;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java
index 3f4bd0762..08317ddf4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java
@@ -50,7 +50,6 @@
 import org.scijava.function.Inplaces;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java
index 3958377eb..99a66ee55 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java
@@ -47,7 +47,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java
index a103f71f7..c9abb7585 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java
@@ -36,7 +36,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java
index d9c454e1b..58ac47cac 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java
@@ -34,7 +34,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpService;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java
index 4f6c21052..447b5d8d4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java
@@ -39,7 +39,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java
index 732e8758e..f334a8556 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java
@@ -39,7 +39,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java
index b13d2f940..53e4c5d95 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java
@@ -39,7 +39,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java
index 071a48311..f8a16ee73 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java
@@ -61,7 +61,6 @@
 import org.scijava.function.Inplaces;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java
index c51bde4a6..b3491eba6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java
@@ -45,7 +45,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java
index eb3dd031e..5faf234c5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java
@@ -50,7 +50,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java
index 2f9638cf7..aa53bf2e4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java
@@ -36,7 +36,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java
index 64f8c8644..8450fcf27 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java
@@ -47,7 +47,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java
index 2c79367c4..19f5f964d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java
@@ -37,7 +37,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java
index d27eb0058..a70e5e242 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java
@@ -37,7 +37,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java
index 1d7f2f180..d0bd30f60 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java
@@ -35,7 +35,6 @@
 
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java
index b72da5994..2dfb81979 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java
@@ -42,7 +42,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java
index 9c18fc0bf..f1e64ac8a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java
@@ -39,7 +39,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java
index 550c5e919..983c6e3f4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java
@@ -42,7 +42,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java
index 905914e97..eb4b7e003 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java
@@ -39,7 +39,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java
index 3a859d9b7..3de3ddb41 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java
@@ -49,7 +49,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java
index a4a3af15a..56473fbbf 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java
@@ -40,7 +40,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java
index 77a129e06..b7de5c4d7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java
@@ -47,7 +47,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java
index 3cb9cccb6..bdb1c3410 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java
@@ -38,7 +38,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java
index f1359dfb3..4b5841ced 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java
@@ -46,7 +46,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java
index ace9c701e..aaaf17e62 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java
@@ -43,7 +43,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java
index 736baae5a..e34c66743 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java
@@ -41,7 +41,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java
index 7d0635698..a7ff0bc40 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java
@@ -44,7 +44,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java
index f4387abb1..f7507eed3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java
@@ -41,7 +41,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java
index c7fb7a2d2..d6af00693 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java
@@ -39,7 +39,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java
index 53aa7f38a..f50286375 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java
@@ -37,7 +37,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java
index 1ebc23d5d..0161724ff 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java
@@ -39,7 +39,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java
index b0a8ed9fb..0e65cdba2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java
@@ -43,7 +43,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java
index 28e2aff17..7cd31aaa6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java
@@ -34,7 +34,6 @@
 
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java
index ba97379bf..813762c08 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java
@@ -38,7 +38,6 @@
 
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java
index 8738143a7..095144dcf 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java
@@ -49,7 +49,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java
index 263686782..04aff4d29 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java
@@ -41,7 +41,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java
index ab093b056..45a234480 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java
@@ -40,7 +40,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java
index d0a24033d..6c8dd87a1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java
@@ -37,7 +37,6 @@
 
 import org.scijava.function.Inplaces;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java
index 0d9d72ed4..aa0bc71dc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java
@@ -38,7 +38,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java
index 1511007a4..d7acd365d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java
@@ -38,7 +38,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java
index 2c710475f..4bc3560d3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java
@@ -37,7 +37,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java
index 8a6d313bf..ce0a76af8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java
@@ -37,7 +37,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java
index e83a07894..c7cbd0c32 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java
@@ -44,7 +44,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java
index 05fc0e11e..e380bcd06 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java
@@ -40,7 +40,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java
index 109e6162c..7541ef050 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java
@@ -36,7 +36,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java
index a7961a3b2..0a4f3cf74 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java
@@ -52,7 +52,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java
index 2b55e6151..00badca46 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java
@@ -38,7 +38,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java
index e3337eac2..c2562c205 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java
@@ -43,7 +43,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 import Jama.EigenvalueDecomposition;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java
index 4c0fe94e9..5c6208726 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java
@@ -37,7 +37,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java
index 0fc7017f7..d7b982403 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java
@@ -37,7 +37,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java
index 8ec5f9793..46eff3164 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java
@@ -40,7 +40,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java
index 41b49f1d4..2df120804 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java
@@ -35,7 +35,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java
index db0475f77..df81ac266 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java
@@ -35,7 +35,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java
index 63e8cc9ec..f062a425c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java
@@ -40,7 +40,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java
index cbf7f39ec..8a3487cfb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java
@@ -38,7 +38,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java
index 7646ea1ed..ccc3cbe1c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java
@@ -38,7 +38,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "geom.maximumFeretsAngle")
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java
index 5595c321a..c4a101b6d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java
@@ -38,7 +38,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "geom.maximumFeretsDiameter")
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java
index 4f7224cac..733658c41 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java
@@ -38,7 +38,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "geom.minimumFeretsAngle")
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java
index 5adcecd55..6aa4b9612 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java
@@ -38,7 +38,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "geom.minimumFeretsDiameter")
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java
index 8767bb9d9..daaa95e90 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java
@@ -38,7 +38,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java
index b2076f0ea..f343d27c6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java
@@ -38,7 +38,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java
index 2f1131268..cc6f04ff5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java
@@ -37,7 +37,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java
index 18fc5b126..1e6eb067d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java
@@ -38,7 +38,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java
index 4f31522c4..bae0427eb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java
@@ -38,7 +38,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java
index 6179e8c28..85b106167 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java
@@ -35,7 +35,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java
index 1a99d7b35..efdaf461b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java
@@ -38,7 +38,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java
index 027a6d504..0926d73d5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java
@@ -40,7 +40,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java
index 86f142be0..e09e0e6e6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java
@@ -47,7 +47,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java
index 57f404196..91eb2748b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java
@@ -40,7 +40,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java
index cab0deb43..3a7d1d60c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java
@@ -40,7 +40,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java
index 9843d1443..50b9a0387 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java
@@ -38,7 +38,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java
index 1b7c6f173..3152931a4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java
@@ -37,7 +37,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java
index 767c6b2ce..a17ae444b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java
@@ -38,7 +38,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java
index d763b2432..eee191d52 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java
@@ -35,7 +35,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java
index 00705c05f..aaacf1953 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java
@@ -46,7 +46,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java
index 8fe08fe70..85e63dbd5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java
@@ -31,7 +31,6 @@
 
 import org.scijava.function.Inplaces;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java
index c8ee6ac57..f38e31472 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java
@@ -39,7 +39,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java
index 5c2845ee6..1b776b40a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java
@@ -9,7 +9,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java
index 67c08ac8d..c04707f14 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java
@@ -37,7 +37,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java
index ab5a15d67..70f5eac6f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java
@@ -43,7 +43,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java
index 9a545d57b..a9b832761 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java
@@ -37,7 +37,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java
index ee72d1e08..388e2cc06 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java
@@ -37,7 +37,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java
index c17fbbdd9..0f4bc7f00 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java
@@ -43,7 +43,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpExecutionException;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.script.ScriptLanguage;
 import org.scijava.script.ScriptService;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java
index f2ead8904..aa6305bf3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java
@@ -36,7 +36,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java
index 8ab99befe..3973c939e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java
@@ -36,7 +36,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java
index 0659d7086..61d45b698 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java
@@ -37,7 +37,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java
index b1608b6ec..02cb1fd81 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java
@@ -37,7 +37,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertII.java
index a12c19ee1..21dfd5767 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertII.java
@@ -41,7 +41,6 @@
 //import org.scijava.functions.Computers;
 //import org.scijava.functions.Computers;
 //import org.scijava.functions.Computers;
-//import org.scijava.param.Parameter;
 //import org.scijava.plugin.Plugin;
 //
 ///**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertIIInteger.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertIIInteger.java
index cab243163..d2b60fb65 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertIIInteger.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertIIInteger.java
@@ -44,7 +44,6 @@
 //import org.scijava.functions.Computers;
 //import org.scijava.functions.Computers;
 //import org.scijava.functions.Computers;
-//import org.scijava.param.Parameter;
 //import org.scijava.plugin.Plugin;
 //
 ///**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java
index d307e6376..a1157fa85 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java
@@ -41,7 +41,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java
index 6b8ecc05c..c9989a669 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java
@@ -39,7 +39,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java
index 6f200e1ea..6dd30a4b1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java
@@ -39,7 +39,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java
index 4302115b7..1f6f3d671 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java
@@ -37,7 +37,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java
index a30d47bbd..c3daf9d52 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java
@@ -58,7 +58,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java
index 12621f782..638023d38 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java
@@ -45,7 +45,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java
index 870642eb6..d8860a4a4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java
@@ -46,7 +46,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java
index 1af0a1129..99852cf04 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java
@@ -68,7 +68,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java
index 88431dac5..ffb8d92fe 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java
@@ -36,7 +36,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java
index a8c96c9d7..e6cdaddcb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java
@@ -41,7 +41,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java
index 53a9a134c..d104508cf 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java
@@ -41,7 +41,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java
index 8d56811de..89d4d103d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java
@@ -37,7 +37,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java
index 8f11371c8..b434b8c3d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java
@@ -41,7 +41,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java
index d2c1b01f0..864670b03 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java
@@ -40,7 +40,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java
index 8a3eafdd7..a10239906 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java
@@ -41,7 +41,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java
index e824cbe6e..52ae6216f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java
@@ -41,7 +41,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java
index c912e75a1..42db76fd4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java
@@ -36,7 +36,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java
index c1be9aed1..74960e095 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java
@@ -36,7 +36,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java
index d5445f935..5a0d99d20 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java
@@ -36,7 +36,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java
index ca71ec854..c4ebbf48e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java
@@ -36,7 +36,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java
index 358da38ae..3403b4e35 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java
@@ -36,7 +36,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java
index 6ffd15c3a..abe3beee4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java
@@ -36,7 +36,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java
index 49b3c677a..313f95014 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java
@@ -36,7 +36,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java
index 5a6abb7a2..cc5218d1a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java
@@ -36,7 +36,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java
index 411c64566..0c8c91645 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java
@@ -36,7 +36,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java
index e1bf84cb5..5120d0f5a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java
@@ -36,7 +36,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java
index 74b4e3d80..47b902f0f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java
@@ -36,7 +36,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java
index 7b80a7e8d..ced69b790 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java
@@ -36,7 +36,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java
index 95ea34ab5..e5177f8a4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java
@@ -36,7 +36,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java
index d9b7200b8..b431863af 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java
@@ -36,7 +36,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java
index dda6e4d4f..4797e930f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java
@@ -36,7 +36,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java
index c9fba1ee7..e6c6dc00e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java
@@ -36,7 +36,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java
index 082f4eaf5..df1169551 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java
@@ -49,7 +49,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java
index 9f3bfda27..f32038bfd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java
@@ -44,7 +44,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java
index 9e9564799..aa12815c9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java
@@ -39,7 +39,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java
index ffa853768..0ed24563d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java
@@ -34,7 +34,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java
index a694d5c97..5469fdf47 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java
@@ -34,7 +34,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java
index b4a1fda59..39fa17bd7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java
@@ -34,7 +34,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java
index 949cf16a5..2d066491f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java
@@ -40,7 +40,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java
index b43529227..cfb7a604a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java
@@ -42,7 +42,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpEnvironment;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java
index 563f02494..f96d15294 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java
@@ -36,7 +36,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java
index ccb11bca4..c579cb420 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java
@@ -34,7 +34,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java
index 16ab64985..5406f9776 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java
@@ -35,7 +35,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java
index bbf0200d3..6a5549f2d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java
@@ -34,7 +34,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "math.complexConjugateMultiply", priority = Priority.LOW)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java
index c61fec18e..e84c47632 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java
@@ -13,7 +13,6 @@
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.ops.core.ExceptionUtils;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java
index 20863d1d5..965c16670 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java
@@ -40,7 +40,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java
index d5871e9a7..4287bd727 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java
@@ -40,7 +40,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java
index b2ca7a942..75322dbb4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java
@@ -16,7 +16,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java
index bdd21e7a6..eef638723 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java
@@ -46,7 +46,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java
index c3e1e1351..91ab39dda 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java
@@ -23,7 +23,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java
index b0ec412ff..267fd2567 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java
@@ -39,7 +39,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "project",
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java
index f7e703936..718787a79 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java
@@ -39,7 +39,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "project", priority = Priority.LOW)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java
index fe67e32f3..2031e8926 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java
@@ -50,7 +50,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java
index d88766a7a..638b7c8e9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java
@@ -35,7 +35,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java
index a6c7ccf22..64d98c60d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java
@@ -35,7 +35,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java
index c8d361d05..1b973d6c0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java
@@ -35,7 +35,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java
index ef9d8d9b1..5f52f97c5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java
@@ -35,7 +35,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java
index 1469d83c2..5b6dd1db9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java
@@ -39,7 +39,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java
index 17fd594f3..daa04c775 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java
@@ -36,7 +36,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java
index 098212ca7..752eee08b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java
@@ -36,7 +36,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java
index de413137d..f73bcd126 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java
@@ -39,7 +39,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java
index eb193a150..2b8e3f001 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java
@@ -36,7 +36,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java
index 61991eae3..580437db8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java
@@ -36,7 +36,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java
index d61f4ca19..42659a5b1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java
@@ -36,7 +36,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java
index 97ca54592..912152bbf 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java
@@ -36,7 +36,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java
index e00a62792..aad8b6182 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java
@@ -40,7 +40,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java
index 7ddadf4a1..1f25b2258 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java
@@ -34,7 +34,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java
index 31042e585..70f119b42 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java
@@ -38,7 +38,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.util.ArrayUtils;
 import org.scijava.util.DoubleArray;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java
index 1d1861b5f..2a196d950 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java
@@ -34,7 +34,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java
index bdd0a21b0..078a3964b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java
@@ -35,7 +35,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java
index 76300169b..9df6818b8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java
@@ -36,7 +36,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java
index 4c6eb739e..055bb38d6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java
@@ -38,7 +38,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java
index 84a40ae25..8daaa48bc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java
@@ -40,7 +40,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java
index ff1acb5cb..8f1637fbc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java
@@ -41,7 +41,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java
index 29b08c0b3..16723f1de 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java
@@ -39,7 +39,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java
index 63e4728cb..a2380ebbd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java
@@ -42,7 +42,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java
index 1b7c8b1cd..5b0f2017f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java
@@ -40,7 +40,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java
index f6d2d2ae1..783b94662 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java
@@ -38,7 +38,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java
index 314c72b71..682eb7994 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java
@@ -40,7 +40,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java
index c067a3cb4..426becb05 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java
@@ -34,7 +34,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java
index d86d0b8cd..1d49209c3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java
@@ -34,7 +34,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java
index 833505194..10098cc3a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java
@@ -34,7 +34,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java
index 8f3dce783..60fb024d9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java
@@ -34,7 +34,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java
index b7e71f8d6..8b8c2bb2d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java
@@ -34,7 +34,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java
index a2d177eef..ec872eee2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java
@@ -34,7 +34,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java
index b6c9d0572..6a6245307 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java
@@ -34,7 +34,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java
index 05884460b..95164e239 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java
@@ -34,7 +34,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java
index 5cb99df23..688652f1d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java
@@ -34,7 +34,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java
index f5c1de51f..85217c4ae 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java
@@ -33,7 +33,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java
index c41b19009..35d62ed81 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java
@@ -33,7 +33,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java
index 26e7f7b96..06734ee3d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java
@@ -33,7 +33,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java
index 943771bd6..a636b53cd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java
@@ -33,7 +33,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java
index 77df9d3f2..571acba40 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java
@@ -34,7 +34,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java
index ddb1db5f9..facf43893 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java
@@ -36,7 +36,6 @@
 import org.scijava.Priority;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java
index d93512ccc..4893ce2b8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java
@@ -36,7 +36,6 @@
 
 import org.scijava.function.Inplaces;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java
index 8dbcf2298..1e7763ee4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java
@@ -44,7 +44,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java
index 4e1fad0f9..f9faea52f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java
@@ -33,7 +33,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java
index 16dc9cb03..2d52e0955 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java
@@ -35,7 +35,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java
index 60264f32a..f9e72d64b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java
@@ -39,7 +39,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java
index a2f9c54d3..c6a01f7c1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java
@@ -40,7 +40,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java
index d2ea329dd..3d6f52822 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java
@@ -38,7 +38,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java
index ad7fbd76d..c6140d2d2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java
@@ -40,7 +40,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java
index 60a51653c..208e4198f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java
@@ -37,7 +37,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java
index d6df3ae26..5f157f905 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java
@@ -41,7 +41,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java
index 00aa40d9a..10f170061 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java
@@ -50,7 +50,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java
index 9d366d4bc..1fd103dda 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java
@@ -36,7 +36,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java
index 0b5206769..f7681e5b7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java
@@ -40,7 +40,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java
index 18a7c6e2a..0e1cbf24b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java
@@ -39,7 +39,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java
index da588b56c..44ae21f68 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java
@@ -41,7 +41,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java
index aa36c26e4..6463c8247 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java
@@ -37,7 +37,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java
index 4b589d86d..e742f8902 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java
@@ -42,7 +42,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java
index e5461fd0c..bbda2088e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java
@@ -49,7 +49,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "threshold.localNiblack",
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java
index e04e15117..b26aec411 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java
@@ -37,7 +37,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java
index f6fec2136..d26e7e4d1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java
@@ -42,7 +42,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java
index 6a546ecee..a7e4e6413 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java
@@ -49,7 +49,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "threshold.localPhansalkar",
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java
index 7976c5cf8..e22a53d47 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java
@@ -37,7 +37,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java
index b99a6897c..d1a10d3e5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java
@@ -42,7 +42,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java
index 32631af2e..a1e389f2f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java
@@ -49,7 +49,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpDependency;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "threshold.localSauvola",
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java
index 3a00217dc..820e9e0c4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java
@@ -48,7 +48,6 @@
 
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java
index 86298788e..437ecc440 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java
@@ -35,7 +35,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java
index 366c34252..8565bfcd3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java
@@ -34,7 +34,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java
index 690d7a828..2e8d6bb11 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java
@@ -38,7 +38,6 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java
index 018bb372e..f47a9f3f8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java
@@ -10,7 +10,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java
index 3cf61831c..0423dfa33 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java
@@ -16,7 +16,6 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/module-info.java b/scijava/scijava-ops/src/main/java/module-info.java
index 5010452e3..1893eca56 100644
--- a/scijava/scijava-ops/src/main/java/module-info.java
+++ b/scijava/scijava-ops/src/main/java/module-info.java
@@ -7,6 +7,7 @@
 
 	//TODO: rearrange packages to export only needed classes
 	exports org.scijava.ops; //contains OpDependency interface
+	exports org.scijava.ops.core; // contains ExceptionUtils
 	exports org.scijava.ops.matcher;
 	exports org.scijava.ops.math;
 	exports org.scijava.ops.simplify;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java
index c70930437..83fb04be3 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java
@@ -40,7 +40,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.OpField;
 import org.scijava.ops.OpCollection;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/core/OneToOneCommand.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/core/OneToOneCommand.java
deleted file mode 100644
index 555a412cf..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/core/OneToOneCommand.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.scijava.ops.core;
-
-import java.util.function.Supplier;
-
-import org.scijava.command.Command;
-import org.scijava.param.Parameter;
-import org.scijava.struct.ItemIO;
-
-public abstract class OneToOneCommand<I, O> implements Command, Supplier<O> {
-
-	@Parameter
-	protected I input;
-	
-	@Parameter(itemIO = ItemIO.OUTPUT)
-	protected O output;
-	
-	@Override
-	public O get() {
-		return output;
-	}
-
-}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java
index c00f304a4..fe6ee2f33 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java
@@ -7,7 +7,6 @@
 import org.scijava.function.Producer;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java
index 31af65a0e..38dfb1881 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java
@@ -4,7 +4,6 @@
 
 import org.scijava.function.Functions;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 public class Normalize {
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java
index 51d251142..ca84cc9e4 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java
@@ -5,7 +5,6 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Adapt.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Adapt.java
index 1819e5c65..ed9f0c50c 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Adapt.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Adapt.java
@@ -15,7 +15,6 @@
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
 import org.scijava.ops.Op;
-import org.scijava.ops.core.OneToOneCommand;
 
 /**
  * Utility providing adaptation between {@link Op} types.
@@ -137,18 +136,6 @@ public static <I1, I2, I3, O> Functions.Arity3<I1, I2, I3, O> asFunction3(Comput
 			};
 		}
 
-		public static <I, O> OneToOneCommand<I, O> asCommand(final Computers.Arity1<I, O> computer, I input, O output) {
-			OneToOneCommand<I, O> command = new OneToOneCommand<I, O>() {
-				@Override
-				public void run() {
-					computer.compute(input, output);
-				}
-			};
-			// Populate the input and output member of the computer command
-			Inject.Commands.all(command, input, output);
-			return command;
-		}
-
 		public static <I1, I2, O> Computers.Arity1<I1, O> asComputer(final Computers.Arity2<I1, I2, O> computer, I2 in2) {
 			return (in1, out) -> {
 				computer.compute(in1, in2, out);
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/AnnotationUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/AnnotationUtils.java
index b105c4bee..e68905f29 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/AnnotationUtils.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/AnnotationUtils.java
@@ -40,9 +40,6 @@
 import java.lang.reflect.AnnotatedType;
 import java.lang.reflect.Method;
 
-import org.scijava.param.Parameter;
-import org.scijava.param.Parameters;
-
 /**
  * Useful methods for working with annotation instances.
  * 
@@ -54,22 +51,6 @@ private AnnotationUtils() {
 		// prevent instantiation of utility class
 	}
 
-	/**
-	 * Gets a list of {@link Parameter} from the specified annotated element.
-	 * If the element is not annotated, an empty array is returned.
-	 * 
-	 * @param element the annotated element
-	 * @return array of {@link Parameter} annotations
-	 */
-	public static Parameter[] parameters(final AnnotatedElement element) {
-		final Parameters params = element.getAnnotation(Parameters.class);
-		if (params != null) {
-			return params.value();
-		}
-		final Parameter p = element.getAnnotation(Parameter.class);
-		return p == null ? new Parameter[0] : new Parameter[] { p };
-	}
-
 	/**
 	 * Attempt to retrieve the specified annotation from the i'th parameter
 	 * of the specified method. This method will only find annotations with:
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/AnnotatedParameterMember.java b/scijava/scijava-ops/src/main/java/org/scijava/param/AnnotatedParameterMember.java
deleted file mode 100644
index 8d01b6a9a..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/AnnotatedParameterMember.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package org.scijava.param;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Type;
-import java.util.Arrays;
-import java.util.List;
-
-import org.scijava.struct.ItemIO;
-import org.scijava.struct.Member;
-
-/**
- * {@link Member} backed by a {@link Field} annotated by {@link Parameter}.
- *
- * @author Curtis Rueden
- * @param <T>
- */
-public abstract class AnnotatedParameterMember<T> implements ParameterMember<T> {
-
-	/** Type, or a subtype thereof, which houses the field. */
-	private final Type itemType;
-
-	/** Annotation describing the item. */
-	private final Parameter annotation;
-	
-	private ItemIO itemIO;
-
-	public AnnotatedParameterMember(final Type itemType,
-		final Parameter annotation)
-	{
-		this.itemType = itemType;
-		this.annotation = annotation;
-	}
-
-	// -- AnnotatedParameterMember methods --
-
-	public Parameter getAnnotation() {
-		return annotation;
-	}
-
-	// -- ParameterMember methods --
-
-	@Override
-	public ItemVisibility getVisibility() {
-		return getAnnotation().visibility();
-	}
-
-	@Override
-	public boolean isAutoFill() {
-		return getAnnotation().autoFill();
-	}
-
-	@Override
-	public boolean isRequired() {
-		return getAnnotation().required();
-	}
-
-	@Override
-	public boolean isPersisted() {
-		return getAnnotation().persist();
-	}
-
-	@Override
-	public String getPersistKey() {
-		return getAnnotation().persistKey();
-	}
-
-	@Override
-	public String getInitializer() {
-		return getAnnotation().initializer();
-	}
-
-	@Override
-	public String getValidater() {
-		return getAnnotation().validater();
-	}
-
-	@Override
-	public String getCallback() {
-		return getAnnotation().callback();
-	}
-
-	@Override
-	public String getWidgetStyle() {
-		return getAnnotation().style();
-	}
-
-	@Override
-	public Object getMinimumValue() {
-		return getAnnotation().min();
-	}
-
-	@Override
-	public Object getMaximumValue() {
-		return getAnnotation().max();
-	}
-
-	@Override
-	public Object getStepSize() {
-		return getAnnotation().stepSize();
-	}
-
-	@Override
-	public List<Object> getChoices() {
-		final String[] choices = getAnnotation().choices();
-		if (choices.length == 0) return ParameterMember.super.getChoices();
-		return Arrays.asList((Object[]) choices);
-	}
-
-	// -- Member methods --
-
-	@Override
-	public String getKey() {
-		return getAnnotation().key();
-	}
-
-	@Override
-	public String getDescription() {
-		return getAnnotation().description();
-	}
-
-	@Override
-	public Type getType() {
-		return itemType;
-	}
-
-	@Override
-	public ItemIO getIOType() {
-		if (itemIO == null) {
-			// CTR START HERE: if AUTO here, compute what it actually is and cache.
-			itemIO = getAnnotation().itemIO();
-		}
-		return itemIO;
-	}
-	
-	@Override
-	public boolean isStruct() {
-		return getAnnotation().struct();
-	}
-}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/DefaultMutableParameterMember.java b/scijava/scijava-ops/src/main/java/org/scijava/param/DefaultMutableParameterMember.java
deleted file mode 100644
index 311bf6600..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/DefaultMutableParameterMember.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * #%L
- * SciJava Common shared library for SciJava software.
- * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
- * %%
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * #L%
- */
-
-package org.scijava.param;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.scijava.struct.ItemIO;
-
-
-/**
- * Default {@link MutableParameterMember} implementation.
- * 
- * @author Curtis Rueden
- */
-public class DefaultMutableParameterMember<T> implements
-	MutableParameterMember<T>
-{
-
-	private final String key;
-	private final Type type;
-	private final ItemIO ioType;
-
-	private ItemVisibility visibility;
-	private boolean required;
-	private boolean persisted;
-	private String persistKey;
-	private String initializer;
-	private String validater;
-	private String callback;
-	private String widgetStyle;
-	private Object defaultValue;
-	private Object minimumValue;
-	private Object maximumValue;
-	private Object softMinimum;
-	private Object softMaximum;
-	private Object stepSize;
-	private final List<Object> choices = new ArrayList<>();
-	private String label;
-	private String description;
-
-	/** Table of extra key/value pairs. */
-	private final Map<String, String> values = new HashMap<>();
-
-	public DefaultMutableParameterMember(final String key, final Class<T> type, final ItemIO ioType) {
-		this(key, "", (Type) type, ioType);
-	}
-	public DefaultMutableParameterMember(final String key, final Type type, final ItemIO ioType) {
-		this(key, "", type, ioType);
-	}
-	public DefaultMutableParameterMember(final String key, final String description, final Class<T> type, final ItemIO ioType) {
-		this(key, description, (Type) type, ioType);
-	}
-	public DefaultMutableParameterMember(final String key, final String description, final Type type, final ItemIO ioType) {
-		this.key = key;
-		this.description = description;
-		this.type = type;
-		this.ioType = ioType;
-		visibility = MutableParameterMember.super.getVisibility();
-		required = MutableParameterMember.super.isRequired();
-		persisted = MutableParameterMember.super.isPersisted();
-		persistKey = MutableParameterMember.super.getPersistKey();
-		initializer = MutableParameterMember.super.getInitializer();
-		callback = MutableParameterMember.super.getCallback();
-		widgetStyle = MutableParameterMember.super.getWidgetStyle();
-		minimumValue = MutableParameterMember.super.getMinimumValue();
-		maximumValue = MutableParameterMember.super.getMaximumValue();
-		stepSize = MutableParameterMember.super.getStepSize();
-		final List<Object> superChoices = MutableParameterMember.super.getChoices();
-		if (superChoices != null) choices.addAll(superChoices);
-		label = MutableParameterMember.super.getLabel();
-	}
-
-	/** Creates a new parameter with the same values as the given one. */
-	public DefaultMutableParameterMember(final ParameterMember<T> member) {
-		key = member.getKey();
-		type = member.getType();
-		ioType = member.getIOType();
-		visibility = member.getVisibility();
-		required = member.isRequired();
-		persisted = member.isPersisted();
-		persistKey = member.getPersistKey();
-		initializer = member.getInitializer();
-		callback = member.getCallback();
-		widgetStyle = member.getWidgetStyle();
-		minimumValue = member.getMinimumValue();
-		maximumValue = member.getMaximumValue();
-		softMinimum = member.getSoftMinimum();
-		softMaximum = member.getSoftMaximum();
-		stepSize = member.getStepSize();
-		final List<Object> memberChoices = member.getChoices();
-		if (memberChoices != null) choices.addAll(memberChoices);
-		label = member.getLabel();
-		description = member.getDescription();
-	}
-
-	// -- MutableParameterMember methods --
-
-	@Override
-	public void setVisibility(final ItemVisibility visibility) {
-		this.visibility = visibility;
-	}
-
-	@Override
-	public void setRequired(final boolean required) {
-		this.required = required;
-	}
-
-	@Override
-	public void setPersisted(final boolean persisted) {
-		this.persisted = persisted;
-	}
-
-	@Override
-	public void setPersistKey(final String persistKey) {
-		this.persistKey = persistKey;
-	}
-
-	@Override
-	public void setInitializer(final String initializer) {
-		this.initializer = initializer;
-	}
-
-	@Override
-	public void setValidater(final String validater) {
-		this.validater = validater;
-	}
-
-	@Override
-	public void setCallback(final String callback) {
-		this.callback = callback;
-	}
-
-	@Override
-	public void setWidgetStyle(final String widgetStyle) {
-		this.widgetStyle = widgetStyle;
-	}
-
-	@Override
-	public void setDefaultValue(final Object defaultValue) {
-		this.defaultValue = defaultValue;
-	}
-
-	@Override
-	public void setMinimumValue(final Object minimumValue) {
-		this.minimumValue = minimumValue;
-	}
-
-	@Override
-	public void setMaximumValue(final Object maximumValue) {
-		this.maximumValue = maximumValue;
-	}
-
-	@Override
-	public void setSoftMinimum(final Object softMinimum) {
-		this.softMinimum = softMinimum;
-	}
-
-	@Override
-	public void setSoftMaximum(final Object softMaximum) {
-		this.softMaximum = softMaximum;
-	}
-
-	@Override
-	public void setStepSize(final Object stepSize) {
-		this.stepSize = stepSize;
-	}
-
-	@Override
-	public void setChoices(final List<Object> choices) {
-		this.choices.clear();
-		this.choices.addAll(choices);
-	}
-
-	@Override
-	public void set(final String key, final String value) {
-		values.put(key, value);
-	}
-
-	// -- MutableBasicDetails methods --
-
-	@Override
-	public void setLabel(final String label) {
-		this.label = label;
-	}
-
-	@Override
-	public void setDescription(final String description) {
-		this.description = description;
-	}
-
-	// -- ParameterMember methods --
-
-	@Override
-	public ItemVisibility getVisibility() {
-		return visibility;
-	}
-
-	@Override
-	public boolean isRequired() {
-		return required;
-	}
-
-	@Override
-	public boolean isPersisted() {
-		return persisted;
-	}
-
-	@Override
-	public String getPersistKey() {
-		return persistKey;
-	}
-
-	@Override
-	public String getInitializer() {
-		return initializer;
-	}
-
-	@Override
-	public String getValidater() {
-		return validater;
-	}
-
-	@Override
-	public String getCallback() {
-		return callback;
-	}
-
-	@Override
-	public String getWidgetStyle() {
-		return widgetStyle;
-	}
-
-	@Override
-	public Object getDefaultValue() {
-		return defaultValue;
-	}
-
-	@Override
-	public Object getMinimumValue() {
-		return minimumValue;
-	}
-
-	@Override
-	public Object getMaximumValue() {
-		return maximumValue;
-	}
-
-	@Override
-	public Object getSoftMinimum() {
-		return softMinimum;
-	}
-
-	@Override
-	public Object getSoftMaximum() {
-		return softMaximum;
-	}
-
-	@Override
-	public Object getStepSize() {
-		return stepSize;
-	}
-
-	@Override
-	public List<Object> getChoices() {
-		return Collections.unmodifiableList(choices);
-	}
-
-	// -- BasicDetails methods --
-
-	@Override
-	public String getLabel() {
-		return label;
-	}
-
-	@Override
-	public String getDescription() {
-		return description;
-	}
-
-	// -- Member methods --
-
-	@Override
-	public String getKey() {
-		return key;
-	}
-
-	@Override
-	public Type getType() {
-		return type;
-	}
-
-	@Override
-	public ItemIO getIOType() {
-		return ioType;
-	}
-}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/FieldParameterMember.java b/scijava/scijava-ops/src/main/java/org/scijava/param/FieldParameterMember.java
deleted file mode 100644
index 790446819..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/FieldParameterMember.java
+++ /dev/null
@@ -1,123 +0,0 @@
-
-package org.scijava.param;
-
-import java.lang.reflect.Field;
-
-import org.scijava.struct.Member;
-import org.scijava.struct.MemberInstance;
-import org.scijava.struct.Struct;
-import org.scijava.struct.ValueAccessible;
-import org.scijava.struct.ValueAccessibleMemberInstance;
-import org.scijava.types.Types;
-
-/**
- * {@link Member} backed by a {@link Field} annotated by {@link Parameter}.
- *
- * @author Curtis Rueden
- * @param <T>
- */
-public class FieldParameterMember<T> extends AnnotatedParameterMember<T>
-	implements ValueAccessible<T>
-{
-
-	private final Field field;
-	private final Class<?> structType;
-	private final Struct struct;
-
-	public FieldParameterMember(final Field field, final Class<?> structType, Parameter parameterAnnotation)
-		throws ValidityException
-	{
-		super(Types.fieldType(field, structType), parameterAnnotation);
-		this.field = field;
-		this.structType = structType;
-		struct = isStruct() ? ParameterStructs.structOf(getRawType()) : null;
-	}
-
-	// -- FieldParameterItem methods --
-
-	public Field getField() {
-		return field;
-	}
-
-	// -- ValueAccessible methods --
-
-	@Override
-	public T get(final Object o) {
-		try {
-			@SuppressWarnings("unchecked")
-			final T value = (T) field(this).get(o);
-			return value;
-		}
-		catch (final IllegalAccessException exc) {
-			return null; // FIXME
-		}
-	}
-
-	@Override
-	public void set(final T value, final Object o) {
-		try {
-			field(this).set(o, value);
-		}
-		catch (final IllegalAccessException exc) {
-			// FIXME
-		}
-	}
-
-	// -- ParameterItem methods --
-
-	@Override
-	public T getDefaultValue() {
-		// NB: The default value is the initial field value.
-		// E.g.:
-		//
-		//   @Parameter
-		//   private int weekdays = 5;
-		//
-		// To obtain this information, we need to instantiate the object, then
-		// extract the value of the associated field.
-		//
-		// Of course, the command might do evil things like:
-		//
-		//   @Parameter
-		//   private long time = System.currentTimeMillis();
-		//
-		// In which case the default value will vary by instance. But there is
-		// nothing we can really do about that. This is only a best effort.
-
-		try {
-			final Object dummy = structType.newInstance();
-			@SuppressWarnings("unchecked")
-			final T value = (T) getField().get(dummy);
-			return value;
-		}
-		catch (final InstantiationException | IllegalAccessException exc) {
-			throw new IllegalStateException("Missing no-args constructor", exc);
-		}
-	}
-
-	// -- Member methods --
-	
-	public static <T> Field field(final Member<T> item) {
-		if (item instanceof FieldParameterMember) {
-			final FieldParameterMember<T> fpItem = (FieldParameterMember<T>) item;
-			return fpItem.getField();
-		}
-		return null;
-	}
-
-	@Override
-	public String getKey() {
-		final String key = getAnnotation().key();
-		return key == null || key.isEmpty() ? field.getName() : key;
-	}
-
-	@Override
-	public Struct childStruct() {
-		return struct;
-	}
-
-	@Override
-	public MemberInstance<T> createInstance(final Object o) {
-		return new ValueAccessibleMemberInstance<>(this, o);
-	}
-}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/FunctionalParameterMember.java b/scijava/scijava-ops/src/main/java/org/scijava/param/FunctionalParameterMember.java
deleted file mode 100644
index f00737275..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/FunctionalParameterMember.java
+++ /dev/null
@@ -1,39 +0,0 @@
-
-package org.scijava.param;
-
-import java.lang.reflect.Type;
-
-import org.scijava.struct.Member;
-import org.scijava.struct.Struct;
-
-/**
- * {@link Member} backed by a generic parameter of a
- * {@link FunctionalInterface}-annotated interface.
- * <p>
- * The generic parameter in question is indicated by annotating a {@link Class}
- * with {@link Parameter}.
- * </p>
- *
- * @author Curtis Rueden
- * @param <T>
- */
-public class FunctionalParameterMember<T> extends AnnotatedParameterMember<T> {
-
-	private Struct struct;
-
-	public FunctionalParameterMember(final Type itemType,
-		final Parameter annotation) throws ValidityException
-	{
-		super(itemType, annotation);
-		final String key = getKey();
-		if (key == null || key.isEmpty()) {
-			throw new ValidityException("Functional parameter must specify key");
-		}
-		struct = isStruct() ? ParameterStructs.structOf(getRawType()) : null;
-	}
-
-	@Override
-	public Struct childStruct() {
-		return struct;
-	}
-}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
index e9a5c87cb..f95cb5712 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
@@ -8,17 +8,12 @@
 import com.github.therapi.runtimejavadoc.ParamJavadoc;
 import com.github.therapi.runtimejavadoc.RuntimeJavadoc;
 
-import io.leangen.geantyref.AnnotationFormatException;
-import io.leangen.geantyref.TypeFactory;
-
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -39,8 +34,6 @@ public class JavadocParameterData implements ParameterData {
 	List<String> paramDescriptions;
 	String returnDescription;
 
-	
-
 	public JavadocParameterData(Method m) {
 		parseMethod(m);
 	}
@@ -67,8 +60,8 @@ public JavadocParameterData(Field f) {
 		FieldJavadoc doc = RuntimeJavadoc.getJavadoc(f);
 		long numIns = sam.getParameterCount();
 		long numOuts = 1; // There is always one output
-		if (hasCustomJavadoc(doc.getOther(), numIns, numOuts)) populateViaCustomTaglets(doc
-			.getOther());
+		if (hasCustomJavadoc(doc.getOther(), numIns, numOuts))
+			populateViaCustomTaglets(doc.getOther());
 		else throw new IllegalArgumentException("Field " + f +
 			" does not have enough taglets to generate OpInfo documentation!");
 	}
@@ -81,7 +74,7 @@ public JavadocParameterData(OpInfo info, Type newType) {
 
 		// this method is called when the op is adapted/simplified. In the case of
 		// adaptation, the op's output might shift from a pure output to an input,
-		// or might shift from a container to a pure output. We 
+		// or might shift from a container to a pure output. We
 		Method sam = ParameterStructs.singularAbstractMethod(Types.raw(newType));
 		if (sam.getParameterCount() > inputs.size()) {
 			inputs.add(output);
@@ -97,7 +90,7 @@ else if (sam.getParameterCount() < inputs.size()) {
 
 			inputs.remove(ioMember.get());
 		}
-		for(Member<?> m : inputs) {
+		for (Member<?> m : inputs) {
 			paramNames.add(m.getKey());
 			paramDescriptions.add(m.getDescription());
 		}
@@ -174,7 +167,9 @@ private long getOpParams(Method m) {
 	 * @return true iff there are {@code numParams} inputs and {@code numReturns}
 	 *         outputs
 	 */
-	private boolean hasVanillaJavadoc(MethodJavadoc doc, long numParams, long numReturns) {
+	private boolean hasVanillaJavadoc(MethodJavadoc doc, long numParams,
+		long numReturns)
+	{
 		// We require a @param tag for each of the method parameters
 		boolean sufficientParams = doc.getParams().size() == numParams;
 		// We require a @return tag for the method return iff not null
@@ -197,7 +192,9 @@ private boolean hasVanillaJavadoc(MethodJavadoc doc, long numParams, long numRet
 	 * @return true iff there are {@code numIns} inputs and {@code numOuts}
 	 *         outputs
 	 */
-	private boolean hasCustomJavadoc(List<OtherJavadoc> doc, long numIns, long numOuts) {
+	private boolean hasCustomJavadoc(List<OtherJavadoc> doc, long numIns,
+		long numOuts)
+	{
 		int ins = 0, outs = 0;
 		for (OtherJavadoc other : doc) {
 			switch (other.getName()) {
@@ -214,7 +211,8 @@ private boolean hasCustomJavadoc(List<OtherJavadoc> doc, long numIns, long numOu
 					break;
 			}
 		}
-		// We require as many input/container/mutable taglets as there are parameters
+		// We require as many input/container/mutable taglets as there are
+		// parameters
 		boolean sufficientIns = ins == numIns;
 		// We require one container/mutable/output taglet
 		boolean sufficientOuts = outs == numOuts;
@@ -229,9 +227,13 @@ private boolean hasCustomJavadoc(List<OtherJavadoc> doc, long numIns, long numOu
 	 * @param params the {@code @param} tags on the method of interest
 	 * @param returnDoc the string following {@code @return}
 	 */
-	private void populateViaParamAndReturn(List<ParamJavadoc> params, Comment returnDoc) {
-		paramNames = params.stream().map(param -> param.getName()).collect(Collectors.toList());
-		paramDescriptions = params.stream().map(param -> param.getComment().toString()).collect(Collectors.toList());
+	private void populateViaParamAndReturn(List<ParamJavadoc> params,
+		Comment returnDoc)
+	{
+		paramNames = params.stream().map(param -> param.getName()).collect(
+			Collectors.toList());
+		paramDescriptions = params.stream().map(param -> param.getComment()
+			.toString()).collect(Collectors.toList());
 		returnDescription = returnDoc.toString();
 	}
 
@@ -253,10 +255,17 @@ private void populateViaCustomTaglets(List<OtherJavadoc> doc) {
 			// add to params if not a pure output
 			if (!name.equals("output")) {
 				String param = other.getComment().toString();
-				paramNames.add(param.substring(0, param.indexOf(" ")));
-				paramDescriptions.add(param.substring(param.indexOf(" ") + 1));
+				int space = param.indexOf(" ");
+				if (space != -1) {
+					paramNames.add(param.substring(0, param.indexOf(" ")));
+					paramDescriptions.add(param.substring(param.indexOf(" ") + 1));
+				}
+				else {
+					paramNames.add(param);
+					paramDescriptions.add("");
+				}
 			}
-			// add return description if an I/O 
+			// add return description if an I/O
 			if (!name.equals("input")) {
 				if (returnDescription != null) throw new IllegalArgumentException(
 					"Op cannot have multiple returns!");
@@ -281,61 +290,50 @@ private boolean validParameterTag(String tagType) {
 	}
 
 	/**
-	 * Synthesizes a set of {@link Parameter}s using the data present in the
+	 * Synthesizes a set of {@link Member}s using the data present in the
 	 * javadoc, as well as {@code fmts}.
 	 * 
 	 * @param fmts the list of inputs, outputs, and other types required by the Op
 	 */
 	@Override
-	public List<Parameter> synthesizeAnnotations(List<FunctionalMethodType> fmts) {
-		List<Parameter> params = new ArrayList<>();
+	public List<Member<?>> synthesizeMembers(List<FunctionalMethodType> fmts) {
+		List<Member<?>> params = new ArrayList<>();
 		int ins = 0;
 		int outs = 0;
 
-		Map<String, Object> paramValues = new HashMap<>();
 		for (FunctionalMethodType fmt : fmts) {
-			paramValues.clear();
-			paramValues.put(Parameter.ITEMIO_FIELD_NAME, fmt.itemIO());
-			
 			String key;
 			String description;
 			switch (fmt.itemIO()) {
-			case INPUT:
-				key = paramNames.get(ins);
-				description = paramDescriptions.get(ins);
-				ins++;
-				break;
-			case OUTPUT:
-				// NB the @return tag does not provide a name, only a comment
-				key = "output" + (outs == 0 ? "" : outs); 
-				description = returnDescription;
-				outs++;
-				break;
-			case CONTAINER:
-				key = paramNames.get(ins);
-				description = paramDescriptions.get(ins);
-				ins++;
-				outs++;
-				break;
-			case MUTABLE:
-				key = paramNames.get(ins);
-				description = paramDescriptions.get(ins);
-				ins++;
-				outs++;
-				break;
-			default:
-				throw new RuntimeException("Unexpected ItemIO type encountered!");
-			}
-			
-			paramValues.put(Parameter.KEY_FIELD_NAME, key);
-			paramValues.put(Parameter.DESCRIPTION_FIELD_NAME, description);
-			
-			try {
-				params.add(TypeFactory.annotation(Parameter.class, paramValues));
-			} catch (AnnotationFormatException e) {
-				throw new RuntimeException("Error during Parameter annotation synthetization. This is "
-						+ "most likely an implementation error.", e);
+				case INPUT:
+					key = paramNames.get(ins);
+					description = paramDescriptions.get(ins);
+					ins++;
+					break;
+				case OUTPUT:
+					// NB the @return tag does not provide a name, only a comment
+					key = "output" + (outs == 0 ? "" : outs);
+					description = returnDescription;
+					outs++;
+					break;
+				case CONTAINER:
+					key = paramNames.get(ins);
+					description = paramDescriptions.get(ins);
+					ins++;
+					outs++;
+					break;
+				case MUTABLE:
+					key = paramNames.get(ins);
+					description = paramDescriptions.get(ins);
+					ins++;
+					outs++;
+					break;
+				default:
+					throw new RuntimeException("Unexpected ItemIO type encountered!");
 			}
+
+			params.add(new SynthesizedParameterMember<>(fmt.type(), key, description,
+				fmt.itemIO()));
 		}
 		return params;
 	}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/MutableParameterMember.java b/scijava/scijava-ops/src/main/java/org/scijava/param/MutableParameterMember.java
deleted file mode 100644
index 576adfcfb..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/MutableParameterMember.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.scijava.param;
-
-import java.util.List;
-
-/**
- * A {@link ParameterMember} whose metadata can be changed.
- * 
- * @author Curtis Rueden
- */
-public interface MutableParameterMember<T> extends ParameterMember<T> {
-
-	void setVisibility(ItemVisibility visibility);
-
-	void setRequired(boolean required);
-
-	void setPersisted(boolean persisted);
-
-	void setPersistKey(String persistKey);
-
-	void setInitializer(String initializer);
-
-	void setValidater(String validater);
-
-	void setCallback(String callback);
-
-	void setWidgetStyle(String widgetStyle);
-
-	void setDefaultValue(Object defaultValue);
-
-	void setMinimumValue(Object minimumValue);
-
-	void setMaximumValue(Object maximumValue);
-
-	void setSoftMinimum(Object softMinimum);
-
-	void setSoftMaximum(Object softMaximum);
-
-	void setStepSize(Object stepSize);
-
-	void setChoices(List<Object> choices);
-
-	// -- MutableBasicDetails methods --
-
-	// TODO: Factor out to MutableBasicDetails.
-
-	void setLabel(String label);
-
-	void setDescription(String description);
-
-	default void set(final String key) {
-		set(key, null);
-	}
-
-	void set(String key, String value);
-}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/Parameter.java b/scijava/scijava-ops/src/main/java/org/scijava/param/Parameter.java
deleted file mode 100644
index 093889aec..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/Parameter.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * #%L
- * SciJava Common shared library for SciJava software.
- * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
- * %%
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * #L%
- */
-
-package org.scijava.param;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Repeatable;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.scijava.plugin.Attr;
-import org.scijava.struct.ItemIO;
-import org.scijava.struct.MemberInstance;
-
-/**
- * An annotation for indicating a field is an input or output parameter. This
- * annotation is a useful way for plugins to declare their inputs and outputs
- * simply.
- * 
- * @author Johannes Schindelin
- * @author Grant Harris
- * @author Curtis Rueden
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.FIELD, ElementType.TYPE, ElementType.METHOD })
-@Repeatable(Parameters.class)
-public @interface Parameter {
-
-	/**
-	 * IMPORTANT: Parameter annotation instances are mutated using reflections
-	 * in order to resolve {@link ItemIO#AUTO} which accesses this field
-	 * by name. If the name is changed, this has to be changed accordingly.
-	 */
-	public static final String ITEMIO_FIELD_NAME = "itemIO";
-	
-	/**
-	 * IMPORTANT: Parameter annotation instances are mutated using reflections
-	 * in order to resolve {@link ItemIO#AUTO} which accesses this field
-	 * by name. If the name is changed, this has to be changed accordingly.
-	 */
-	public static final String KEY_FIELD_NAME = "key";
-
-	/**
-	 * IMPORTANT: Parameter annotation instances are mutated using reflections
-	 * in order to resolve {@link ItemIO#AUTO} which accesses this field
-	 * by name. If the name is changed, this has to be changed accordingly.
-	 */
-	public static final String DESCRIPTION_FIELD_NAME = "description";
-	
-	/** Defines a key for the parameter. */
-	String key() default "";
-
-	/** Defines a label for the parameter. */
-	String label() default "";
-
-	/** Defines a description for the parameter. */
-	String description() default "";
-
-	/**
-	 * Defines the input/output type of the parameter.
-	 * 
-	 * @see ItemIO
-	 */
-	ItemIO itemIO() default ItemIO.AUTO;
-
-	/**
-	 * Defines whether the parameter references an object which itself has
-	 * parameters. This allows for nested structures to be created.
-	 */
-	boolean struct() default false;
-
-	/**
-	 * Defines the "visibility" of the parameter.
-	 * <p>
-	 * Choices are:
-	 * </p>
-	 * <ul>
-	 * <li>NORMAL: parameter is included in the history for purposes of data
-	 * provenance, and included as a parameter when recording scripts.</li>
-	 * <li>TRANSIENT: parameter is excluded from the history for the purposes of
-	 * data provenance, but still included as a parameter when recording scripts.</li>
-	 * <li>INVISIBLE: parameter is excluded from the history for the purposes of
-	 * data provenance, and also excluded as a parameter when recording scripts.
-	 * This option should only be used for parameters with no effect on the final
-	 * output, such as a "verbose" flag.</li>
-	 * <li>MESSAGE: parameter value is intended as a message only, not editable by
-	 * the user nor included as an input or output parameter.</li>
-	 * </ul>
-	 */
-	ItemVisibility visibility() default ItemVisibility.NORMAL;
-
-	/**
-	 * Defines whether the parameter value should be filled programmatically, if
-	 * possible.
-	 */
-	boolean autoFill() default true;
-
-	/** Defines whether the parameter value must be non-null. */
-	boolean required() default true;
-
-	/** Defines whether to remember the most recent value of the parameter. */
-	boolean persist() default true;
-
-	/** Defines a key to use for saving the value persistently. */
-	String persistKey() default "";
-
-	/** Defines a function that is called to initialize the parameter. */
-	String initializer() default "";
-
-	/**
-	 * Defines a function that is called to validate the parameter value after it
-	 * is marked as resolved.
-	 * 
-	 * @see MemberInstance#resolve()
-	 */
-	String validater() default "";
-
-	/**
-	 * Defines a function that is called whenever this parameter changes.
-	 * <p>
-	 * This mechanism enables interdependent parameters of various types. For
-	 * example, two {@code int} parameters "width" and "height" could update each
-	 * other when another {@code boolean} "Preserve aspect ratio" flag is set.
-	 * </p>
-	 */
-	String callback() default "";
-
-	/**
-	 * Defines the preferred widget style.
-	 * <p>
-	 * We do not use an {@code enum} because the styles need to be extensible. And
-	 * we cannot use an interface-driven extensible enum pattern, because
-	 * interfaces cannot be used as attributes within a Java annotation interface.
-	 * So we fall back to strings!
-	 * </p>
-	 */
-	String style() default "";
-
-	/** Defines the minimum allowed value (numeric parameters only). */
-	String min() default "";
-
-	/** Defines the maximum allowed value (numeric parameters only). */
-	String max() default "";
-
-	/** Defines the step size to use (numeric parameters only). */
-	String stepSize() default "";
-
-	/** Defines the list of possible values (multiple choice text fields only). */
-	String[] choices() default {};
-
-	/**
-	 * A list of additional attributes which can be used to extend this annotation
-	 * beyond its built-in capabilities.
-	 */
-	Attr[] attrs() default {};
-}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterData.java
index 5e0cbfa6e..1a2b3fe9a 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterData.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterData.java
@@ -2,8 +2,10 @@
 
 import java.util.List;
 
+import org.scijava.struct.Member;
+
 public interface ParameterData {
 
-	public List<Parameter> synthesizeAnnotations(List<FunctionalMethodType> fmts);
+	public List<Member<?>> synthesizeMembers(List<FunctionalMethodType> fmts);
 
 }
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java
index 77e0a78f2..b90ee54f6 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java
@@ -244,7 +244,7 @@ public static List<Member<?>> parse(final Class<?> c, final Method method)
 			parseFunctionalParameters(items, names, problems, functionalType, paramData);
 
 			// Parse method level @OpDependency annotations.
-			parseMethodOpDependencies(items, problems, c, method);
+			parseMethodOpDependencies(items, method);
 
 			// Fail if there were any problems.
 			if (!problems.isEmpty()) throw new ValidityException(problems);
@@ -423,61 +423,6 @@ private static void checkModifiers(String message, final ArrayList<ValidityProbl
 			}
 		}
 	}
-	
-	/**
-	 * Create new instances of {@link Parameter} annotations having default names (key) and the {@link ItemIO}
-	 * from the specified list of {@link FunctionalMethodType}s. Default names will be:<br><br>
-	 * 'input{index}' for {@link ItemIO#INPUT}<br>
-	 * 'output{index}' for {@link ItemIO#OUTPUT}<br>
-	 * 'container{index}' for {@link ItemIO#CONTAINER}<br>
-	 * 'mutable{index}' for {@link ItemIO#MUTABLE}<br><br>
-	 * with {index} being counted individually.
-	 * 
-	 * This is used to infer the annotations for {@link FunctionalParameterMember}s if the {@link Parameter} is not
-	 * explicitly specified by a user and should thus be inferred from the functional method type.
-	 * 
-	 * @param fmts
-	 * @return
-	 */
-	private static Parameter[] synthesizeParameterAnnotations(final List<FunctionalMethodType> fmts, JavadocParameterData data) {
-		List<Parameter> params = new ArrayList<>();
-		
-		int ins, outs, containers, mutables;
-		ins = outs = containers = mutables = 1;
-		for (FunctionalMethodType fmt : fmts) {
-			Map<String, Object> paramValues = new HashMap<>();
-			paramValues.put(Parameter.ITEMIO_FIELD_NAME, fmt.itemIO());
-			
-			String key;
-			switch (fmt.itemIO()) {
-			case INPUT:
-				key = "input" + ins++;
-				break;
-			case OUTPUT:
-				key = "output" + outs++;
-				break;
-			case CONTAINER:
-				key = "container" + containers++;
-				break;
-			case MUTABLE:
-				key = "mutable" + mutables++;
-				break;
-			default:
-				throw new RuntimeException("Unexpected ItemIO type encountered!");
-			}
-			
-			paramValues.put(Parameter.KEY_FIELD_NAME, key);
-			
-			try {
-				params.add(TypeFactory.annotation(Parameter.class, paramValues));
-			} catch (AnnotationFormatException e) {
-				throw new RuntimeException("Error during Parameter annotation synthetization. This is "
-						+ "most likely an implementation error.", e);
-			}
-		}
-		
-		return params.toArray(new Parameter[params.size()]);
-	}
 
 	private static void parseFunctionalParameters(final ArrayList<Member<?>> items, final Set<String> names, final ArrayList<ValidityProblem> problems,
 			Type type, ParameterData data) {
@@ -492,30 +437,19 @@ private static void parseFunctionalParameters(final ArrayList<Member<?>> items,
 			return;
 		}
 
-		// Get parameter annotations (may not be present)
-		// TODO: remove Parameter annotations from all ops and remove logic below.
-		// TODO: grab names from OpClass/OpField annotations.
-		Parameter[] annotations = data.synthesizeAnnotations(fmts).toArray(Parameter[]::new);
+		// Synthesize members
+		List<Member<?>> fmtMembers = data.synthesizeMembers(fmts);
 
-		for (int i=0; i<annotations.length; i++) {
-			String key = annotations[i].key();
-			final Type itemType = fmts.get(i).type();
-			
-			final boolean valid = checkValidity(annotations[i], key, Types.raw(itemType), false,
-					names, problems);
+		for (Member<?> m : fmtMembers) {
+			String key = m.getKey();
+			final Type itemType = m.getType();
+
+			final boolean valid = checkValidity(m, key, Types.raw(itemType), false,
+				names, problems);
 			if (!valid) continue;
-			
-			try {
-				final ParameterMember<?> item = //
-						new FunctionalParameterMember<>(itemType, annotations[i]);
-				names.add(key);
-				items.add(item);
-			}
-			catch (final ValidityException exc) {
-				problems.addAll(exc.problems());
-			}
+			items.add(m);
+			names.add(m.getKey());
 		}
-		
 	}
 
 	private static void parseFieldOpDependencies(final List<Member<?>> items,
@@ -541,7 +475,6 @@ private static void parseFieldOpDependencies(final List<Member<?>> items,
 	}
 
 	private static void parseMethodOpDependencies(final List<Member<?>> items,
-		final List<ValidityProblem> problems, final Class<?> enclosingclass,
 		final Method annotatedMethod)
 	{
 		final java.lang.reflect.Parameter[] methodParams = annotatedMethod
@@ -564,25 +497,6 @@ private static boolean isImmutable(final Class<?> type) {
 				Types.isBoolean(type);
 	}
 
-	/**
-	 * Finds the class declaring {@code @Parameter} annotations. They might be on
-	 * this type, on a supertype, or an implemented interface.
-	 */
-	private static Class<?> findParametersDeclaration(final Class<?> type) {
-		if (type == null) return null;
-		final Deque<Class<?>> types = new ArrayDeque<>();
-		types.add(type);
-		while (!types.isEmpty()) {
-			final Class<?> candidate = types.pop();
-			if (candidate.getAnnotation(Parameters.class) != null || 
-					candidate.getAnnotation(Parameter.class) != null) return candidate;
-			final Class<?> superType = candidate.getSuperclass() ;
-			if (superType != null) types.add(superType);
-			types.addAll(Arrays.asList(candidate.getInterfaces()));
-		}
-		return null;
-	}
-
 	/**
 	 * Searches for a {@code @FunctionalInterface} annotated interface in the 
 	 * class hierarchy of the specified type. The first one that is found will
@@ -601,20 +515,12 @@ public static Class<?> findFunctionalInterface(Class<?> type) {
 		return findFunctionalInterface(type.getSuperclass());
 	}
 
-	private static boolean checkValidity(Parameter param, String name,
+	private static boolean checkValidity(Member<?> m, String name,
 		Class<?> type, boolean isFinal, Set<String> names,
 		ArrayList<ValidityProblem> problems)
 	{
 		boolean valid = true;
 
-		final boolean isMessage = param.visibility() == ItemVisibility.MESSAGE;
-		if (isFinal && !isMessage) {
-			// NB: Final parameters are bad because they cannot be modified.
-			final String error = "Invalid final parameter: " + name;
-			problems.add(new ValidityProblem(error));
-			valid = false;
-		}
-
 		if (names.contains(name)) {
 			// NB: Shadowed parameters are bad because they are ambiguous.
 			final String error = "Invalid duplicate parameter: " + name;
@@ -622,11 +528,11 @@ private static boolean checkValidity(Parameter param, String name,
 			valid = false;
 		}
 
-		if ((param.itemIO() == ItemIO.MUTABLE || param.itemIO() == ItemIO.CONTAINER) && isImmutable(type)) {
+		if ((m.getIOType() == ItemIO.MUTABLE || m.getIOType() == ItemIO.CONTAINER) && isImmutable(type)) {
 			// NB: The MUTABLE and CONTAINER types signify that the parameter
 			// will be written to, but immutable parameters cannot be changed in
 			// such a manner, so it makes no sense to label them as such.
-			final String error = "Immutable " + param.itemIO() + " parameter: " + name + " (" + type.getName() + " is immutable)";
+			final String error = "Immutable " + m.getIOType() + " parameter: " + name + " (" + type.getName() + " is immutable)";
 			problems.add(new ValidityProblem(error));
 			valid = false;
 		}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/Parameters.java b/scijava/scijava-ops/src/main/java/org/scijava/param/Parameters.java
deleted file mode 100644
index 826b83874..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/Parameters.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * #%L
- * SciJava Common shared library for SciJava software.
- * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
- * %%
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * #L%
- */
-
-package org.scijava.param;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Container annotation type for repeated @{@link Parameter} annotations.
- * 
- * @author Curtis Rueden
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.FIELD, ElementType.TYPE, ElementType.METHOD })
-public @interface Parameters {
-	Parameter[] value();
-}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterData.java
index f56ac5a1c..6f2b813f7 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterData.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterData.java
@@ -1,55 +1,41 @@
-package org.scijava.param;
 
-import io.leangen.geantyref.AnnotationFormatException;
-import io.leangen.geantyref.TypeFactory;
+package org.scijava.param;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
-public class SynthesizedParameterData implements ParameterData{
+import org.scijava.struct.Member;
+
+public class SynthesizedParameterData implements ParameterData {
 
 	@Override
-	public List<Parameter> synthesizeAnnotations(
-		List<FunctionalMethodType> fmts)
-	{
-		List<Parameter> params = new ArrayList<>();
-		
+	public List<Member<?>> synthesizeMembers(List<FunctionalMethodType> fmts) {
+		List<Member<?>> params = new ArrayList<>();
+
 		int ins, outs, containers, mutables;
 		ins = outs = containers = mutables = 1;
 		for (FunctionalMethodType fmt : fmts) {
-			Map<String, Object> paramValues = new HashMap<>();
-			paramValues.put(Parameter.ITEMIO_FIELD_NAME, fmt.itemIO());
-			
 			String key;
 			switch (fmt.itemIO()) {
-			case INPUT:
-				key = "input" + ins++;
-				break;
-			case OUTPUT:
-				key = "output" + outs++;
-				break;
-			case CONTAINER:
-				key = "container" + containers++;
-				break;
-			case MUTABLE:
-				key = "mutable" + mutables++;
-				break;
-			default:
-				throw new RuntimeException("Unexpected ItemIO type encountered!");
-			}
-			
-			paramValues.put(Parameter.KEY_FIELD_NAME, key);
-			
-			try {
-				params.add(TypeFactory.annotation(Parameter.class, paramValues));
-			} catch (AnnotationFormatException e) {
-				throw new RuntimeException("Error during Parameter annotation synthetization. This is "
-						+ "most likely an implementation error.", e);
+				case INPUT:
+					key = "input" + ins++;
+					break;
+				case OUTPUT:
+					key = "output" + outs++;
+					break;
+				case CONTAINER:
+					key = "container" + containers++;
+					break;
+				case MUTABLE:
+					key = "mutable" + mutables++;
+					break;
+				default:
+					throw new RuntimeException("Unexpected ItemIO type encountered!");
 			}
+			params.add(new SynthesizedParameterMember<>(fmt.type(), key, "", fmt
+				.itemIO()));
 		}
-		
+
 		return params;
 	}
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterMember.java b/scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterMember.java
new file mode 100644
index 000000000..52ab7fda9
--- /dev/null
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterMember.java
@@ -0,0 +1,64 @@
+
+package org.scijava.param;
+
+import java.lang.reflect.Type;
+
+import org.scijava.struct.ItemIO;
+import org.scijava.struct.Member;
+
+/**
+ * {@link Member} synthesized using constructor arguments
+ *
+ * @author Gabriel Selzer
+ * @param <T>
+ */
+public class SynthesizedParameterMember<T> implements Member<T> {
+
+	/** Type, or a subtype thereof, which houses the field. */
+	private final Type itemType;
+
+	/** Name of the parameter */
+	private final String name;
+
+	/** Description of the parameter */
+	private final String description;
+
+	/** IO status of the parameter */
+	private final ItemIO itemIO;
+
+	public SynthesizedParameterMember(final Type itemType,
+		final String name, final String description, final ItemIO ioType)
+	{
+		this.itemType = itemType;
+		this.name = name;
+		this.description = description;
+		this.itemIO = ioType;
+	}
+
+	// -- Member methods --
+
+	@Override
+	public String getKey() {
+		return name;
+	}
+
+	@Override
+	public String getDescription() {
+		return description;
+	}
+
+	@Override
+	public Type getType() {
+		return itemType;
+	}
+
+	@Override
+	public ItemIO getIOType() {
+		return itemIO;
+	}
+	
+	@Override
+	public boolean isStruct() {
+		return false;
+	}
+}
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderNoOutputTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderNoOutputTest.java
index d642ba3d6..3c163f2b5 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderNoOutputTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderNoOutputTest.java
@@ -10,7 +10,6 @@
 import org.scijava.ops.OpBuilder;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 import org.scijava.types.Nil;
@@ -33,9 +32,11 @@ public class OpBuilderNoOutputTest<T extends Number> extends
 	// private wrapper class
 	private static class WrappedList<E> extends ArrayList<E> {}
 
+	/**
+	 * @input in
+	 * @output out
+	 */
 	@OpField(names = opName)
-	@Parameter(key = "in", itemIO = ItemIO.INPUT)
-	@Parameter(key = "out", itemIO = ItemIO.OUTPUT)
 	public final Function<T, WrappedList<T>> func = in -> {
 
 		WrappedList<T> out = new WrappedList<>();
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java
index 4d1c6b7d5..a752e7c39 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java
@@ -5,7 +5,6 @@
 import java.util.function.Function;
 
 import org.scijava.function.Computers;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java
index ba17419ce..906836c14 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java
@@ -43,7 +43,6 @@
 import org.scijava.ops.OpField;
 import org.scijava.ops.adapt.functional.ComputersToFunctionsViaFunction;
 import org.scijava.ops.adapt.functional.ComputersToFunctionsViaSource;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java
index 4d6c61c3a..eae5b56d1 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java
@@ -11,7 +11,6 @@
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.OpField;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
@@ -104,13 +103,15 @@ public void missingDependencyViaAdaptationTest() {
 }
 
 @Plugin(type = Op.class, name = "test.furtherOutsideOp")
-@Parameter(key = "in")
-@Parameter(key = "out", itemIO = ItemIO.OUTPUT)
 class FurtherDependentOp implements Function<Double, Double> {
 
 	@OpDependency(name = "test.outsideOp")
 	private Function<Double, Double> op;
 
+	/**
+	 * @param t the input
+	 * @return the output
+	 */
 	@Override
 	public Double apply(Double t) {
 		return op.apply(t);
@@ -119,13 +120,15 @@ public Double apply(Double t) {
 }
 
 @Plugin(type = Op.class, name = "test.outsideOp")
-@Parameter(key = "in")
-@Parameter(key = "out", itemIO = ItemIO.OUTPUT)
 class DependentOp implements Function<Double, Double> {
 
 	@OpDependency(name = "test.missingDependencyOp")
 	private Function<Double, Double> op;
 
+	/**
+	 * @param t the input
+	 * @return the output
+	 */
 	@Override
 	public Double apply(Double t) {
 		return op.apply(t);
@@ -134,13 +137,15 @@ public Double apply(Double t) {
 }
 
 @Plugin(type = Op.class, name = "test.missingDependencyOp")
-@Parameter(key = "in")
-@Parameter(key = "out", itemIO = ItemIO.OUTPUT)
 class MissingDependencyOp implements Function<Double, Double> {
 
 	@OpDependency(name = "test.nonexistingOp")
 	private Function<Double, Double> op;
 
+	/**
+	 * @param t the input
+	 * @return the output
+	 */
 	@Override
 	public Double apply(Double t) {
 		return op.apply(t);
@@ -149,26 +154,30 @@ public Double apply(Double t) {
 }
 
 @Plugin(type = Op.class, name = "test.adaptMissingDep")
-@Parameter(key = "in")
-@Parameter(key = "out", itemIO = ItemIO.OUTPUT)
 class MissingDependencyOpArr1 implements Computers.Arity1<Double[], Double[]> {
 
 	@OpDependency(name = "test.nonexistingOp")
 	private Function<Double, Double> op;
 
+	/**
+	 * @param t the input
+	 * @param out the output
+	 */
 	@Override
 	public void compute(Double[] t, Double[] out) {}
 
 }
 
 @Plugin(type = Op.class, name = "test.adaptMissingDep")
-@Parameter(key = "in")
-@Parameter(key = "out", itemIO = ItemIO.OUTPUT)
 class MissingDependencyOpArr2 implements Function<Double, Double> {
 
 	@OpDependency(name = "test.nonexistingOp")
 	private Function<Double, Double> op;
 
+	/**
+	 * @param t the input
+	 * @return the output
+	 */
 	@Override
 	public Double apply(Double t) {
 		return op.apply(t);
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java
index d9463fbb0..6df265558 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java
@@ -12,7 +12,6 @@
 import org.scijava.function.Producer;
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.Op;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Any;
 import org.scijava.types.TypeExtractor;

From 846d8bcff456d6d0b426c79a7c78e2dae4b6efda Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Wed, 30 Jun 2021 17:09:43 -0500
Subject: [PATCH 58/91] WIP: Switch to MemberParser paradigm

---
 .../main/java/org/scijava/ops/OpUtils.java    |   1 +
 .../struct/FieldParameterMemberParser.java    |  50 +++++
 .../FunctionalParameterMemberParser.java      | 106 +++++++++
 .../struct}/JavadocParameterData.java         |   6 +-
 .../org/scijava/ops/struct/MemberParser.java  |  27 +++
 .../org/scijava/ops/struct/ParameterData.java |  11 +
 .../java/org/scijava/ops/struct/Structs.java  | 212 ++++++++++++++++++
 .../struct}/SynthesizedParameterData.java     |   6 +-
 .../struct}/SynthesizedParameterMember.java   |   5 +-
 .../java/org/scijava/param/ParameterData.java |  11 -
 .../org/scijava/param/ParameterStructs.java   |   3 +
 11 files changed, 419 insertions(+), 19 deletions(-)
 create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FieldParameterMemberParser.java
 create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FunctionalParameterMemberParser.java
 rename scijava/scijava-ops/src/main/java/org/scijava/{param => ops/struct}/JavadocParameterData.java (95%)
 create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MemberParser.java
 create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ParameterData.java
 create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java
 rename scijava/scijava-ops/src/main/java/org/scijava/{param => ops/struct}/SynthesizedParameterData.java (76%)
 rename scijava/scijava-ops/src/main/java/org/scijava/{param => ops/struct}/SynthesizedParameterMember.java (87%)
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/ParameterData.java

diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
index 5c0494f98..00b891d0a 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
@@ -37,6 +37,7 @@
 import java.util.stream.Collectors;
 
 import org.scijava.ops.OpCandidate.StatusCode;
+import org.scijava.ops.struct.SynthesizedParameterMember;
 import org.scijava.param.ParameterMember;
 import org.scijava.param.ParameterStructs;
 import org.scijava.param.ValidityException;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FieldParameterMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FieldParameterMemberParser.java
new file mode 100644
index 000000000..a2a5f22ff
--- /dev/null
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FieldParameterMemberParser.java
@@ -0,0 +1,50 @@
+
+package org.scijava.ops.struct;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.scijava.param.ValidityException;
+import org.scijava.param.ValidityProblem;
+import org.scijava.struct.Member;
+import org.scijava.types.Types;
+
+public class FieldParameterMemberParser implements
+	MemberParser<Field, SynthesizedParameterMember<?>>
+{
+
+	@Override
+	public List<SynthesizedParameterMember<?>> parse(Field source) {
+		Class<?> c = source.getDeclaringClass();
+		if (c == null || source == null) return null;
+		// obtain a parameterData (preferably one that scrapes the javadoc)
+		ParameterData paramData;
+		try {
+			paramData = new JavadocParameterData(source);
+		}
+		catch (IllegalArgumentException e) {
+			paramData = new SynthesizedParameterData();
+		}
+		source.setAccessible(true);
+
+		final ArrayList<SynthesizedParameterMember<?>> items = new ArrayList<>();
+		final ArrayList<ValidityProblem> problems = new ArrayList<>();
+		final Set<String> names = new HashSet<>();
+		final Type fieldType = Types.fieldType(source, c);
+
+		Structs.checkModifiers(source.toString() + ": ", problems, source.getModifiers(),
+			false, Modifier.FINAL);
+		Structs.parseFunctionalParameters(items, names, problems, fieldType, paramData);
+		// Fail if there were any problems.
+		if (!problems.isEmpty()) {
+			throw new ValidityException(problems);
+		}
+		return items;
+	}
+
+}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FunctionalParameterMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FunctionalParameterMemberParser.java
new file mode 100644
index 000000000..70e30b861
--- /dev/null
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FunctionalParameterMemberParser.java
@@ -0,0 +1,106 @@
+//
+//package org.scijava.ops.struct;
+//
+//import java.lang.reflect.AnnotatedElement;
+//import java.lang.reflect.Method;
+//import java.lang.reflect.Type;
+//import java.util.ArrayList;
+//import java.util.List;
+//
+//import org.scijava.function.Container;
+//import org.scijava.function.Mutable;
+//import org.scijava.ops.util.AnnotationUtils;
+//import org.scijava.param.FunctionalMethodType;
+//import org.scijava.param.SynthesizedParameterMember;
+//import org.scijava.param.ValidityProblem;
+//import org.scijava.struct.ItemIO;
+//import org.scijava.struct.Member;
+//import org.scijava.types.Types;
+//
+//public class FunctionalParameterMemberParser implements
+//	MemberParser<AnnotatedElement, SynthesizedParameterMember<?>>
+//{
+//
+//	@Override
+//	public List<SynthesizedParameterMember<?>> parse(AnnotatedElement source) {
+//		// Search for the functional method of 'type' and map its signature to
+//		// ItemIO
+//		List<FunctionalMethodType> fmts;
+//		try {
+//			fmts = findFunctionalMethodTypes(type);
+//		}
+//		catch (IllegalArgumentException e) {
+//			problems.add(new ValidityProblem("Could not find functional method of " +
+//				type.getTypeName()));
+//			return;
+//		}
+//
+//		// Synthesize members
+//		List<Member<?>> fmtMembers = data.synthesizeMembers(fmts);
+//
+//		for (Member<?> m : fmtMembers) {
+//			String key = m.getKey();
+//			final Type itemType = m.getType();
+//
+//			final boolean valid = checkValidity(m, key, Types.raw(itemType), false,
+//				names, problems);
+//			if (!valid) continue;
+//			items.add(m);
+//			names.add(m.getKey());
+//		}
+//	}
+//
+//	/**
+//	 * Returns a list of {@link FunctionalMethodType}s describing the input and
+//	 * output types of the functional method of the specified functional type. In
+//	 * doing so, the return type of the method will me marked as
+//	 * {@link ItemIO#OUTPUT} and the all method parameters as
+//	 * {@link ItemIO#OUTPUT}, except for parameters annotated with
+//	 * {@link Container} or {@link Mutable} which will be marked as
+//	 * {@link ItemIO#CONTAINER} or {@link ItemIO#MUTABLE} respectively. If the
+//	 * specified type does not have a functional method in its hierarchy,
+//	 * {@code null} will be returned.<br>
+//	 * The order will be the following: method parameters from left to right, then
+//	 * return type.
+//	 * 
+//	 * @param functionalType
+//	 * @return
+//	 */
+//	public static List<FunctionalMethodType> findFunctionalMethodTypes(
+//		Type functionalType)
+//	{
+//		Method functionalMethod = findFunctionalMethod(Types.raw(functionalType));
+//		if (functionalMethod == null) throw new IllegalArgumentException("Type " +
+//			functionalType +
+//			" is not a functional type, thus its functional method types cannot be determined");
+//
+//		Type paramfunctionalType = functionalType;
+//		if (functionalType instanceof Class) {
+//			paramfunctionalType = Types.parameterizeRaw((Class<?>) functionalType);
+//		}
+//
+//		List<FunctionalMethodType> out = new ArrayList<>();
+//		int i = 0;
+//		for (Type t : Types.getExactParameterTypes(functionalMethod,
+//			paramfunctionalType))
+//		{
+//			final ItemIO ioType;
+//			if (AnnotationUtils.getMethodParameterAnnotation(functionalMethod, i,
+//				Container.class) != null) ioType = ItemIO.CONTAINER;
+//			else if (AnnotationUtils.getMethodParameterAnnotation(functionalMethod, i,
+//				Mutable.class) != null) ioType = ItemIO.MUTABLE;
+//			else ioType = ItemIO.INPUT;
+//			out.add(new FunctionalMethodType(t, ioType));
+//			i++;
+//		}
+//
+//		Type returnType = Types.getExactReturnType(functionalMethod,
+//			paramfunctionalType);
+//		if (!returnType.equals(void.class)) {
+//			out.add(new FunctionalMethodType(returnType, ItemIO.OUTPUT));
+//		}
+//
+//		return out;
+//	}
+//
+//}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/JavadocParameterData.java
similarity index 95%
rename from scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/struct/JavadocParameterData.java
index f95cb5712..29c9930dc 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/JavadocParameterData.java
@@ -1,5 +1,5 @@
 
-package org.scijava.param;
+package org.scijava.ops.struct;
 
 import com.github.therapi.runtimejavadoc.Comment;
 import com.github.therapi.runtimejavadoc.FieldJavadoc;
@@ -296,8 +296,8 @@ private boolean validParameterTag(String tagType) {
 	 * @param fmts the list of inputs, outputs, and other types required by the Op
 	 */
 	@Override
-	public List<Member<?>> synthesizeMembers(List<FunctionalMethodType> fmts) {
-		List<Member<?>> params = new ArrayList<>();
+	public List<SynthesizedParameterMember<?>> synthesizeMembers(List<FunctionalMethodType> fmts) {
+		List<SynthesizedParameterMember<?>> params = new ArrayList<>();
 		int ins = 0;
 		int outs = 0;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MemberParser.java
new file mode 100644
index 000000000..b2091e6a4
--- /dev/null
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MemberParser.java
@@ -0,0 +1,27 @@
+
+package org.scijava.ops.struct;
+
+import java.lang.reflect.Type;
+import java.util.List;
+
+import org.scijava.struct.Member;
+
+/**
+ * Parses a set of {@link Member}s from a source {@link Object}
+ * 
+ * @author Gabriel Selzer
+ * @param <S> The {@link Type} of {@link Object}s parsable by this parser
+ * @param <M> The {@link Type} of {@link Member}s returned by this parser
+ */
+public interface MemberParser<S, M extends Member<?>> {
+
+	/**
+	 * parses {@code source} for a {@link List} of {@link Member}s, which is then
+	 * returned
+	 * 
+	 * @param source the {@link Object} to parse
+	 * @return a {@link List} of {@link Member}s parsed from {@code source}
+	 */
+	List<M> parse(S source);
+
+}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ParameterData.java
new file mode 100644
index 000000000..00f7d243f
--- /dev/null
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ParameterData.java
@@ -0,0 +1,11 @@
+package org.scijava.ops.struct;
+
+import java.util.List;
+
+import org.scijava.param.FunctionalMethodType;
+
+public interface ParameterData {
+
+	public List<SynthesizedParameterMember<?>> synthesizeMembers(List<FunctionalMethodType> fmts);
+
+}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java
new file mode 100644
index 000000000..104a1f3e8
--- /dev/null
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java
@@ -0,0 +1,212 @@
+
+package org.scijava.ops.struct;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.scijava.function.Container;
+import org.scijava.function.Mutable;
+import org.scijava.ops.util.AnnotationUtils;
+import org.scijava.param.FunctionalMethodType;
+import org.scijava.param.ValidityProblem;
+import org.scijava.struct.ItemIO;
+import org.scijava.struct.Member;
+import org.scijava.types.Types;
+
+public class Structs {
+
+	/**
+	 * Helper to check for several modifiers at once.
+	 * 
+	 * @param message
+	 * @param problems
+	 * @param actualModifiers
+	 * @param requiredModifiers
+	 */
+	public static void checkModifiers(String message, final ArrayList<ValidityProblem> problems,
+			final int actualModifiers, final boolean negate, final int... requiredModifiers) {
+		for (int mod : requiredModifiers) {
+			if (negate) {
+				if ((actualModifiers & mod) != 0) {
+					problems.add(
+							new ValidityProblem(message + "Illegal modifier. Must not be " + Modifier.toString(mod)));
+				}
+			} else {
+				if ((actualModifiers & mod) == 0) {
+					problems.add(new ValidityProblem(message + "Illegal modifier. Must be " + Modifier.toString(mod)));
+				}
+			}
+		}
+	}
+
+	public static void parseFunctionalParameters(
+		final ArrayList<SynthesizedParameterMember<?>> items, final Set<String> names,
+		final ArrayList<ValidityProblem> problems, Type type, ParameterData data)
+	{
+		// Search for the functional method of 'type' and map its signature to
+		// ItemIO
+		List<FunctionalMethodType> fmts;
+		try {
+			fmts = findFunctionalMethodTypes(type);
+		}
+		catch (IllegalArgumentException e) {
+			problems.add(new ValidityProblem("Could not find functional method of " +
+				type.getTypeName()));
+			return;
+		}
+
+		// Synthesize members
+		List<SynthesizedParameterMember<?>> fmtMembers = data.synthesizeMembers(fmts);
+
+		for (Member<?> m : fmtMembers) {
+			String key = m.getKey();
+			final Type itemType = m.getType();
+
+			final boolean valid = checkValidity(m, key, Types.raw(itemType), false,
+				names, problems);
+			if (!valid) continue;
+			items.add(m);
+			names.add(m.getKey());
+		}
+	}
+
+	/**
+	 * Returns a list of {@link FunctionalMethodType}s describing the input and
+	 * output types of the functional method of the specified functional type. In
+	 * doing so, the return type of the method will me marked as
+	 * {@link ItemIO#OUTPUT} and the all method parameters as
+	 * {@link ItemIO#OUTPUT}, except for parameters annotated with
+	 * {@link Container} or {@link Mutable} which will be marked as
+	 * {@link ItemIO#CONTAINER} or {@link ItemIO#MUTABLE} respectively. If the
+	 * specified type does not have a functional method in its hierarchy,
+	 * {@code null} will be returned.<br>
+	 * The order will be the following: method parameters from left to right, then
+	 * return type.
+	 * 
+	 * @param functionalType
+	 * @return
+	 */
+	public static List<FunctionalMethodType> findFunctionalMethodTypes(
+		Type functionalType)
+	{
+		Method functionalMethod = findFunctionalMethod(Types.raw(functionalType));
+		if (functionalMethod == null) throw new IllegalArgumentException("Type " +
+			functionalType +
+			" is not a functional type, thus its functional method types cannot be determined");
+
+		Type paramfunctionalType = functionalType;
+		if (functionalType instanceof Class) {
+			paramfunctionalType = Types.parameterizeRaw((Class<?>) functionalType);
+		}
+
+		List<FunctionalMethodType> out = new ArrayList<>();
+		int i = 0;
+		for (Type t : Types.getExactParameterTypes(functionalMethod,
+			paramfunctionalType))
+		{
+			final ItemIO ioType;
+			if (AnnotationUtils.getMethodParameterAnnotation(functionalMethod, i,
+				Container.class) != null) ioType = ItemIO.CONTAINER;
+			else if (AnnotationUtils.getMethodParameterAnnotation(functionalMethod, i,
+				Mutable.class) != null) ioType = ItemIO.MUTABLE;
+			else ioType = ItemIO.INPUT;
+			out.add(new FunctionalMethodType(t, ioType));
+			i++;
+		}
+
+		Type returnType = Types.getExactReturnType(functionalMethod,
+			paramfunctionalType);
+		if (!returnType.equals(void.class)) {
+			out.add(new FunctionalMethodType(returnType, ItemIO.OUTPUT));
+		}
+
+		return out;
+	}
+
+	/**
+	 * Attempts to find the single functional method of the specified class, by
+	 * scanning the for functional interfaces. If there is no functional
+	 * interface, null will be returned.
+	 * 
+	 * @param cls
+	 * @return
+	 */
+	private static Method findFunctionalMethod(Class<?> cls) {
+		Class<?> iFace = findFunctionalInterface(cls);
+		if (iFace == null) {
+			return null;
+		}
+
+		List<Method> nonDefaults = Arrays.stream(iFace.getMethods()).filter(m -> !m
+			.isDefault()).collect(Collectors.toList());
+
+		// The single non default method must be the functional one
+		if (nonDefaults.size() != 1) {
+			for (Class<?> i : iFace.getInterfaces()) {
+				final Method result = findFunctionalMethod(i);
+				if (result != null) return result;
+			}
+		}
+
+		return nonDefaults.get(0);
+	}
+
+	/**
+	 * Searches for a {@code @FunctionalInterface} annotated interface in the
+	 * class hierarchy of the specified type. The first one that is found will be
+	 * returned. If no such interface can be found, null will be returned.
+	 * 
+	 * @param type
+	 * @return
+	 */
+	public static Class<?> findFunctionalInterface(Class<?> type) {
+		if (type == null) return null;
+		if (type.getAnnotation(FunctionalInterface.class) != null) return type;
+		for (Class<?> iface : type.getInterfaces()) {
+			final Class<?> result = findFunctionalInterface(iface);
+			if (result != null) return result;
+		}
+		return findFunctionalInterface(type.getSuperclass());
+	}
+
+	private static boolean checkValidity(Member<?> m, String name, Class<?> type,
+		boolean isFinal, Set<String> names, ArrayList<ValidityProblem> problems)
+	{
+		boolean valid = true;
+
+		if (names.contains(name)) {
+			// NB: Shadowed parameters are bad because they are ambiguous.
+			final String error = "Invalid duplicate parameter: " + name;
+			problems.add(new ValidityProblem(error));
+			valid = false;
+		}
+
+		if ((m.getIOType() == ItemIO.MUTABLE || m
+			.getIOType() == ItemIO.CONTAINER) && isImmutable(type))
+		{
+			// NB: The MUTABLE and CONTAINER types signify that the parameter
+			// will be written to, but immutable parameters cannot be changed in
+			// such a manner, so it makes no sense to label them as such.
+			final String error = "Immutable " + m.getIOType() + " parameter: " +
+				name + " (" + type.getName() + " is immutable)";
+			problems.add(new ValidityProblem(error));
+			valid = false;
+		}
+
+		return valid;
+	}
+
+	private static boolean isImmutable(final Class<?> type) {
+		// NB: All eight primitive types, as well as the boxed primitive
+		// wrapper classes, as well as strings, are immutable objects.
+		return Types.isNumber(type) || Types.isText(type) || //
+			Types.isBoolean(type);
+	}
+
+}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterData.java
similarity index 76%
rename from scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterData.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterData.java
index 6f2b813f7..728de3882 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterData.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterData.java
@@ -1,5 +1,5 @@
 
-package org.scijava.param;
+package org.scijava.ops.struct;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -9,8 +9,8 @@
 public class SynthesizedParameterData implements ParameterData {
 
 	@Override
-	public List<Member<?>> synthesizeMembers(List<FunctionalMethodType> fmts) {
-		List<Member<?>> params = new ArrayList<>();
+	public List<SynthesizedParameterMember<?>> synthesizeMembers(List<FunctionalMethodType> fmts) {
+		List<SynthesizedParameterMember<?>> params = new ArrayList<>();
 
 		int ins, outs, containers, mutables;
 		ins = outs = containers = mutables = 1;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterMember.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterMember.java
similarity index 87%
rename from scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterMember.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterMember.java
index 52ab7fda9..85bdfd0ee 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterMember.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterMember.java
@@ -1,8 +1,9 @@
 
-package org.scijava.param;
+package org.scijava.ops.struct;
 
 import java.lang.reflect.Type;
 
+import org.scijava.param.ParameterMember;
 import org.scijava.struct.ItemIO;
 import org.scijava.struct.Member;
 
@@ -12,7 +13,7 @@
  * @author Gabriel Selzer
  * @param <T>
  */
-public class SynthesizedParameterMember<T> implements Member<T> {
+public class SynthesizedParameterMember<T> implements ParameterMember<T> {
 
 	/** Type, or a subtype thereof, which houses the field. */
 	private final Type itemType;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterData.java
deleted file mode 100644
index 1a2b3fe9a..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterData.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.scijava.param;
-
-import java.util.List;
-
-import org.scijava.struct.Member;
-
-public interface ParameterData {
-
-	public List<Member<?>> synthesizeMembers(List<FunctionalMethodType> fmts);
-
-}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java
index b90ee54f6..02de07217 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java
@@ -30,6 +30,9 @@
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpMethod;
 import org.scijava.ops.simplify.Simplifier;
+import org.scijava.ops.struct.JavadocParameterData;
+import org.scijava.ops.struct.ParameterData;
+import org.scijava.ops.struct.SynthesizedParameterData;
 import org.scijava.ops.util.AnnotationUtils;
 import org.scijava.struct.ItemIO;
 import org.scijava.struct.Member;

From 4317ee51d115899e2034dcb2971649b47de79a8a Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Thu, 1 Jul 2021 11:13:23 -0500
Subject: [PATCH 59/91] remove org.scijava.param package

---
 .../src/main/java/module-info.java            |   4 +-
 .../java/org/scijava/ops/OpCandidate.java     |   2 +-
 .../src/main/java/org/scijava/ops/OpInfo.java |   1 -
 .../main/java/org/scijava/ops/OpUtils.java    |  68 ++-
 .../{param => ops}/ValidityException.java     |   4 +-
 .../ops/impl/DefaultOpEnvironment.java        |   6 +-
 .../org/scijava/ops/impl/LambdaTypeBaker.java |   9 +-
 .../scijava/ops/matcher/OpAdaptationInfo.java |  43 +-
 .../org/scijava/ops/matcher/OpClassInfo.java  |  12 +-
 .../org/scijava/ops/matcher/OpFieldInfo.java  |  10 +-
 .../org/scijava/ops/matcher/OpMethodInfo.java |  21 +-
 .../ops/simplify/SimplificationUtils.java     |  10 +-
 .../ops/simplify/SimplifiedOpInfo.java        |  44 +-
 .../struct/ClassOpDependencyMemberParser.java |  62 ++
 .../struct/ClassParameterMemberParser.java    |  46 ++
 .../struct}/ConvertedParameterMember.java     |  15 +-
 .../struct/FieldParameterMemberParser.java    |  18 +-
 .../ops/struct/JavadocParameterData.java      |  10 +-
 .../org/scijava/ops/struct/MemberParser.java  |   5 +-
 .../MethodOpDependencyMemberParser.java       |  64 ++
 .../struct/MethodParameterMemberParser.java   |  65 ++
 .../ops/struct/OpRetypingMemberParser.java    |  66 ++
 .../org/scijava/ops/struct/ParameterData.java |   2 +-
 .../scijava/ops/struct/RetypingRequest.java   |  29 +
 .../java/org/scijava/ops/struct/Structs.java  |  43 +-
 .../ops/struct/SynthesizedParameterData.java  |   2 +-
 .../struct/SynthesizedParameterMember.java    |   3 +-
 .../java/org/scijava/ops/util/Inject.java     |  27 +-
 .../org/scijava/ops/util/OpMethodUtils.java   |  66 ++
 .../org/scijava/param/ItemVisibility.java     |  69 ---
 .../org/scijava/param/ParameterMember.java    | 156 -----
 .../org/scijava/param/ParameterStructs.java   | 575 ------------------
 .../org/scijava/param/ValidityProblem.java    |  65 --
 .../{param => ops}/JavadocParameterTest.java  |   6 +-
 .../org/scijava/ops/OpCollectionTest.java     |   1 -
 .../templates/main/java/module-info.vm        |   1 -
 .../ops/adapt/lift/ComputerToIterables.vm     |   1 -
 .../scijava/struct}/FunctionalMethodType.java |   4 +-
 .../types/inference/InterfaceInference.java   |  22 +
 39 files changed, 667 insertions(+), 990 deletions(-)
 rename scijava/scijava-ops/src/main/java/org/scijava/{param => ops}/ValidityException.java (92%)
 create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassOpDependencyMemberParser.java
 create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassParameterMemberParser.java
 rename scijava/scijava-ops/src/main/java/org/scijava/{param => ops/struct}/ConvertedParameterMember.java (56%)
 create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodOpDependencyMemberParser.java
 create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodParameterMemberParser.java
 create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/struct/OpRetypingMemberParser.java
 create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/struct/RetypingRequest.java
 create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpMethodUtils.java
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/ItemVisibility.java
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/ParameterMember.java
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/ValidityProblem.java
 rename scijava/scijava-ops/src/test/java/org/scijava/{param => ops}/JavadocParameterTest.java (95%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/param => scijava-struct/src/main/java/org/scijava/struct}/FunctionalMethodType.java (89%)
 create mode 100644 scijava/scijava-types/src/main/java/org/scijava/types/inference/InterfaceInference.java

diff --git a/scijava/scijava-ops/src/main/java/module-info.java b/scijava/scijava-ops/src/main/java/module-info.java
index 1893eca56..9f0655fc9 100644
--- a/scijava/scijava-ops/src/main/java/module-info.java
+++ b/scijava/scijava-ops/src/main/java/module-info.java
@@ -7,7 +7,6 @@
 
 	//TODO: rearrange packages to export only needed classes
 	exports org.scijava.ops; //contains OpDependency interface
-	exports org.scijava.ops.core; // contains ExceptionUtils
 	exports org.scijava.ops.matcher;
 	exports org.scijava.ops.math;
 	exports org.scijava.ops.simplify;
@@ -15,7 +14,6 @@
 	exports org.scijava.ops.provenance;
 	// TODO: move OpWrapper to its own package (org.scijava.ops.wrap??)
 	exports org.scijava.ops.util; // contains OpWrapper interface
-	exports org.scijava.param;
 
 	opens org.scijava.ops.conversionLoss to therapi.runtime.javadoc;
 	opens org.scijava.ops.log to therapi.runtime.javadoc;
@@ -32,11 +30,11 @@
 	opens org.scijava.ops to therapi.runtime.javadoc, org.scijava;
 	opens org.scijava.ops.util to therapi.runtime.javadoc;
 	opens org.scijava.ops.matcher to therapi.runtime.javadoc;
+	opens org.scijava.ops.struct to therapi.runtime.javadoc;
 	opens org.scijava.ops.simplify to therapi.runtime.javadoc;
 	opens org.scijava.ops.stats to therapi.runtime.javadoc;
 	opens org.scijava.ops.core to therapi.runtime.javadoc;
 	opens org.scijava.ops.provenance.impl to therapi.runtime.javadoc, org.scijava;
-	opens org.scijava.param to therapi.runtime.javadoc;
 
 	// FIXME: This is a file name and is thus unstable
 	requires geantyref;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpCandidate.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpCandidate.java
index 27833ea99..4c31c8fa1 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpCandidate.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpCandidate.java
@@ -34,9 +34,9 @@
 import java.util.List;
 import java.util.Map;
 
+import org.scijava.ValidityProblem;
 import org.scijava.log.Logger;
 import org.scijava.ops.matcher.OpMatcher;
-import org.scijava.param.ValidityProblem;
 import org.scijava.struct.Member;
 import org.scijava.struct.Struct;
 import org.scijava.struct.StructInstance;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java
index 8251c0616..8ab8af11c 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java
@@ -8,7 +8,6 @@
 import java.util.Map;
 
 import org.scijava.log.Logger;
-import org.scijava.param.ValidityException;
 import org.scijava.struct.Member;
 import org.scijava.struct.Struct;
 import org.scijava.struct.StructInstance;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
index 00b891d0a..0e8e7d9fb 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
@@ -29,6 +29,7 @@
 
 package org.scijava.ops;
 
+import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.Arrays;
 import java.util.Collections;
@@ -36,12 +37,8 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import org.scijava.ValidityProblem;
 import org.scijava.ops.OpCandidate.StatusCode;
-import org.scijava.ops.struct.SynthesizedParameterMember;
-import org.scijava.param.ParameterMember;
-import org.scijava.param.ParameterStructs;
-import org.scijava.param.ValidityException;
-import org.scijava.param.ValidityProblem;
 import org.scijava.struct.Member;
 import org.scijava.struct.MemberInstance;
 import org.scijava.struct.Struct;
@@ -236,9 +233,18 @@ public static Object[] padArgs(final OpCandidate candidate, final boolean second
 		return paddedArgs;
 	}
 	
+	/**
+	 * Determines whether {@link Member} {@code item} is required.
+	 * <p>
+	 * TODO: This method is a relic of {@link ParameterMember}, and should be
+	 * reconciled with the work in https://github.com/scijava/incubator/pull/32
+	 * 
+	 * @param item the {@link Member} that may or may not be required
+	 * @return true iff {@code item} is required.
+	 */
+	@Deprecated
 	public static boolean isRequired(final Member<?> item) {
-		return item instanceof ParameterMember && //
-				((ParameterMember<?>) item).isRequired();
+		return true;
 	}
 	
 	public static List<Member<?>> injectableMembers(Struct struct) {
@@ -307,11 +313,57 @@ private static void appendParam(final StringBuilder sb, final Member<?> arg,
 	}
 
 	public static Class<?> findFirstImplementedFunctionalInterface(final OpRef opRef) {
-		final Class<?> functionalInterface = ParameterStructs
+		final Class<?> functionalInterface = OpUtils
 			.findFunctionalInterface(Types.raw(opRef.getType()));
 		if (functionalInterface != null) {
 			return functionalInterface;
 		}
 		return null;
 	}
+
+	/**
+	 * Searches for a {@code @FunctionalInterface} annotated interface in the 
+	 * class hierarchy of the specified type. The first one that is found will
+	 * be returned. If no such interface can be found, null will be returned.
+	 * 
+	 * @param type
+	 * @return
+	 */
+	public static Class<?> findFunctionalInterface(Class<?> type) {
+		if (type == null) return null;
+		if (type.getAnnotation(FunctionalInterface.class) != null) return type;
+		for (Class<?> iface : type.getInterfaces()) {
+			final Class<?> result = findFunctionalInterface(iface);
+			if (result != null) return result;
+		}
+		return findFunctionalInterface(type.getSuperclass());
+	}
+
+	/**
+	 * Attempts to find the single functional method of the specified
+	 * class, by scanning the for functional interfaces. If there
+	 * is no functional interface, null will be returned.
+	 * 
+	 * @param cls
+	 * @return
+	 */
+	public static Method findFunctionalMethod(Class<?> cls) {
+		Class<?> iFace = findFunctionalInterface(cls);
+		if (iFace == null) {
+			return null;
+		}
+		
+		List<Method> nonDefaults = Arrays.stream(iFace.getMethods())
+				.filter(m -> !m.isDefault()).collect(Collectors.toList());
+		
+		// The single non default method must be the functional one
+		if (nonDefaults.size() != 1) {
+			for (Class<?> i : iFace.getInterfaces()) {
+				final Method result = findFunctionalMethod(i);
+				if (result != null) return result;
+			}
+		}
+		
+		return nonDefaults.get(0);
+	}
 }
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/ValidityException.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/ValidityException.java
similarity index 92%
rename from scijava/scijava-ops/src/main/java/org/scijava/param/ValidityException.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/ValidityException.java
index 01e238c8d..35f2079c9 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/ValidityException.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/ValidityException.java
@@ -1,8 +1,10 @@
-package org.scijava.param;
+package org.scijava.ops;
 
 import java.util.Collections;
 import java.util.List;
 
+import org.scijava.ValidityProblem;
+
 /**
  * hasdjf
  *
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
index 316e442e5..995bd3065 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
@@ -85,11 +85,11 @@
 import org.scijava.ops.matcher.OpMethodInfo;
 import org.scijava.ops.provenance.OpHistoryService;
 import org.scijava.ops.simplify.SimplifiedOpInfo;
-import org.scijava.param.FunctionalMethodType;
-import org.scijava.param.ParameterStructs;
+import org.scijava.ops.struct.Structs;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.PluginInfo;
 import org.scijava.plugin.PluginService;
+import org.scijava.struct.FunctionalMethodType;
 import org.scijava.struct.ItemIO;
 import org.scijava.types.Nil;
 import org.scijava.types.TypeService;
@@ -689,7 +689,7 @@ private OpRef inferOpRef(OpDependencyMember<?> dependency,
 	 */
 	private OpRef inferOpRef(Type type, String name, Map<TypeVariable<?>, Type> typeVarAssigns)
 			{
-		List<FunctionalMethodType> fmts = ParameterStructs.findFunctionalMethodTypes(type);
+		List<FunctionalMethodType> fmts = Structs.findFunctionalMethodTypes(type);
 		if (fmts == null)
 			return null;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/LambdaTypeBaker.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/LambdaTypeBaker.java
index b33f48eae..714ec6d11 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/LambdaTypeBaker.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/LambdaTypeBaker.java
@@ -5,9 +5,10 @@
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
 
-import org.scijava.param.ParameterStructs;
+import org.scijava.ops.OpUtils;
 import org.scijava.types.GenericTyped;
 import org.scijava.types.Types;
+import org.scijava.types.inference.InterfaceInference;
 
 import javassist.CannotCompileException;
 import javassist.ClassPool;
@@ -34,8 +35,8 @@ public static <T> T bakeLambdaType(T originalOp, Type reifiedType) {
 
 	private static <T> void ensureImplementation(T originalOp, Type reifiedType) {
 		Class<?> opClass = originalOp.getClass();
-		Class<?> opFIFace = ParameterStructs.findFunctionalInterface(opClass);
-		Class<?> typeFIFace = ParameterStructs.findFunctionalInterface(Types.raw(reifiedType));
+		Class<?> opFIFace = OpUtils.findFunctionalInterface(opClass);
+		Class<?> typeFIFace = OpUtils.findFunctionalInterface(Types.raw(reifiedType));
 		if (!opFIFace.equals(typeFIFace)) {
 			throw new IllegalArgumentException(originalOp + " does not implement " + Types.raw(reifiedType));
 		}
@@ -173,7 +174,7 @@ private static String createFunctionalMethod(Type reifiedType) {
 
 		// determine the name of the functional method
 		Class<?> raw = Types.raw(reifiedType);
-		Method m = ParameterStructs.singularAbstractMethod(raw);
+		Method m = InterfaceInference.singularAbstractMethod(raw);
 
 		//-- signature -- //
 		sb.append(generateSignature(m));
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java
index 47e6158b9..4081cd839 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java
@@ -1,22 +1,27 @@
+
 package org.scijava.ops.matcher;
 
+import com.google.common.collect.Streams;
+
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 
+import org.scijava.ValidityProblem;
+import org.scijava.ops.BaseOpHints.Adaptation;
 import org.scijava.ops.Hints;
 import org.scijava.ops.OpDependencyMember;
-import org.scijava.ops.OpHints;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpUtils;
-import org.scijava.ops.BaseOpHints.Adaptation;
+import org.scijava.ops.ValidityException;
 import org.scijava.ops.hint.ImmutableHints;
-import org.scijava.param.ParameterStructs;
-import org.scijava.param.ValidityException;
+import org.scijava.ops.struct.OpRetypingMemberParser;
+import org.scijava.ops.struct.RetypingRequest;
+import org.scijava.ops.struct.Structs;
+import org.scijava.struct.FunctionalMethodType;
+import org.scijava.struct.ItemIO;
 import org.scijava.struct.Struct;
 import org.scijava.struct.StructInstance;
 
@@ -36,21 +41,32 @@ public class OpAdaptationInfo implements OpInfo {
 	private Struct struct;
 	private ValidityException validityException;
 
-	public OpAdaptationInfo(OpInfo srcInfo, Type type, Function<Object, Object> adaptor) {
+	public OpAdaptationInfo(OpInfo srcInfo, Type type,
+		Function<Object, Object> adaptor)
+	{
 		this.srcInfo = srcInfo;
 		this.type = type;
 		this.adaptor = adaptor;
 
-		// NOTE: since the source Op has already been shown to be valid, there is not
+		// NOTE: since the source Op has already been shown to be valid, there is
+		// not
 		// much for us to do here.
+		List<ValidityProblem> problems = new ArrayList<>();
+		List<FunctionalMethodType> fmts = Structs.findFunctionalMethodTypes(type);
+		
+		RetypingRequest r = new RetypingRequest(srcInfo.struct(), fmts);
+		struct = Structs.from(r, problems, new OpRetypingMemberParser());
 		try {
-			struct = ParameterStructs.structOf(srcInfo, type);
 			OpUtils.checkHasSingleOutput(struct);
-		} catch (ValidityException e) {
-			validityException = e;
 		}
+		catch (ValidityException exc) {
+			problems.addAll(exc.problems());
+		}
+		if (!problems.isEmpty()) validityException = new ValidityException(
+			problems);
 
-		List<String> hintList = new ArrayList<>(srcInfo.declaredHints().getHints().values());
+		List<String> hintList = new ArrayList<>(srcInfo.declaredHints().getHints()
+			.values());
 		hintList.remove(Adaptation.ALLOWED);
 		hintList.add(Adaptation.FORBIDDEN);
 		this.hints = new ImmutableHints(hintList.toArray(String[]::new));
@@ -84,8 +100,7 @@ public double priority() {
 
 	@Override
 	public String implementationName() {
-		return srcInfo.implementationName() + " adapted to " + type
-			.toString();
+		return srcInfo.implementationName() + " adapted to " + type.toString();
 	}
 
 	/**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java
index b1cd7c8d2..3265d85c0 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java
@@ -33,17 +33,21 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Type;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.scijava.Priority;
+import org.scijava.ValidityProblem;
 import org.scijava.ops.Hints;
 import org.scijava.ops.OpDependencyMember;
 import org.scijava.ops.OpHints;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpUtils;
+import org.scijava.ops.ValidityException;
 import org.scijava.ops.hint.ImmutableHints;
-import org.scijava.param.ParameterStructs;
-import org.scijava.param.ValidityException;
+import org.scijava.ops.struct.ClassOpDependencyMemberParser;
+import org.scijava.ops.struct.ClassParameterMemberParser;
+import org.scijava.ops.struct.Structs;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.Struct;
 import org.scijava.struct.StructInstance;
@@ -69,8 +73,10 @@ public OpClassInfo(final Class<?> opClass) {
 
 	public OpClassInfo(final Class<?> opClass, final double priority) {
 		this.opClass = opClass;
+		List<ValidityProblem> problems = new ArrayList<>();
 		try {
-			struct = ParameterStructs.structOf(opClass);
+			struct = Structs.from(opClass, problems, new ClassParameterMemberParser(), new ClassOpDependencyMemberParser());
+//			struct = ParameterStructs.structOf(opClass);
 			OpUtils.checkHasSingleOutput(struct);
 		} catch (ValidityException e) {
 			validityException = e;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java
index 2e4e0f19d..8ca3eae9a 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java
@@ -37,15 +37,16 @@
 import java.util.List;
 
 import org.scijava.Priority;
+import org.scijava.ValidityProblem;
 import org.scijava.ops.Hints;
 import org.scijava.ops.OpField;
 import org.scijava.ops.OpHints;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpUtils;
+import org.scijava.ops.ValidityException;
 import org.scijava.ops.hint.ImmutableHints;
-import org.scijava.param.ParameterStructs;
-import org.scijava.param.ValidityException;
-import org.scijava.param.ValidityProblem;
+import org.scijava.ops.struct.FieldParameterMemberParser;
+import org.scijava.ops.struct.Structs;
 import org.scijava.struct.Struct;
 import org.scijava.struct.StructInstance;
 
@@ -90,7 +91,8 @@ public OpFieldInfo(final Object instance, final Field field) {
 		// NB: Subclassing a collection and inheriting its fields is NOT
 		// ALLOWED!
 		try {
-			struct = ParameterStructs.structOf(field);
+			struct = Structs.from(field, problems, new FieldParameterMemberParser());
+//			struct = ParameterStructs.structOf(field);
 			OpUtils.checkHasSingleOutput(struct);
 			// NB: Contextual parameters not supported for now.
 		} catch (ValidityException e) {
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java
index c10b784cc..0cb951941 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java
@@ -43,6 +43,7 @@
 import java.util.stream.Collectors;
 
 import org.scijava.Priority;
+import org.scijava.ValidityProblem;
 import org.scijava.ops.Hints;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.OpDependencyMember;
@@ -50,15 +51,18 @@
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpMethod;
 import org.scijava.ops.OpUtils;
+import org.scijava.ops.ValidityException;
 import org.scijava.ops.hint.ImmutableHints;
+import org.scijava.ops.struct.MethodOpDependencyMemberParser;
+import org.scijava.ops.struct.MethodParameterMemberParser;
+import org.scijava.ops.struct.Structs;
 import org.scijava.ops.util.Adapt;
-import org.scijava.param.ParameterStructs;
-import org.scijava.param.ValidityException;
-import org.scijava.param.ValidityProblem;
+import org.scijava.ops.util.OpMethodUtils;
 import org.scijava.struct.Member;
 import org.scijava.struct.Struct;
 import org.scijava.struct.StructInstance;
 import org.scijava.types.Types;
+import org.scijava.types.inference.InterfaceInference;
 
 import javassist.CannotCompileException;
 import javassist.ClassPool;
@@ -101,16 +105,14 @@ public OpMethodInfo(final Method method) {
 		// determine the functional interface this Op should implement
 		final OpMethod methodAnnotation = method.getAnnotation(OpMethod.class);
 		try {
-			opType = ParameterStructs.getOpMethodType(methodAnnotation.type(),
+			opType = OpMethodUtils.getOpMethodType(methodAnnotation.type(),
 				method);
-			struct = ParameterStructs.structOf(method.getDeclaringClass(), method);
+			struct = Structs.from(method, problems, new MethodParameterMemberParser(), new MethodOpDependencyMemberParser());
+//			struct = ParameterStructs.structOf(method.getDeclaringClass(), method);
 		}
 		catch (IllegalArgumentException e) {
 			problems.add(new ValidityProblem(e));
 		}
-		catch (final ValidityException e) {
-			problems.addAll(e.problems());
-		}
 		validityException = problems.isEmpty() ? null : new ValidityException(
 			problems);
 	}
@@ -278,7 +280,7 @@ private String createFunctionalMethod(Method m) {
 		StringBuilder sb = new StringBuilder();
 
 		// determine the name of the functional method
-		String methodName = ParameterStructs.singularAbstractMethod(Types.raw(
+		String methodName = InterfaceInference.singularAbstractMethod(Types.raw(
 			opType)).getName();
 
 		// method modifiers
@@ -366,4 +368,5 @@ private Hints formHints(OpHints h) {
 		if (h == null) return new ImmutableHints(new String[0]);
 		return new ImmutableHints(h.hints());
 	}
+
 }
\ No newline at end of file
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java
index b9bd9f7f9..aedc0181c 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java
@@ -24,12 +24,12 @@
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpRef;
-import org.scijava.ops.matcher.MatchingUtils;
+import org.scijava.ops.OpUtils;
 import org.scijava.ops.util.AnnotationUtils;
-import org.scijava.param.ParameterStructs;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
 import org.scijava.types.inference.GenericAssignability;
+import org.scijava.types.inference.InterfaceInference;
 
 import javassist.CannotCompileException;
 import javassist.ClassPool;
@@ -117,9 +117,9 @@ private static Type[] typesFromOpType(Class<?> opType, Method fMethod, Type... t
 
 	// TODO: extract this method to a more general utility class
 	public static Method findFMethod(Class<?> c) {
-			Class<?> fIface = ParameterStructs.findFunctionalInterface(c);
+			Class<?> fIface = OpUtils.findFunctionalInterface(c);
 			if(fIface == null) throw new IllegalArgumentException("Class " + c +" does not implement a functional interface!");
-			return ParameterStructs.singularAbstractMethod(fIface);
+			return InterfaceInference.singularAbstractMethod(fIface);
 	}
 
 	/**
@@ -478,7 +478,7 @@ private static String createFunctionalMethod(SimplificationMetadata metadata) {
 		StringBuilder sb = new StringBuilder();
 
 		// determine the name of the functional method
-		Method m = ParameterStructs.singularAbstractMethod(metadata.opType());
+		Method m = InterfaceInference.singularAbstractMethod(metadata.opType());
 		// determine the name of the output:
 		String opOutput = "";
 		int ioIndex = metadata.ioArgIndex();
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java
index 0be15c7e8..cf0f992e0 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java
@@ -1,23 +1,34 @@
 package org.scijava.ops.simplify;
 
+import com.google.common.collect.Streams;
+
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.function.BiFunction;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.scijava.Priority;
+import org.scijava.ValidityProblem;
 import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.ops.Hints;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpUtils;
+import org.scijava.ops.ValidityException;
 import org.scijava.ops.conversionLoss.LossReporter;
 import org.scijava.ops.hint.ImmutableHints;
 import org.scijava.ops.matcher.OpMatchingException;
-import org.scijava.param.ParameterStructs;
-import org.scijava.param.ValidityException;
+import org.scijava.ops.struct.OpRetypingMemberParser;
+import org.scijava.ops.struct.RetypingRequest;
+import org.scijava.ops.struct.Structs;
+import org.scijava.struct.FunctionalMethodType;
+import org.scijava.struct.ItemIO;
 import org.scijava.struct.Member;
 import org.scijava.struct.Struct;
 import org.scijava.struct.StructInstance;
@@ -38,23 +49,36 @@ public class SimplifiedOpInfo implements OpInfo {
 	private ValidityException validityException;
 
 	public SimplifiedOpInfo(OpInfo info, OpEnvironment env, SimplificationMetadata metadata) {
+		List<ValidityProblem> problems = new ArrayList<>();
 		this.srcInfo = info;
 		this.metadata = metadata;
-		Type[] inputs = metadata.originalInputs();
-		Type output = metadata.focusedOutput();
-		this.opType = SimplificationUtils.retypeOpType(info.opType(), inputs, output);
-		try {
-			this.struct = ParameterStructs.structOf(info, opType);
-		}
-		catch (ValidityException exc) {
-			validityException = exc;
+		// generate new input fmts
+		Type[] inputTypes = metadata.originalInputs();
+		Type outputType = metadata.focusedOutput();
+		List<Member<?>> ioMembers = info.struct().members();
+		ioMembers.removeIf(m -> m.getIOType() == ItemIO.NONE);
+		int index = 0;
+		List<FunctionalMethodType> fmts = new ArrayList<>();
+		for (Member<?> m : ioMembers) {
+			Type newType = m.isInput() ? inputTypes[index++] : m.isOutput()
+				? outputType : null;
+			fmts.add(new FunctionalMethodType(newType, m.getIOType()));
 		}
+		// generate new output fmt
+		this.opType = SimplificationUtils.retypeOpType(info.opType(), inputTypes,
+			outputType);
+		RetypingRequest r = new RetypingRequest(info.struct(), fmts);
+		this.struct = Structs.from(r, problems, new OpRetypingMemberParser());
 
 		this.priority = calculatePriority(info, metadata, env);
 		List<String> hintList = new ArrayList<>(srcInfo.declaredHints().getHints().values());
 		hintList.remove(Simplification.ALLOWED);
 		hintList.add(Simplification.FORBIDDEN);
 		this.hints = new ImmutableHints(hintList.toArray(String[]::new));
+
+		if(!problems.isEmpty()) {
+			validityException = new ValidityException(problems);
+		}
 	}
 
 	public OpInfo srcInfo() {
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassOpDependencyMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassOpDependencyMemberParser.java
new file mode 100644
index 000000000..7ce8575bc
--- /dev/null
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassOpDependencyMemberParser.java
@@ -0,0 +1,62 @@
+
+package org.scijava.ops.struct;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.scijava.ValidityProblem;
+import org.scijava.ops.FieldOpDependencyMember;
+import org.scijava.ops.OpDependency;
+import org.scijava.ops.ValidityException;
+import org.scijava.util.ClassUtils;
+
+public class ClassOpDependencyMemberParser implements
+	MemberParser<Class<?>, FieldOpDependencyMember<?>>
+{
+
+	@Override
+	public List<FieldOpDependencyMember<?>> parse(Class<?> source)
+		throws ValidityException
+	{
+				if (source == null) return null;
+
+				final ArrayList<FieldOpDependencyMember<?>> items = new ArrayList<>();
+				final ArrayList<ValidityProblem> problems = new ArrayList<>();
+
+				// NB: Reject abstract classes.
+				Structs.checkModifiers(source.getName() + ": ", problems, source.getModifiers(), true, Modifier.ABSTRACT);
+
+				// Parse field level @OpDependency annotations.
+				parseFieldOpDependencies(items, problems, source);
+
+				// Fail if there were any problems.
+				if (!problems.isEmpty()) throw new ValidityException(problems);
+
+				return items;
+	}
+
+	private static void parseFieldOpDependencies(final List<FieldOpDependencyMember<?>> items,
+		final List<ValidityProblem> problems, Class<?> annotatedClass)
+	{
+		final List<Field> fields = ClassUtils.getAnnotatedFields(annotatedClass,
+			OpDependency.class);
+		for (final Field f : fields) {
+			f.setAccessible(true);
+			final boolean isFinal = Modifier.isFinal(f.getModifiers());
+			if (isFinal) {
+				final String name = f.getName();
+				// Final fields are bad because they cannot be modified.
+				final String error = "Invalid final Op dependency field: " + name;
+				problems.add(new ValidityProblem(error));
+				// Skip invalid Op dependencies.
+				continue;
+			}
+			final FieldOpDependencyMember<?> item = new FieldOpDependencyMember<>(f,
+				annotatedClass);
+			items.add(item);
+		}
+	}
+
+}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassParameterMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassParameterMemberParser.java
new file mode 100644
index 000000000..c07433925
--- /dev/null
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassParameterMemberParser.java
@@ -0,0 +1,46 @@
+
+package org.scijava.ops.struct;
+
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.scijava.ValidityProblem;
+import org.scijava.ops.ValidityException;
+
+public class ClassParameterMemberParser implements
+	MemberParser<Class<?>, SynthesizedParameterMember<?>>
+{
+
+	@Override
+	public List<SynthesizedParameterMember<?>> parse(Class<?> source)
+		throws ValidityException
+	{
+		if (source == null) return null;
+
+		final ArrayList<SynthesizedParameterMember<?>> items = new ArrayList<>();
+		final ArrayList<ValidityProblem> problems = new ArrayList<>();
+		final Set<String> names = new HashSet<>();
+
+		// NB: Reject abstract classes.
+		Structs.checkModifiers(source.getName() + ": ", problems, source.getModifiers(), true, Modifier.ABSTRACT);
+
+		// obtain a parameterData (preferably one that scrapes the javadoc)
+		ParameterData paramData;
+		try {
+			paramData = new JavadocParameterData(source);
+		} catch(NullPointerException | IllegalArgumentException e) {
+			paramData = new SynthesizedParameterData();
+		}
+
+		Structs.parseFunctionalParameters(items, names, problems, source, paramData);
+
+		// Fail if there were any problems.
+		if (!problems.isEmpty()) throw new ValidityException(problems);
+
+		return items;
+	}
+
+}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/ConvertedParameterMember.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ConvertedParameterMember.java
similarity index 56%
rename from scijava/scijava-ops/src/main/java/org/scijava/param/ConvertedParameterMember.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ConvertedParameterMember.java
index 781839350..150d6e132 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/ConvertedParameterMember.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ConvertedParameterMember.java
@@ -1,7 +1,8 @@
-package org.scijava.param;
+package org.scijava.ops.struct;
 
 import java.lang.reflect.Type;
 
+import org.scijava.struct.FunctionalMethodType;
 import org.scijava.struct.ItemIO;
 import org.scijava.struct.Member;
 
@@ -16,10 +17,16 @@ public class ConvertedParameterMember<T> implements Member<T>{
 	
 	final Member<T> original;
 	final Type newType;
+	final ItemIO ioType;
 	
-	public ConvertedParameterMember(Member<T> original, Type newType) {
+	public ConvertedParameterMember(Member<T> original, FunctionalMethodType newType) {
 		this.original = original;
-		this.newType = newType;
+		this.newType = newType.type();
+		this.ioType = newType.itemIO();
+	}
+
+	public static <M> ConvertedParameterMember<M> from(Member<M> original, FunctionalMethodType newType) {
+		return new ConvertedParameterMember<>(original, newType);
 	}
 
 	@Override
@@ -39,7 +46,7 @@ public Type getType() {
 
 	@Override
 	public ItemIO getIOType() {
-		return original.getIOType();
+		return ioType;
 	}
 
 }
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FieldParameterMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FieldParameterMemberParser.java
index a2a5f22ff..f4f20ddea 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FieldParameterMemberParser.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FieldParameterMemberParser.java
@@ -9,9 +9,8 @@
 import java.util.List;
 import java.util.Set;
 
-import org.scijava.param.ValidityException;
-import org.scijava.param.ValidityProblem;
-import org.scijava.struct.Member;
+import org.scijava.ValidityProblem;
+import org.scijava.ops.ValidityException;
 import org.scijava.types.Types;
 
 public class FieldParameterMemberParser implements
@@ -19,9 +18,11 @@ public class FieldParameterMemberParser implements
 {
 
 	@Override
-	public List<SynthesizedParameterMember<?>> parse(Field source) {
+	public List<SynthesizedParameterMember<?>> parse(Field source)
+		throws ValidityException
+	{
+		if (source == null) return null;
 		Class<?> c = source.getDeclaringClass();
-		if (c == null || source == null) return null;
 		// obtain a parameterData (preferably one that scrapes the javadoc)
 		ParameterData paramData;
 		try {
@@ -37,9 +38,10 @@ public List<SynthesizedParameterMember<?>> parse(Field source) {
 		final Set<String> names = new HashSet<>();
 		final Type fieldType = Types.fieldType(source, c);
 
-		Structs.checkModifiers(source.toString() + ": ", problems, source.getModifiers(),
-			false, Modifier.FINAL);
-		Structs.parseFunctionalParameters(items, names, problems, fieldType, paramData);
+		Structs.checkModifiers(source.toString() + ": ", problems, source
+			.getModifiers(), false, Modifier.FINAL);
+		Structs.parseFunctionalParameters(items, names, problems, fieldType,
+			paramData);
 		// Fail if there were any problems.
 		if (!problems.isEmpty()) {
 			throw new ValidityException(problems);
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/JavadocParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/JavadocParameterData.java
index 29c9930dc..91653983a 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/JavadocParameterData.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/JavadocParameterData.java
@@ -19,9 +19,11 @@
 
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.OpInfo;
-import org.scijava.ops.simplify.SimplificationUtils;
+import org.scijava.ops.OpUtils;
+import org.scijava.struct.FunctionalMethodType;
 import org.scijava.struct.Member;
 import org.scijava.types.Types;
+import org.scijava.types.inference.InterfaceInference;
 
 /**
  * Class able to scrape Op parameter metadata off the Op's Javadoc.
@@ -56,7 +58,7 @@ public JavadocParameterData(Class<?> c) {
 	 * @param f the field
 	 */
 	public JavadocParameterData(Field f) {
-		Method sam = ParameterStructs.singularAbstractMethod(f.getType());
+		Method sam = InterfaceInference.singularAbstractMethod(f.getType());
 		FieldJavadoc doc = RuntimeJavadoc.getJavadoc(f);
 		long numIns = sam.getParameterCount();
 		long numOuts = 1; // There is always one output
@@ -75,7 +77,7 @@ public JavadocParameterData(OpInfo info, Type newType) {
 		// this method is called when the op is adapted/simplified. In the case of
 		// adaptation, the op's output might shift from a pure output to an input,
 		// or might shift from a container to a pure output. We
-		Method sam = ParameterStructs.singularAbstractMethod(Types.raw(newType));
+		Method sam = InterfaceInference.singularAbstractMethod(Types.raw(newType));
 		if (sam.getParameterCount() > inputs.size()) {
 			inputs.add(output);
 		}
@@ -123,7 +125,7 @@ public String returnDescription() {
 	 */
 	private Method getOpMethod(Class<?> c) throws NoSuchMethodException {
 		// NB this is the functional method w.r.t. the interface, not w.r.t. the Op
-		Method fMethod = SimplificationUtils.findFMethod(c);
+		Method fMethod = OpUtils.findFunctionalMethod(c);
 		Type[] paramTypes = Types.getExactParameterTypes(fMethod, c);
 		Class<?>[] rawParamTypes = Arrays.stream(paramTypes).map(t -> Types.raw(t))
 			.toArray(Class[]::new);
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MemberParser.java
index b2091e6a4..860c41a16 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MemberParser.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MemberParser.java
@@ -4,6 +4,7 @@
 import java.lang.reflect.Type;
 import java.util.List;
 
+import org.scijava.ops.ValidityException;
 import org.scijava.struct.Member;
 
 /**
@@ -21,7 +22,9 @@ public interface MemberParser<S, M extends Member<?>> {
 	 * 
 	 * @param source the {@link Object} to parse
 	 * @return a {@link List} of {@link Member}s parsed from {@code source}
+	 * @throws {@link ValidityException} when the source of the {@link Member}s is
+	 *           improperly declared, formatted
 	 */
-	List<M> parse(S source);
+	List<M> parse(S source) throws ValidityException;
 
 }
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodOpDependencyMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodOpDependencyMemberParser.java
new file mode 100644
index 000000000..22a524b07
--- /dev/null
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodOpDependencyMemberParser.java
@@ -0,0 +1,64 @@
+
+package org.scijava.ops.struct;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.scijava.ValidityProblem;
+import org.scijava.ops.MethodParameterOpDependencyMember;
+import org.scijava.ops.OpDependency;
+import org.scijava.ops.ValidityException;
+
+public class MethodOpDependencyMemberParser implements
+	MemberParser<Method, MethodParameterOpDependencyMember<?>>
+{
+
+	@Override
+	public List<MethodParameterOpDependencyMember<?>> parse(Method source)
+		throws ValidityException
+	{
+		if (source == null) return null;
+
+		source.setAccessible(true);
+
+		final ArrayList<MethodParameterOpDependencyMember<?>> items = new ArrayList<>();
+		final ArrayList<ValidityProblem> problems = new ArrayList<>();
+
+		// Parse method level @OpDependency annotations.
+		parseMethodOpDependencies(items, source);
+
+		// Fail if there were any problems.
+		if (!problems.isEmpty()) throw new ValidityException(problems);
+
+		return items;
+	}
+
+	private static void parseMethodOpDependencies(final List<MethodParameterOpDependencyMember<?>> items,
+		final Method annotatedMethod)
+	{
+		final java.lang.reflect.Parameter[] methodParams = annotatedMethod
+			.getParameters();
+		final java.lang.reflect.Parameter[] opDependencyParams = getOpDependencies(methodParams);
+
+		for (java.lang.reflect.Parameter param : opDependencyParams) {
+			final OpDependency dependency = param.getAnnotation(OpDependency.class);
+			final Type methodParamType = param.getParameterizedType();
+			final MethodParameterOpDependencyMember<?> item = new MethodParameterOpDependencyMember<>(
+				param, methodParamType, dependency);
+			items.add(item);
+		}
+	}
+
+	private static java.lang.reflect.Parameter[] getOpDependencies(
+		java.lang.reflect.Parameter[] methodParams)
+	{
+		return Arrays //
+			.stream(methodParams) //
+			.filter(param -> param.getAnnotation(OpDependency.class) != null) //
+			.toArray(java.lang.reflect.Parameter[]::new);
+	}
+
+}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodParameterMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodParameterMemberParser.java
new file mode 100644
index 000000000..ef6ce4f40
--- /dev/null
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodParameterMemberParser.java
@@ -0,0 +1,65 @@
+
+package org.scijava.ops.struct;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.scijava.ValidityProblem;
+import org.scijava.ops.OpMethod;
+import org.scijava.ops.ValidityException;
+import org.scijava.ops.util.OpMethodUtils;
+import org.scijava.types.Types;
+
+public class MethodParameterMemberParser implements
+	MemberParser<Method, SynthesizedParameterMember<?>>
+{
+
+	@Override
+	public List<SynthesizedParameterMember<?>> parse(Method source)
+		throws ValidityException
+	{
+		if (source == null) return null;
+
+		source.setAccessible(true);
+
+		// obtain a parameterData (preferably one that scrapes the javadoc)
+		ParameterData paramData;
+		try {
+			paramData = new JavadocParameterData(source);
+		}
+		catch (IllegalArgumentException e) {
+			paramData = new SynthesizedParameterData();
+		}
+
+		final ArrayList<SynthesizedParameterMember<?>> items = new ArrayList<>();
+		final ArrayList<ValidityProblem> problems = new ArrayList<>();
+		final Set<String> names = new HashSet<>();
+		final OpMethod methodAnnotation = source.getAnnotation(OpMethod.class);
+
+		// Determine functional type
+		Type functionalType;
+		try {
+			functionalType = OpMethodUtils.getOpMethodType(methodAnnotation.type(), source);
+		}
+		catch (IllegalArgumentException e) {
+			problems.add(new ValidityProblem(e.getMessage()));
+			functionalType = Types.parameterizeRaw(methodAnnotation.type());
+		}
+
+		// Parse method level @Parameter annotations.
+		Structs.parseFunctionalParameters(items, names, problems, functionalType,
+			paramData);
+
+		// Fail if there were any problems.
+		if (!problems.isEmpty()) throw new ValidityException(problems);
+
+		return items;
+	}
+
+
+
+}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/OpRetypingMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/OpRetypingMemberParser.java
new file mode 100644
index 000000000..d9abf3635
--- /dev/null
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/OpRetypingMemberParser.java
@@ -0,0 +1,66 @@
+
+package org.scijava.ops.struct;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.scijava.ops.ValidityException;
+import org.scijava.ops.simplify.SimplifiedOpInfo;
+import org.scijava.struct.FunctionalMethodType;
+import org.scijava.struct.ItemIO;
+import org.scijava.struct.Member;
+import org.scijava.struct.Struct;
+
+public class OpRetypingMemberParser implements
+	MemberParser<RetypingRequest, Member<?>>
+{
+
+	/**
+	 * Generates a new {@link List} with retyped {@link Member}s. Using
+	 * {@code originalStruct} as a template, this method retypes the inputs of
+	 * {@code originalStruct} using {@code inputs}, and the output using
+	 * {@code output}.
+	 * <p>
+	 * This method makes a couple of assumptions:
+	 * <ol>
+	 * <li>That {@code srcStruct} is valid
+	 * <li>That there are {@code inputs.length} input {@link Member}s in
+	 * {@code srcStruct}
+	 * <li>That there is <b>one</b> output {@link Member} in {@code srcStruct}
+	 * </ol>
+	 * We should consider adding the evalutation of these assumptions
+	 * 
+	 * @param source the {@link RetypingRequest} from which we create the new
+	 *          {@link List} of {@link Member}s
+	 * @return a new {@link Struct} reflecting the simplified arguments / focused
+	 *         output of this {@link SimplifiedOpInfo}
+	 */
+	@Override
+	public List<Member<?>> parse(RetypingRequest source)
+		throws ValidityException
+	{
+		List<FunctionalMethodType> newFmts = source.newFmts();
+		FunctionalMethodType outputFmt = newFmts.stream().filter(fmt -> fmt
+			.itemIO() == ItemIO.OUTPUT || fmt.itemIO() == ItemIO.MUTABLE || fmt
+				.itemIO() == ItemIO.CONTAINER).findFirst().get();
+		List<Member<?>> newMembers = new ArrayList<>();
+		int inputIndex = 0;
+		for (Member<?> m : source.struct().members()) {
+			if (m.isInput()) {
+				m = ConvertedParameterMember.from(m, newFmts.get(inputIndex++));
+			}
+			else if (m.isOutput()) {
+				m = ConvertedParameterMember.from(m, outputFmt);
+			}
+			newMembers.add(m);
+		}
+		return newMembers;
+	}
+
+	public List<Member<?>> parse(Struct s, List<FunctionalMethodType> newFmts)
+		throws ValidityException
+	{
+		return parse(new RetypingRequest(s, newFmts));
+	}
+
+}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ParameterData.java
index 00f7d243f..515452df3 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ParameterData.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ParameterData.java
@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import org.scijava.param.FunctionalMethodType;
+import org.scijava.struct.FunctionalMethodType;
 
 public interface ParameterData {
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/RetypingRequest.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/RetypingRequest.java
new file mode 100644
index 000000000..f141f9987
--- /dev/null
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/RetypingRequest.java
@@ -0,0 +1,29 @@
+
+package org.scijava.ops.struct;
+
+import java.util.List;
+
+import org.scijava.struct.FunctionalMethodType;
+import org.scijava.struct.Struct;
+
+public class RetypingRequest {
+
+	private final Struct originalStruct;
+	private final List<FunctionalMethodType> newFmts;
+
+	public RetypingRequest(Struct originalStruct,
+		List<FunctionalMethodType> newFmts)
+	{
+		this.originalStruct = originalStruct;
+		this.newFmts = newFmts;
+	}
+
+	public Struct struct() {
+		return originalStruct;
+	}
+
+	public List<FunctionalMethodType> newFmts() {
+		return newFmts;
+	}
+
+}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java
index 104a1f3e8..3171c5cea 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java
@@ -10,17 +10,36 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.scijava.ValidityProblem;
 import org.scijava.function.Container;
 import org.scijava.function.Mutable;
+import org.scijava.ops.ValidityException;
 import org.scijava.ops.util.AnnotationUtils;
-import org.scijava.param.FunctionalMethodType;
-import org.scijava.param.ValidityProblem;
+import org.scijava.struct.FunctionalMethodType;
 import org.scijava.struct.ItemIO;
 import org.scijava.struct.Member;
+import org.scijava.struct.Struct;
+import org.scijava.struct.StructInstance;
 import org.scijava.types.Types;
 
 public class Structs {
 
+	@SafeVarargs
+	public static <S> Struct from(S source, List<ValidityProblem> problems,
+		MemberParser<S, ? extends Member<?>>... parsers)
+	{
+		List<Member<?>> members = new ArrayList<>();
+		for (MemberParser<S, ? extends Member<?>> p : parsers) {
+			try {
+				members.addAll(p.parse(source));
+			}
+			catch (ValidityException e) {
+				problems.addAll(e.problems());
+			}
+		}
+		return () -> members;
+	}
+
 	/**
 	 * Helper to check for several modifiers at once.
 	 * 
@@ -64,7 +83,7 @@ public static void parseFunctionalParameters(
 		// Synthesize members
 		List<SynthesizedParameterMember<?>> fmtMembers = data.synthesizeMembers(fmts);
 
-		for (Member<?> m : fmtMembers) {
+		for (SynthesizedParameterMember<?> m : fmtMembers) {
 			String key = m.getKey();
 			final Type itemType = m.getType();
 
@@ -209,4 +228,22 @@ private static boolean isImmutable(final Class<?> type) {
 			Types.isBoolean(type);
 	}
 
+	/**
+	 * Convenience method to call
+	 * {@link Structs#from(Object, List, MemberParser...)} dot
+	 * {@link Struct#createInstance(Object)}
+	 * 
+	 * @param object the {@link Object} from which the {@link StructInstance} is
+	 *          created.
+	 * @return an instance of the {@link Struct} created from {@code object}
+	 * @throws ValidityException
+	 */
+	public static <C> StructInstance<C> create(final C object)
+		throws ValidityException
+	{
+		Struct s = from(object.getClass(), new ArrayList<>(),
+			new ClassParameterMemberParser(), new ClassOpDependencyMemberParser());
+		return s.createInstance(object);
+	}
+
 }
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterData.java
index 728de3882..894e6369c 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterData.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterData.java
@@ -4,7 +4,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.scijava.struct.Member;
+import org.scijava.struct.FunctionalMethodType;
 
 public class SynthesizedParameterData implements ParameterData {
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterMember.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterMember.java
index 85bdfd0ee..7771a9ba1 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterMember.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterMember.java
@@ -3,7 +3,6 @@
 
 import java.lang.reflect.Type;
 
-import org.scijava.param.ParameterMember;
 import org.scijava.struct.ItemIO;
 import org.scijava.struct.Member;
 
@@ -13,7 +12,7 @@
  * @author Gabriel Selzer
  * @param <T>
  */
-public class SynthesizedParameterMember<T> implements ParameterMember<T> {
+public class SynthesizedParameterMember<T> implements Member<T> {
 
 	/** Type, or a subtype thereof, which houses the field. */
 	private final Type itemType;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Inject.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Inject.java
index e359ca0d2..4a381e13a 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Inject.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Inject.java
@@ -7,8 +7,7 @@
 
 import org.scijava.command.Command;
 import org.scijava.ops.OpDependencyMember;
-import org.scijava.param.ParameterStructs;
-import org.scijava.param.ValidityException;
+import org.scijava.ops.ValidityException;
 import org.scijava.struct.ItemIO;
 import org.scijava.struct.StructInstance;
 import org.scijava.struct.ValueAccessibleMemberInstance;
@@ -80,28 +79,4 @@ private static List<ValueAccessibleMemberInstance<?>> filterAccessibles(
 		}
 	}
 
-	public static class Commands {
-		private Commands() {
-		}
-
-		public static void inputs(Command command, Object... objs) {
-			Structs.inputs(commandToStructInstance(command), objs);
-		}
-
-		public static void outputs(Command command, Object... objs) {
-			Structs.outputs(commandToStructInstance(command), objs);
-		}
-
-		public static void all(Command command, Object... objs) {
-			Structs.all(commandToStructInstance(command), objs);
-		}
-
-		public static StructInstance<Command> commandToStructInstance(Command command) {
-			try {
-				return ParameterStructs.create(command);
-			} catch (ValidityException e) {
-				throw new IllegalArgumentException("Can't inject command", e);
-			}
-		}
-	}
 }
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpMethodUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpMethodUtils.java
new file mode 100644
index 000000000..339f67181
--- /dev/null
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpMethodUtils.java
@@ -0,0 +1,66 @@
+package org.scijava.ops.util;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.scijava.ops.OpDependency;
+import org.scijava.types.Types;
+import org.scijava.types.inference.GenericAssignability;
+import org.scijava.types.inference.InterfaceInference;
+
+public class OpMethodUtils {
+
+	public static Type getOpMethodType(Class<?> opClass, Method opMethod) {
+		// since type is a functional interface, it has (exactly) one abstract
+		// declared method (the method that our OpMethod is emulating).
+		Method abstractMethod = InterfaceInference.singularAbstractMethod(opClass);
+		Type[] typeMethodParams = abstractMethod.getGenericParameterTypes();
+		java.lang.reflect.Parameter[] opMethodParams = getOpParams(opMethod
+			.getParameters());
+
+		if (typeMethodParams.length != opMethodParams.length) {
+			throw new IllegalArgumentException("Number of parameters in OpMethod" +
+				opMethod +
+				" does not match the required number of parameters for functional method of FunctionalInterface " +
+				opClass);
+		}
+		Map<TypeVariable<?>, Type> typeVarAssigns = new HashMap<>();
+
+		// map params of OpMethod to type variables of abstract method of functional
+		// interface (along with return type if applicable)
+		// TODO: not sure how this handles when there are type variables.
+		GenericAssignability.inferTypeVariables(typeMethodParams, getOpParamTypes(
+			opMethodParams), typeVarAssigns);
+		if (abstractMethod.getReturnType() != void.class) {
+			GenericAssignability.inferTypeVariables(new Type[] { abstractMethod
+				.getGenericReturnType() }, new Type[] { opMethod
+					.getGenericReturnType() }, typeVarAssigns);
+		}
+
+		// parameterize opClass
+		return Types.parameterize(opClass, typeVarAssigns);
+	}
+
+	public static java.lang.reflect.Parameter[] getOpParams(
+		java.lang.reflect.Parameter[] methodParams)
+	{
+		return Arrays //
+			.stream(methodParams) //
+			.filter(param -> param.getAnnotation(OpDependency.class) == null) //
+			.toArray(java.lang.reflect.Parameter[]::new);
+	}
+
+	public static Type[] getOpParamTypes(
+		java.lang.reflect.Parameter[] methodParams)
+	{
+		return Arrays //
+			.stream(methodParams) //
+			.filter(param -> param.getAnnotation(OpDependency.class) == null) //
+			.map(param -> param.getParameterizedType()).toArray(Type[]::new);
+	}
+
+}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/ItemVisibility.java b/scijava/scijava-ops/src/main/java/org/scijava/param/ItemVisibility.java
deleted file mode 100644
index fdd6d0f3d..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/ItemVisibility.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * #%L
- * SciJava Common shared library for SciJava software.
- * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
- * %%
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * #L%
- */
-
-package org.scijava.param;
-
-/**
- * Defines the "visibility" of a parameter.
- * 
- * @author Curtis Rueden
- */
-public enum ItemVisibility {
-
-	/**
-	 * Item is included in the history for purposes of data provenance, and
-	 * included as a parameter when recording scripts.
-	 */
-	NORMAL,
-
-	/**
-	 * Item is excluded from the history for the purposes of data provenance, but
-	 * still included as a parameter when recording scripts.
-	 */
-	TRANSIENT,
-
-	/**
-	 * Item is excluded from the history for the purposes of data provenance, and
-	 * also excluded as a parameter when recording scripts. This option should
-	 * only be used for items with no effect on the final output, such as a
-	 * "verbose" flag.
-	 */
-	INVISIBLE,
-
-	/**
-	 * As {@link #INVISIBLE}, and further indicating that the item's value is
-	 * intended as a message to the user (e.g., in the input harvester panel)
-	 * rather than an actual parameter to the module execution.
-	 */
-	MESSAGE
-
-}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterMember.java b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterMember.java
deleted file mode 100644
index 66a9770f6..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterMember.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package org.scijava.param;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.scijava.struct.Member;
-
-/**
- * A {@link Member} with extra commonly useful metadata.
- * <p>
- * This metadata is aligned with&mdash;but not explicitly bound to&mdash;the
- * fields of the {@code @Parameter} annotation type. As such, other code such as
- * the {@code org.scijava.script} package can use this interface without being
- * bound to the Java-specific {@code @Parameter} annotation type.
- * </p>
- * 
- * @author Curtis Rueden
- * @see Parameter
- */
-public interface ParameterMember<T> extends Member<T> {
-
-	/** Gets the visibility of the parameter. */
-	// TODO: fork ItemVisibility and rename to MemberVisibility
-	default ItemVisibility getVisibility() {
-		return ItemVisibility.NORMAL;
-	}
-
-	/** Gets whether the parameter value is allowed to be auto-filled. */
-	default boolean isAutoFill() {
-		return true;
-	}
-
-	/** Gets whether the parameter value must be specified (i.e., no default). */
-	default boolean isRequired() {
-		return true;
-	}
-
-	/** Gets whether to remember the most recent value of the parameter. */
-	default boolean isPersisted() {
-		return getPersistKey() != null;
-	}
-
-	/** Gets the key to use for saving the value persistently. */
-	default String getPersistKey() {
-		return null;
-	}
-
-	/** Gets the function that is called to initialize the parameter's value. */
-	default String getInitializer() {
-		return null;
-	}
-
-	/** Gets the function that is called to validate the parameter's value. */
-	default String getValidater() {
-		return null;
-	}
-
-	/**
-	 * Gets the function that is called whenever this parameter changes.
-	 * <p>
-	 * This mechanism enables interdependent parameters of various types. For
-	 * example, two int parameters "width" and "height" could update each other
-	 * when another boolean "Preserve aspect ratio" flag is set.
-	 * </p>
-	 */
-	default String getCallback() {
-		return null;
-	}
-
-	/**
-	 * Gets the preferred widget style to use when rendering the parameter in a
-	 * user interface.
-	 */
-	default String getWidgetStyle() {
-		return null;
-	}
-
-	/** Gets the default value. */
-	default Object getDefaultValue() {
-		return null;
-	}
-
-	/** Gets the minimum allowed value (if applicable). */
-	default Object getMinimumValue() {
-		return null;
-	}
-
-	/** Gets the maximum allowed value (if applicable). */
-	default Object getMaximumValue() {
-		return null;
-	}
-
-	/**
-	 * Gets the "soft" minimum value (if applicable).
-	 * <p>
-	 * The soft minimum is a hint for use in bounded scenarios, such as rendering
-	 * in a user interface with a slider or scroll bar widget; the parameter value
-	 * will not actually be clamped to the soft bounds, but they may be used in
-	 * certain circumstances where appropriate.
-	 * </p>
-	 */
-	default Object getSoftMinimum() {
-		// NB: Return hard minimum by default.
-		return getMinimumValue();
-	}
-
-	/**
-	 * Gets the "soft" maximum value (if applicable).
-	 * <p>
-	 * The soft maximum is a hint for use in bounded scenarios, such as rendering
-	 * in a user interface with a slider or scroll bar widget; the parameter value
-	 * will not actually be clamped to the soft bounds, but they may be used in
-	 * certain circumstances where appropriate.
-	 * </p>
-	 */
-	default Object getSoftMaximum() {
-		// NB: Return hard maximum by default.
-		return getMaximumValue();
-	}
-
-	/**
-	 * Gets the preferred step size to use when rendering the parameter in a user
-	 * interface (if applicable).
-	 */
-	default Object getStepSize() {
-		return null;
-	}
-
-	/** Gets the list of possible values. */
-	default List<Object> getChoices() {
-		final Class<T> rawType = getRawType();
-		final T[] choices = rawType.getEnumConstants();
-		return choices == null ? null : Arrays.asList(choices);
-	}
-
-	// -- BasicDetails methods --
-
-	// TODO: Reconcile with BasicDetails.
-	// We need BasicDetails to be read-only, and then have
-	// MutableBasicDetails(?) which adds the setters.
-
-	/** Gets a human-readable label. */
-	default String getLabel() {
-		return getKey();
-	}
-
-	/** Returns true iff the given key is defined. */
-	default boolean has(@SuppressWarnings("unused") String key) {
-		return false;
-	}
-
-	/** Gets the value of the given key, or null if undefined. */
-	default String get(@SuppressWarnings("unused") String key) {
-		return null;
-	}
-}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java
deleted file mode 100644
index 02de07217..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java
+++ /dev/null
@@ -1,575 +0,0 @@
-
-package org.scijava.param;
-
-import io.leangen.geantyref.AnnotationFormatException;
-import io.leangen.geantyref.TypeFactory;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import org.scijava.function.Container;
-import org.scijava.function.Mutable;
-import org.scijava.ops.FieldOpDependencyMember;
-import org.scijava.ops.MethodParameterOpDependencyMember;
-import org.scijava.ops.OpDependency;
-import org.scijava.ops.OpDependencyMember;
-import org.scijava.ops.OpInfo;
-import org.scijava.ops.OpMethod;
-import org.scijava.ops.simplify.Simplifier;
-import org.scijava.ops.struct.JavadocParameterData;
-import org.scijava.ops.struct.ParameterData;
-import org.scijava.ops.struct.SynthesizedParameterData;
-import org.scijava.ops.util.AnnotationUtils;
-import org.scijava.struct.ItemIO;
-import org.scijava.struct.Member;
-import org.scijava.struct.Struct;
-import org.scijava.struct.StructInstance;
-import org.scijava.types.Types;
-import org.scijava.types.inference.GenericAssignability;
-import org.scijava.util.ClassUtils;
-
-/**
- * Utility functions for working with {@link org.scijava.param} classes.
- * 
- * @author Curtis Rueden
- * @author David Kolb
- */
-public final class ParameterStructs {
-
-	/**
-	 * Convenience method to call {@link #structOf(Class)} dot {@link Struct#createInstance(Object)}
-	 * 
-	 * @param object
-	 * @return
-	 * @throws ValidityException
-	 */
-	public static <C> StructInstance<C> create(final C object)
-		throws ValidityException
-	{
-		return structOf(object.getClass()).createInstance(object);
-	}
-
-	/**
-	 * Convenience method to () -> parse(type)
-	 * 
-	 * @param type
-	 * @return
-	 * @throws ValidityException
-	 */
-	public static Struct structOf(final Class<?> type)
-		throws ValidityException
-	{
-		final List<Member<?>> items = parse(type);
-		return () -> items;
-	}
-	
-	/**
-	 * Convenience method to () -> parse(field)
-	 * 
-	 * @param field
-	 * @return
-	 * @throws ValidityException
-	 */
-	public static Struct structOf(final Field field)
-			throws ValidityException
-	{
-		final List<Member<?>> items = parse(field);
-		return () -> items;
-	}
-	
-	//TODO: Javadoc
-	public static Struct structOf(final OpInfo opInfo, final Type newType) throws ValidityException {
-		final List<Member<?>> items = parse(opInfo, newType);
-		return () -> items;
-	}
-	
-	public static Struct structOf(final Class<?> c, final Method m)
-			throws ValidityException
-		{
-			final List<Member<?>> items = parse(c, m);
-			return () -> items;
-		}
-
-	/**
-	 * Parses the specified functional class for @{@link Parameter} annotations. This consists of the following steps:
-	 * <br><br>
-	 * 1) First annotations on the class level are checked. These annotate the signature (parameters and return type) of
-	 * the specified functional class (or subtype of one). The annotations re expected to be in the following order: 
-	 * parameters, return type.
-	 * <br>
-	 * E.g. a {@link Function} may be annotated with two @{@link Parameter} annotations, where the first annotation will
-	 * annotate the parameter and the second the return type of the functional method {@link Function#apply(Object)} of
-	 * {@link Function}.
-	 * <br><br>
-	 * 2) Second, annotations on the fields of the specified class are checked.
-	 * 
-	 * @param type the class to parse, is expected to contain some functional interface in its hierarchy
-	 * @return list of identified member instances
-	 * @throws ValidityException if there are problems during parsing
-	 */
-	public static List<Member<?>> parse(final Class<?> type)
-		throws ValidityException
-	{
-		if (type == null) return null;
-
-		final ArrayList<Member<?>> items = new ArrayList<>();
-		final ArrayList<ValidityProblem> problems = new ArrayList<>();
-		final Set<String> names = new HashSet<>();
-
-		// NB: Reject abstract classes.
-		checkModifiers(type.getName() + ": ", problems, type.getModifiers(), true, Modifier.ABSTRACT);
-
-		// obtain a parameterData (preferably one that scrapes the javadoc)
-		ParameterData paramData;
-		try {
-			paramData = new JavadocParameterData(type);
-		} catch(NullPointerException | IllegalArgumentException e) {
-			paramData = new SynthesizedParameterData();
-		}
-
-		parseFunctionalParameters(items, names, problems, type, paramData);
-
-		// Parse field level @OpDependency annotations.
-		parseFieldOpDependencies(items, problems, type);
-
-		// Fail if there were any problems.
-		if (!problems.isEmpty()) throw new ValidityException(problems);
-
-		return items;
-	}
-	
-	/**
-	 * Parses the specified field for @{@link Parameter} annotations. Has the same behavior as the first parsing step
-	 * of {@link #parse(Class)}. 
-	 * 
-	 * @param field the field to parse, is expected to contain some functional interface in the hierarchy of its type
-	 * @return list of identified member instances
-	 * @throws ValidityException if there are problems during parsing
-	 */
-	public static List<Member<?>> parse(final Field field) throws ValidityException {
-		Class<?> c = field.getDeclaringClass();
-		if (c == null || field == null) return null;
-
-		// obtain a parameterData (preferably one that scrapes the javadoc)
-		ParameterData paramData;
-		try {
-			paramData = new JavadocParameterData(field);
-		} catch(IllegalArgumentException e) {
-			paramData = new SynthesizedParameterData();
-		}
-		field.setAccessible(true);
-		
-		final ArrayList<Member<?>> items = new ArrayList<>();
-		final ArrayList<ValidityProblem> problems = new ArrayList<>();
-		final Set<String> names = new HashSet<>();
-		final Type fieldType = Types.fieldType(field, c);
-
-		checkModifiers(field.toString() + ": ", problems, field.getModifiers(), false, Modifier.FINAL);
-		parseFunctionalParameters(items, names, problems, fieldType, paramData); 
-		// Fail if there were any problems.
-		if (!problems.isEmpty()) {
-			throw new ValidityException(problems);
-		}
-
-		return items;
-	}
-
-	//TODO: Javadoc
-	public static List<Member<?>> parse(final OpInfo opInfo, final Type newType) throws ValidityException {
-		final ArrayList<Member<?>> items = new ArrayList<>();
-		final ArrayList<ValidityProblem> problems = new ArrayList<>();
-		final Set<String> names = new HashSet<>();
-
-		// obtain a parameterData (preferably one that scrapes the javadoc)
-		ParameterData paramData;
-		try {
-			paramData = new JavadocParameterData(opInfo, newType);
-		} catch(IllegalArgumentException e) {
-			paramData = new SynthesizedParameterData();
-		}
-
-		parseFunctionalParameters(items, names, problems, newType, paramData);
-
-		// Fail if there were any problems.
-		if (!problems.isEmpty()) {
-			throw new ValidityException(problems);
-		}
-
-		return items;
-	}
-
-	public static List<Member<?>> parse(final Class<?> c, final Method method)
-			throws ValidityException
-		{
-			if (c == null || method == null) return null;
-
-			method.setAccessible(true);
-
-			// obtain a parameterData (preferably one that scrapes the javadoc)
-			ParameterData paramData;
-			try {
-				paramData = new JavadocParameterData(method);
-			} catch(IllegalArgumentException e) {
-				paramData = new SynthesizedParameterData();
-			}
-
-			final ArrayList<Member<?>> items = new ArrayList<>();
-			final ArrayList<ValidityProblem> problems = new ArrayList<>();
-			final Set<String> names = new HashSet<>();
-			final OpMethod methodAnnotation = method.getAnnotation(OpMethod.class);
-			
-			// Determine functional type
-			Type functionalType;
-			try {
-				functionalType = getOpMethodType(methodAnnotation.type(),
-					method);
-			}
-			catch (IllegalArgumentException e) {
-				problems.add(new ValidityProblem(e.getMessage()));
-				functionalType = Types.parameterizeRaw(methodAnnotation.type());
-			}
-			
-			// Parse method level @Parameter annotations.
-			parseFunctionalParameters(items, names, problems, functionalType, paramData);
-
-			// Parse method level @OpDependency annotations.
-			parseMethodOpDependencies(items, method);
-
-			// Fail if there were any problems.
-			if (!problems.isEmpty()) throw new ValidityException(problems);
-
-			return items;
-		}
-
-	private static java.lang.reflect.Parameter[] getOpDependencies(
-		java.lang.reflect.Parameter[] methodParams)
-	{
-		return Arrays //
-			.stream(methodParams) //
-			.filter(param -> param.getAnnotation(OpDependency.class) != null) //
-			.toArray(java.lang.reflect.Parameter[]::new);
-	}
-	
-	private static java.lang.reflect.Parameter[] getOpParams(
-		java.lang.reflect.Parameter[] methodParams)
-	{
-		return Arrays //
-			.stream(methodParams) //
-			.filter(param -> param.getAnnotation(OpDependency.class) == null) //
-			.toArray(java.lang.reflect.Parameter[]::new);
-
-	}
-
-	private static Type[] getOpParamTypes(
-		java.lang.reflect.Parameter[] methodParams)
-	{
-		return Arrays //
-			.stream(methodParams) //
-			.filter(param -> param.getAnnotation(OpDependency.class) == null) //
-			.map(param -> param.getParameterizedType())
-			.toArray(Type[]::new);
-
-	}
-
-	public static Type getOpMethodType(Class<?> opClass, Method opMethod)
-	{
-		// since type is a functional interface, it has (exactly) one abstract
-		// declared method (the method that our OpMethod is emulating).
-		Method abstractMethod = singularAbstractMethod(opClass);
-		Type[] typeMethodParams = abstractMethod.getGenericParameterTypes();
-		java.lang.reflect.Parameter[] opMethodParams = getOpParams(opMethod.getParameters());
-
-		if (typeMethodParams.length != opMethodParams.length) {
-			throw new IllegalArgumentException("Number of parameters in OpMethod" +
-				opMethod +
-				" does not match the required number of parameters for functional method of FunctionalInterface " +
-				opClass);
-		}
-		Map<TypeVariable<?>, Type> typeVarAssigns = new HashMap<>();
-		
-		// map params of OpMethod to type variables of abstract method of functional
-		// interface (along with return type if applicable)
-		// TODO: not sure how this handles when there are type variables.
-		GenericAssignability.inferTypeVariables(typeMethodParams, getOpParamTypes(opMethodParams), typeVarAssigns);
-		if (abstractMethod.getReturnType() != void.class) {
-			GenericAssignability.inferTypeVariables(new Type[] {abstractMethod.getGenericReturnType()}, new Type[] {opMethod.getGenericReturnType()}, typeVarAssigns);
-		}
-		
-		// parameterize opClass 
-		return Types.parameterize(opClass, typeVarAssigns);
-	}
-
-	public static Method singularAbstractMethod(Class<?> functionalInterface) {
-		Method[] typeMethods = Arrays.stream(functionalInterface
-			.getMethods()).filter(method -> Modifier.isAbstract(method
-				.getModifiers())).toArray(Method[]::new);
-		if (typeMethods.length != 1) {
-			throw new IllegalArgumentException(functionalInterface +
-				" should be a FunctionalInterface, however it has " +
-				typeMethods.length + " abstract declared methods");
-		}
-
-		return typeMethods[0];
-	}
-
-	//TODO: Javadoc
-	// TODO: We currently assume that simplifiers only exist for pure inputs
-	public static List<Member<?>> parse(final OpInfo opInfo, final List<Simplifier<?, ?>> suppliers) throws ValidityException {
-		final ArrayList<Member<?>> items = new ArrayList<>();
-		final ArrayList<ValidityProblem> problems = new ArrayList<>();
-
-		Struct srcStruct = opInfo.struct();
-		for (int i = 0; i < srcStruct.members().size(); i++) {
-			Member<?> member = srcStruct.members().get(i);
-			// FIXME: We currently assume that only pure inputs have simplifiers.
-			if (!member.isInput() || member.isOutput()) {
-				items.add(member);
-				continue;
-			}
-			Type newType = suppliers.get(i).simpleType();
-			items.add(new ConvertedParameterMember<>(member, newType));
-		}
-
-		// Fail if there were any problems.
-		// TODO: can we delete this?
-		if (!problems.isEmpty()) {
-			throw new ValidityException(problems);
-		}
-
-		return items;
-	}
-	
-	/**
-	 * Returns a list of {@link FunctionalMethodType}s describing the input and
-	 * output types of the functional method of the specified functional type. In
-	 * doing so, the return type of the method will me marked as
-	 * {@link ItemIO#OUTPUT} and the all method parameters as {@link ItemIO#OUTPUT},
-	 * except for parameters annotated with {@link Container} or {@link Mutable}
-	 * which will be marked as {@link ItemIO#CONTAINER} or {@link ItemIO#MUTABLE}
-	 * respectively. If the specified type does not have a functional method in its
-	 * hierarchy, {@code null} will be returned.<br>
-	 * The order will be the following: method parameters from left to right, then
-	 * return type.
-	 * 
-	 * @param functionalType
-	 * @return
-	 */
-	public static List<FunctionalMethodType> findFunctionalMethodTypes(Type functionalType) {
-		Method functionalMethod = findFunctionalMethod(Types.raw(functionalType));
-		if (functionalMethod == null) throw new IllegalArgumentException("Type " +
-			functionalType +
-			" is not a functional type, thus its functional method types cannot be determined");
-		
-		Type paramfunctionalType = functionalType;
-		if (functionalType instanceof Class) {
-			paramfunctionalType = Types.parameterizeRaw((Class<?>) functionalType);
-		}
-		
-		List<FunctionalMethodType> out = new ArrayList<>();
-		int i = 0;
-		for (Type t : Types.getExactParameterTypes(functionalMethod, paramfunctionalType)) {
-			final ItemIO ioType;
-			if (AnnotationUtils.getMethodParameterAnnotation(functionalMethod, i, Container.class) != null)
-				ioType = ItemIO.CONTAINER;
-			else if (AnnotationUtils.getMethodParameterAnnotation(functionalMethod, i, Mutable.class) != null)
-				ioType = ItemIO.MUTABLE;
-			else
-				ioType = ItemIO.INPUT;
-			out.add(new FunctionalMethodType(t, ioType));
-			i++;
-		}
-		
-		Type returnType = Types.getExactReturnType(functionalMethod, paramfunctionalType);
-		if (!returnType.equals(void.class)) {
-			out.add(new FunctionalMethodType(returnType, ItemIO.OUTPUT));
-		}
-		
-		return out;
-	}
-
-	// -- Helper methods --
-	
-	/**
-	 * Helper to check for several modifiers at once.
-	 * 
-	 * @param message
-	 * @param problems
-	 * @param actualModifiers
-	 * @param requiredModifiers
-	 */
-	private static void checkModifiers(String message, final ArrayList<ValidityProblem> problems,
-			final int actualModifiers, final boolean negate, final int... requiredModifiers) {
-		for (int mod : requiredModifiers) {
-			if (negate) {
-				if ((actualModifiers & mod) != 0) {
-					problems.add(
-							new ValidityProblem(message + "Illegal modifier. Must not be " + Modifier.toString(mod)));
-				}
-			} else {
-				if ((actualModifiers & mod) == 0) {
-					problems.add(new ValidityProblem(message + "Illegal modifier. Must be " + Modifier.toString(mod)));
-				}
-			}
-		}
-	}
-
-	private static void parseFunctionalParameters(final ArrayList<Member<?>> items, final Set<String> names, final ArrayList<ValidityProblem> problems,
-			Type type, ParameterData data) {
-		//Search for the functional method of 'type' and map its signature to ItemIO
-		List<FunctionalMethodType> fmts;
-		try {
-			fmts = findFunctionalMethodTypes(type);
-		}
-		catch (IllegalArgumentException e) {
-			problems.add(new ValidityProblem("Could not find functional method of " +
-				type.getTypeName()));
-			return;
-		}
-
-		// Synthesize members
-		List<Member<?>> fmtMembers = data.synthesizeMembers(fmts);
-
-		for (Member<?> m : fmtMembers) {
-			String key = m.getKey();
-			final Type itemType = m.getType();
-
-			final boolean valid = checkValidity(m, key, Types.raw(itemType), false,
-				names, problems);
-			if (!valid) continue;
-			items.add(m);
-			names.add(m.getKey());
-		}
-	}
-
-	private static void parseFieldOpDependencies(final List<Member<?>> items,
-		final List<ValidityProblem> problems, Class<?> annotatedClass)
-	{
-		final List<Field> fields = ClassUtils.getAnnotatedFields(annotatedClass,
-			OpDependency.class);
-		for (final Field f : fields) {
-			f.setAccessible(true);
-			final boolean isFinal = Modifier.isFinal(f.getModifiers());
-			if (isFinal) {
-				final String name = f.getName();
-				// Final fields are bad because they cannot be modified.
-				final String error = "Invalid final Op dependency field: " + name;
-				problems.add(new ValidityProblem(error));
-				// Skip invalid Op dependencies.
-				continue;
-			}
-			final OpDependencyMember<?> item = new FieldOpDependencyMember<>(f,
-				annotatedClass);
-			items.add(item);
-		}
-	}
-
-	private static void parseMethodOpDependencies(final List<Member<?>> items,
-		final Method annotatedMethod)
-	{
-		final java.lang.reflect.Parameter[] methodParams = annotatedMethod
-			.getParameters();
-		final java.lang.reflect.Parameter[] opDependencyParams = getOpDependencies(methodParams);
-
-		for (java.lang.reflect.Parameter param : opDependencyParams) {
-			final OpDependency dependency = param.getAnnotation(OpDependency.class);
-			final Type methodParamType = param.getParameterizedType();
-			final Member<?> item = new MethodParameterOpDependencyMember<>(
-				param, methodParamType, dependency);
-			items.add(item);
-		}
-	}	
-
-	private static boolean isImmutable(final Class<?> type) {
-		// NB: All eight primitive types, as well as the boxed primitive
-		// wrapper classes, as well as strings, are immutable objects.
-		return Types.isNumber(type) || Types.isText(type) || //
-				Types.isBoolean(type);
-	}
-
-	/**
-	 * Searches for a {@code @FunctionalInterface} annotated interface in the 
-	 * class hierarchy of the specified type. The first one that is found will
-	 * be returned. If no such interface can be found, null will be returned.
-	 * 
-	 * @param type
-	 * @return
-	 */
-	public static Class<?> findFunctionalInterface(Class<?> type) {
-		if (type == null) return null;
-		if (type.getAnnotation(FunctionalInterface.class) != null) return type;
-		for (Class<?> iface : type.getInterfaces()) {
-			final Class<?> result = findFunctionalInterface(iface);
-			if (result != null) return result;
-		}
-		return findFunctionalInterface(type.getSuperclass());
-	}
-
-	private static boolean checkValidity(Member<?> m, String name,
-		Class<?> type, boolean isFinal, Set<String> names,
-		ArrayList<ValidityProblem> problems)
-	{
-		boolean valid = true;
-
-		if (names.contains(name)) {
-			// NB: Shadowed parameters are bad because they are ambiguous.
-			final String error = "Invalid duplicate parameter: " + name;
-			problems.add(new ValidityProblem(error));
-			valid = false;
-		}
-
-		if ((m.getIOType() == ItemIO.MUTABLE || m.getIOType() == ItemIO.CONTAINER) && isImmutable(type)) {
-			// NB: The MUTABLE and CONTAINER types signify that the parameter
-			// will be written to, but immutable parameters cannot be changed in
-			// such a manner, so it makes no sense to label them as such.
-			final String error = "Immutable " + m.getIOType() + " parameter: " + name + " (" + type.getName() + " is immutable)";
-			problems.add(new ValidityProblem(error));
-			valid = false;
-		}
-
-		return valid;
-	}
-	
-	/**
-	 * Attempts to find the single functional method of the specified
-	 * class, by scanning the for functional interfaces. If there
-	 * is no functional interface, null will be returned.
-	 * 
-	 * @param cls
-	 * @return
-	 */
-	private static Method findFunctionalMethod(Class<?> cls) {
-		Class<?> iFace = findFunctionalInterface(cls);
-		if (iFace == null) {
-			return null;
-		}
-		
-		List<Method> nonDefaults = Arrays.stream(iFace.getMethods())
-				.filter(m -> !m.isDefault()).collect(Collectors.toList());
-		
-		// The single non default method must be the functional one
-		if (nonDefaults.size() != 1) {
-			for (Class<?> i : iFace.getInterfaces()) {
-				final Method result = findFunctionalMethod(i);
-				if (result != null) return result;
-			}
-		}
-		
-		return nonDefaults.get(0);
-	}
-	
-	
-}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/ValidityProblem.java b/scijava/scijava-ops/src/main/java/org/scijava/param/ValidityProblem.java
deleted file mode 100644
index 89cf665b5..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/ValidityProblem.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * #%L
- * SciJava Common shared library for SciJava software.
- * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
- * %%
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * #L%
- */
-
-package org.scijava.param;
-
-import org.scijava.Validated;
-
-/**
- * An exception used to record a validity problem with a {@link Validated}
- * object.
- * <p>
- * Unlike most exceptions, {@code ValidityException} is typically not thrown,
- * but rather only recorded for future reference.
- * <p>
- * 
- * @author Curtis Rueden
- */
-public class ValidityProblem extends Exception {
-
-	public ValidityProblem() {
-		super();
-	}
-
-	public ValidityProblem(final String s) {
-		super(s);
-	}
-
-	public ValidityProblem(final String s, final Throwable cause) {
-		super(s, cause);
-	}
-
-	public ValidityProblem(final Throwable cause) {
-		super(cause);
-	}
-
-}
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java
similarity index 95%
rename from scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
rename to scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java
index 88e98727a..a49276278 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java
@@ -1,5 +1,5 @@
 
-package org.scijava.param;
+package org.scijava.ops;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -406,7 +406,7 @@ public void opStringRegressionTest() {
 
 		// test standard op string
 		String expected =
-			"public static java.util.List<java.lang.Long> org.scijava.param.JavadocParameterTest." +
+			"public static java.util.List<java.lang.Long> org.scijava.ops.JavadocParameterTest." +
 				"OpMethodPR(java.util.List<java.lang.String>,java.util.List<java.lang.String>)(\n" +
 				"	 Inputs:\n" +
 				"		java.util.List<java.lang.String> foo -> the first input\n" +
@@ -418,7 +418,7 @@ public void opStringRegressionTest() {
 
 		// test special op string
 		expected =
-			"public static java.util.List<java.lang.Long> org.scijava.param.JavadocParameterTest." +
+			"public static java.util.List<java.lang.Long> org.scijava.ops.JavadocParameterTest." +
 				"OpMethodPR(java.util.List<java.lang.String>,java.util.List<java.lang.String>)(\n" +
 				"	 Inputs:\n" +
 				"		java.util.List<java.lang.String> foo -> the first input\n" +
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCollectionTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCollectionTest.java
index 34226f5ef..a74f3848d 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCollectionTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCollectionTest.java
@@ -33,7 +33,6 @@
 
 import org.junit.Test;
 import org.scijava.types.Nil;
-import org.scijava.param.ValidityException;
 
 public class OpCollectionTest extends AbstractTestEnvironment {
 
diff --git a/scijava/scijava-ops/templates/main/java/module-info.vm b/scijava/scijava-ops/templates/main/java/module-info.vm
index 60119399a..e9ad15c28 100644
--- a/scijava/scijava-ops/templates/main/java/module-info.vm
+++ b/scijava/scijava-ops/templates/main/java/module-info.vm
@@ -20,7 +20,6 @@ module org.scijava.ops {
 	exports org.scijava.ops.provenance;
 	// TODO: move OpWrapper to its own package (org.scijava.ops.wrap??)
 	exports org.scijava.ops.util; // contains OpWrapper interface
-	exports org.scijava.param;
 
 #foreach($package in $packages)
 	opens $package to $opensToString.call($package, $scijavaPackages, $therapiPackages);
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm
index 3b02876a8..2b8f4d813 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm
@@ -40,7 +40,6 @@ import java.util.function.Function;
 import org.scijava.function.Computers;
 import org.scijava.ops.OpField;
 import org.scijava.ops.OpCollection;
-import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/FunctionalMethodType.java b/scijava/scijava-struct/src/main/java/org/scijava/struct/FunctionalMethodType.java
similarity index 89%
rename from scijava/scijava-ops/src/main/java/org/scijava/param/FunctionalMethodType.java
rename to scijava/scijava-struct/src/main/java/org/scijava/struct/FunctionalMethodType.java
index 13926ca64..7b96dcb11 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/param/FunctionalMethodType.java
+++ b/scijava/scijava-struct/src/main/java/org/scijava/struct/FunctionalMethodType.java
@@ -1,9 +1,7 @@
-package org.scijava.param;
+package org.scijava.struct;
 
 import java.lang.reflect.Type;
 
-import org.scijava.struct.ItemIO;
-
 
 /**
  * Wrapper to pair a type of a method signature with its {@link ItemIO}.
diff --git a/scijava/scijava-types/src/main/java/org/scijava/types/inference/InterfaceInference.java b/scijava/scijava-types/src/main/java/org/scijava/types/inference/InterfaceInference.java
new file mode 100644
index 000000000..8e038744f
--- /dev/null
+++ b/scijava/scijava-types/src/main/java/org/scijava/types/inference/InterfaceInference.java
@@ -0,0 +1,22 @@
+package org.scijava.types.inference;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Arrays;
+
+public class InterfaceInference {
+
+	public static Method singularAbstractMethod(Class<?> functionalInterface) {
+		Method[] typeMethods = Arrays.stream(functionalInterface
+			.getMethods()).filter(method -> Modifier.isAbstract(method
+				.getModifiers())).toArray(Method[]::new);
+		if (typeMethods.length != 1) {
+			throw new IllegalArgumentException(functionalInterface +
+				" should be a FunctionalInterface, however it has " +
+				typeMethods.length + " abstract declared methods");
+		}
+
+		return typeMethods[0];
+	}
+
+}

From e43e047a665d0fdec245c2837c97c2f004cbb230 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 2 Jul 2021 11:59:40 -0500
Subject: [PATCH 60/91] Move ValidityException to org.scijava.ops

This commit also adds an isRequired() field to Member.
---
 .../main/java/org/scijava/ops/OpUtils.java    | 20 +++----------------
 .../scijava/ops/matcher/DefaultOpMatcher.java |  2 +-
 .../org/scijava/ops/JavadocParameterTest.java |  1 -
 .../main/java/org/scijava/struct/Member.java  |  4 ++++
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
index 0e8e7d9fb..814603849 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
@@ -194,7 +194,7 @@ public static Object[] padArgs(final OpCandidate candidate, final boolean second
 		int inputCount = 0, requiredCount = 0;
 		for (final Member<?> item : members) {
 			inputCount++;
-			if (isRequired(item))
+			if (!item.isRequired())
 				requiredCount++;
 		}
 		if (args.length == inputCount) {
@@ -223,7 +223,7 @@ public static Object[] padArgs(final OpCandidate candidate, final boolean second
 		final Object[] paddedArgs = new Object[inputCount];
 		int argIndex = 0, paddedIndex = 0, optionalIndex = 0;
 		for (final Member<?> item : members) {
-			if (!isRequired(item) && optionalIndex++ >= optionalsToFill) {
+			if (!item.isRequired() && optionalIndex++ >= optionalsToFill) {
 				// skip this optional parameter (pad with null)
 				paddedIndex++;
 				continue;
@@ -232,21 +232,7 @@ public static Object[] padArgs(final OpCandidate candidate, final boolean second
 		}
 		return paddedArgs;
 	}
-	
-	/**
-	 * Determines whether {@link Member} {@code item} is required.
-	 * <p>
-	 * TODO: This method is a relic of {@link ParameterMember}, and should be
-	 * reconciled with the work in https://github.com/scijava/incubator/pull/32
-	 * 
-	 * @param item the {@link Member} that may or may not be required
-	 * @return true iff {@code item} is required.
-	 */
-	@Deprecated
-	public static boolean isRequired(final Member<?> item) {
-		return true;
-	}
-	
+
 	public static List<Member<?>> injectableMembers(Struct struct) {
 		return struct.members()
 				.stream()
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java
index d668c09b1..c51bdd1a5 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java
@@ -268,7 +268,7 @@ private List<OpCandidate> filterMatches(final List<OpCandidate> candidates, fina
 	private boolean missArgs(final OpCandidate candidate, final Type[] paddedArgs) {
 		int i = 0;
 		for (final Member<?> member : OpUtils.inputs(candidate)) {
-			if (paddedArgs[i++] == null && OpUtils.isRequired(member)) {
+			if (paddedArgs[i++] == null && member.isRequired()) {
 				candidate.setStatus(StatusCode.REQUIRED_ARG_IS_NULL, null, member);
 				return true;
 			}
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java
index a49276278..c75e35748 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java
@@ -15,7 +15,6 @@
 import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpDependency;
diff --git a/scijava/scijava-struct/src/main/java/org/scijava/struct/Member.java b/scijava/scijava-struct/src/main/java/org/scijava/struct/Member.java
index ccdc6af85..1c00d547b 100644
--- a/scijava/scijava-struct/src/main/java/org/scijava/struct/Member.java
+++ b/scijava/scijava-struct/src/main/java/org/scijava/struct/Member.java
@@ -54,6 +54,10 @@ default boolean isStruct() {
 		return false;
 	}
 
+	default boolean isRequired() {
+		return true;
+	}
+
 	default Struct childStruct() {
 		return null;
 	}

From 81c87fc14289dfcb3edd8dca711f71545c785b7e Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 2 Jul 2021 13:19:40 -0500
Subject: [PATCH 61/91] Extract matcher impl details to impl subpackage

---
 scijava/scijava-ops/src/main/java/module-info.java |  1 +
 .../org/scijava/ops/impl/DefaultOpEnvironment.java | 14 +++++++-------
 .../ops/matcher/{ => impl}/DefaultOpMatcher.java   |  4 +++-
 .../ops/matcher/{ => impl}/DefaultOpRef.java       |  3 ++-
 .../ops/matcher/{ => impl}/MatchingUtils.java      |  2 +-
 .../ops/matcher/{ => impl}/OpAdaptationInfo.java   |  2 +-
 .../ops/matcher/{ => impl}/OpClassInfo.java        |  2 +-
 .../ops/matcher/{ => impl}/OpFieldInfo.java        |  2 +-
 .../ops/matcher/{ => impl}/OpMethodInfo.java       |  2 +-
 .../scijava/ops/matcher/{ => impl}/OpWrappers.java |  2 +-
 .../java/org/scijava/ops/OpEnvironmentTest.java    |  2 +-
 .../org/scijava/ops/matcher/MatchingUtilsTest.java |  1 +
 .../scijava-ops/templates/main/java/module-info.vm |  2 +-
 .../scijava/ops/matcher/{ => impl}/OpWrappers.list |  2 +-
 .../scijava/ops/matcher/{ => impl}/OpWrappers.vm   |  2 +-
 15 files changed, 24 insertions(+), 19 deletions(-)
 rename scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/{ => impl}/DefaultOpMatcher.java (99%)
 rename scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/{ => impl}/DefaultOpRef.java (98%)
 rename scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/{ => impl}/MatchingUtils.java (99%)
 rename scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/{ => impl}/OpAdaptationInfo.java (98%)
 rename scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/{ => impl}/OpClassInfo.java (99%)
 rename scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/{ => impl}/OpFieldInfo.java (99%)
 rename scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/{ => impl}/OpMethodInfo.java (96%)
 rename scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/{ => impl}/OpWrappers.java (99%)
 rename scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/{ => impl}/OpWrappers.list (96%)
 rename scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/{ => impl}/OpWrappers.vm (99%)

diff --git a/scijava/scijava-ops/src/main/java/module-info.java b/scijava/scijava-ops/src/main/java/module-info.java
index 9f0655fc9..25271150b 100644
--- a/scijava/scijava-ops/src/main/java/module-info.java
+++ b/scijava/scijava-ops/src/main/java/module-info.java
@@ -17,6 +17,7 @@
 
 	opens org.scijava.ops.conversionLoss to therapi.runtime.javadoc;
 	opens org.scijava.ops.log to therapi.runtime.javadoc;
+	opens org.scijava.ops.matcher.impl to therapi.runtime.javadoc, org.scijava;
 	opens org.scijava.ops.copy to therapi.runtime.javadoc;
 	opens org.scijava.ops.hint to therapi.runtime.javadoc;
 	opens org.scijava.ops.adapt.complexLift to therapi.runtime.javadoc;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
index 995bd3065..528dc4645 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
@@ -56,10 +56,10 @@
 import org.scijava.ops.BaseOpHints.Adaptation;
 import org.scijava.ops.BaseOpHints.DependencyMatching;
 import org.scijava.ops.BaseOpHints.Simplification;
-import org.scijava.ops.OpCandidate.StatusCode;
 import org.scijava.ops.Hints;
 import org.scijava.ops.Op;
 import org.scijava.ops.OpCandidate;
+import org.scijava.ops.OpCandidate.StatusCode;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.OpDependencyMember;
@@ -74,15 +74,15 @@
 import org.scijava.ops.hint.AdaptationHints;
 import org.scijava.ops.hint.DefaultHints;
 import org.scijava.ops.hint.SimplificationHints;
-import org.scijava.ops.matcher.DefaultOpMatcher;
-import org.scijava.ops.matcher.DefaultOpRef;
 import org.scijava.ops.matcher.DependencyMatchingException;
-import org.scijava.ops.matcher.OpAdaptationInfo;
-import org.scijava.ops.matcher.OpClassInfo;
-import org.scijava.ops.matcher.OpFieldInfo;
 import org.scijava.ops.matcher.OpMatcher;
 import org.scijava.ops.matcher.OpMatchingException;
-import org.scijava.ops.matcher.OpMethodInfo;
+import org.scijava.ops.matcher.impl.DefaultOpMatcher;
+import org.scijava.ops.matcher.impl.DefaultOpRef;
+import org.scijava.ops.matcher.impl.OpAdaptationInfo;
+import org.scijava.ops.matcher.impl.OpClassInfo;
+import org.scijava.ops.matcher.impl.OpFieldInfo;
+import org.scijava.ops.matcher.impl.OpMethodInfo;
 import org.scijava.ops.provenance.OpHistoryService;
 import org.scijava.ops.simplify.SimplifiedOpInfo;
 import org.scijava.ops.struct.Structs;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/DefaultOpMatcher.java
similarity index 99%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/DefaultOpMatcher.java
index c51bdd1a5..61dae23bf 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/DefaultOpMatcher.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops.matcher;
+package org.scijava.ops.matcher.impl;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -53,6 +53,8 @@
 import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.ops.OpCandidate.StatusCode;
 import org.scijava.ops.hint.DefaultHints;
+import org.scijava.ops.matcher.MatchingResult;
+import org.scijava.ops.matcher.OpMatcher;
 import org.scijava.ops.simplify.InfoSimplificationGenerator;
 import org.scijava.service.AbstractService;
 import org.scijava.struct.Member;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpRef.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/DefaultOpRef.java
similarity index 98%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpRef.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/DefaultOpRef.java
index 6f4a2d8f7..ed18444e6 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpRef.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/DefaultOpRef.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops.matcher;
+package org.scijava.ops.matcher.impl;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -37,6 +37,7 @@
 
 import org.scijava.ops.Op;
 import org.scijava.ops.OpRef;
+import org.scijava.ops.matcher.OpMatcher;
 import org.scijava.types.Types;
 import org.scijava.types.inference.GenericAssignability;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/MatchingUtils.java
similarity index 99%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingUtils.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/MatchingUtils.java
index eee5b7fef..f1655ba5e 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingUtils.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/MatchingUtils.java
@@ -30,7 +30,7 @@
  * #L%
  */
 
-package org.scijava.ops.matcher;
+package org.scijava.ops.matcher.impl;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpAdaptationInfo.java
similarity index 98%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpAdaptationInfo.java
index 4081cd839..5d553eb3b 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpAdaptationInfo.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops.matcher;
+package org.scijava.ops.matcher.impl;
 
 import com.google.common.collect.Streams;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpClassInfo.java
similarity index 99%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpClassInfo.java
index 3265d85c0..7c81bfbc7 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpClassInfo.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops.matcher;
+package org.scijava.ops.matcher.impl;
 
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Constructor;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpFieldInfo.java
similarity index 99%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpFieldInfo.java
index 8ca3eae9a..6ac0a6915 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpFieldInfo.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops.matcher;
+package org.scijava.ops.matcher.impl;
 
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Field;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java
similarity index 96%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java
index 0cb951941..55488ebe2 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java
@@ -28,7 +28,7 @@
  * #L%
  */
 
-package org.scijava.ops.matcher;
+package org.scijava.ops.matcher.impl;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpWrappers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpWrappers.java
similarity index 99%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpWrappers.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpWrappers.java
index d5bd98efa..97936c716 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpWrappers.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpWrappers.java
@@ -3,7 +3,7 @@
  * corresponding template in templates/ and rerun bin/generate.groovy.
  */
 
-package org.scijava.ops.matcher;
+package org.scijava.ops.matcher.impl;
 
 import java.lang.reflect.Type;
 import java.util.UUID;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java
index 13888808f..a3c8051b8 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java
@@ -7,7 +7,7 @@
 import org.junit.Test;
 import org.scijava.Priority;
 import org.scijava.function.Producer;
-import org.scijava.ops.matcher.OpClassInfo;
+import org.scijava.ops.matcher.impl.OpClassInfo;
 import org.scijava.types.GenericTyped;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingUtilsTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingUtilsTest.java
index b0dda7a94..019210014 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingUtilsTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingUtilsTest.java
@@ -44,6 +44,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
+import org.scijava.ops.matcher.impl.MatchingUtils;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
 import org.scijava.types.inference.GenericAssignability;
diff --git a/scijava/scijava-ops/templates/main/java/module-info.vm b/scijava/scijava-ops/templates/main/java/module-info.vm
index e9ad15c28..332cb1a86 100644
--- a/scijava/scijava-ops/templates/main/java/module-info.vm
+++ b/scijava/scijava-ops/templates/main/java/module-info.vm
@@ -8,7 +8,7 @@ module org.scijava.ops {
 ## Determines all packages in the module
 #set($packages = $modulePackages.call("src/main/java/org/scijava"))
 ## Defines the packages that should be exported to org.scijava
-#set($scijavaPackages = ["org.scijava.ops", "org.scijava.ops.impl", "org.scijava.ops.provenance.impl"])
+#set($scijavaPackages = ["org.scijava.ops", "org.scijava.ops.impl", "org.scijava.ops.matcher.impl", "org.scijava.ops.provenance.impl"])
 ## Defines the packages that should be exported to therapi.runtime.javadoc
 #set($therapiPackages = $modulePackages.call("src/main/java/org/scijava"))
 	//TODO: rearrange packages to export only needed classes
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/OpWrappers.list b/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/impl/OpWrappers.list
similarity index 96%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/OpWrappers.list
rename to scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/impl/OpWrappers.list
index 3f884301e..1f84a9cc9 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/OpWrappers.list
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/impl/OpWrappers.list
@@ -1,4 +1,4 @@
-.include ../util/Globals.list
+.include templates/main/java/org/scijava/ops/util/Globals.list
 arities = (0..maxArity).collect()
 
 [OpWrappers.java]
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/OpWrappers.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/impl/OpWrappers.vm
similarity index 99%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/OpWrappers.vm
rename to scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/impl/OpWrappers.vm
index ccdba9740..e2b95552a 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/OpWrappers.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/impl/OpWrappers.vm
@@ -3,7 +3,7 @@
  * corresponding template in templates/ and rerun bin/generate.groovy.
  */
 
-package org.scijava.ops.matcher;
+package org.scijava.ops.matcher.impl;
 
 import java.lang.reflect.Type;
 import java.util.UUID;

From 864111b1ff611ec0c7b60ca77df3d4f51c10d2d1 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 2 Jul 2021 13:26:45 -0500
Subject: [PATCH 62/91] Prevent cycle: org.scijava.ops.simplify/struct

---
 .../ops/simplify/SimplificationUtils.java     | 13 ++-------
 .../java/org/scijava/ops/struct/Structs.java  | 29 +++++++------------
 2 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java
index aedc0181c..5d521b418 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java
@@ -24,7 +24,7 @@
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpRef;
-import org.scijava.ops.OpUtils;
+import org.scijava.ops.struct.Structs;
 import org.scijava.ops.util.AnnotationUtils;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
@@ -67,7 +67,7 @@ public static ParameterizedType retypeOpType(Type originalOpType, Type[] newArgs
 			if (!(originalOpType instanceof ParameterizedType))
 				throw new IllegalStateException("We hadn't thought about this yet.");
 			Class<?> opType = Types.raw(originalOpType);
-			Method fMethod = findFMethod(opType);
+			Method fMethod = Structs.findFMethod(opType);
 
 			Map<TypeVariable<?>, Type> typeVarAssigns = new HashMap<>();
 
@@ -115,13 +115,6 @@ private static Type[] typesFromOpType(Class<?> opType, Method fMethod, Type... t
 		return Types.mapVarToTypes(types, map);
 	}
 
-	// TODO: extract this method to a more general utility class
-	public static Method findFMethod(Class<?> c) {
-			Class<?> fIface = OpUtils.findFunctionalInterface(c);
-			if(fIface == null) throw new IllegalArgumentException("Class " + c +" does not implement a functional interface!");
-			return InterfaceInference.singularAbstractMethod(fIface);
-	}
-
 	/**
 	 * Finds the {@link Mutable} or {@link Container} argument of a
 	 * {@link FunctionalInterface}'s singular abstract method. If there is no
@@ -134,7 +127,7 @@ public static Method findFMethod(Class<?> c) {
 	 * @return the index of the mutable argument (or -1 iff the output is returned).
 	 */
 	public static int findMutableArgIndex(Class<?> c) {
-		Method fMethod = findFMethod(c);
+		Method fMethod = Structs.findFMethod(c);
 		for (int i = 0; i < fMethod.getParameterCount(); i++) {
 			if (AnnotationUtils.getMethodParameterAnnotation(fMethod, i,
 				Mutable.class) != null) return i;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java
index 3171c5cea..4bd574bfe 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java
@@ -13,6 +13,7 @@
 import org.scijava.ValidityProblem;
 import org.scijava.function.Container;
 import org.scijava.function.Mutable;
+import org.scijava.ops.OpUtils;
 import org.scijava.ops.ValidityException;
 import org.scijava.ops.util.AnnotationUtils;
 import org.scijava.struct.FunctionalMethodType;
@@ -21,6 +22,7 @@
 import org.scijava.struct.Struct;
 import org.scijava.struct.StructInstance;
 import org.scijava.types.Types;
+import org.scijava.types.inference.InterfaceInference;
 
 public class Structs {
 
@@ -157,7 +159,7 @@ else if (AnnotationUtils.getMethodParameterAnnotation(functionalMethod, i,
 	 * @return
 	 */
 	private static Method findFunctionalMethod(Class<?> cls) {
-		Class<?> iFace = findFunctionalInterface(cls);
+		Class<?> iFace = OpUtils.findFunctionalInterface(cls);
 		if (iFace == null) {
 			return null;
 		}
@@ -176,24 +178,6 @@ private static Method findFunctionalMethod(Class<?> cls) {
 		return nonDefaults.get(0);
 	}
 
-	/**
-	 * Searches for a {@code @FunctionalInterface} annotated interface in the
-	 * class hierarchy of the specified type. The first one that is found will be
-	 * returned. If no such interface can be found, null will be returned.
-	 * 
-	 * @param type
-	 * @return
-	 */
-	public static Class<?> findFunctionalInterface(Class<?> type) {
-		if (type == null) return null;
-		if (type.getAnnotation(FunctionalInterface.class) != null) return type;
-		for (Class<?> iface : type.getInterfaces()) {
-			final Class<?> result = findFunctionalInterface(iface);
-			if (result != null) return result;
-		}
-		return findFunctionalInterface(type.getSuperclass());
-	}
-
 	private static boolean checkValidity(Member<?> m, String name, Class<?> type,
 		boolean isFinal, Set<String> names, ArrayList<ValidityProblem> problems)
 	{
@@ -246,4 +230,11 @@ public static <C> StructInstance<C> create(final C object)
 		return s.createInstance(object);
 	}
 
+	// TODO: extract this method to a more general utility class
+	public static Method findFMethod(Class<?> c) {
+			Class<?> fIface = OpUtils.findFunctionalInterface(c);
+			if(fIface == null) throw new IllegalArgumentException("Class " + c +" does not implement a functional interface!");
+			return InterfaceInference.singularAbstractMethod(fIface);
+	}
+
 }

From 8d5871ccc206e1e1521781d6eb9b47ef36c1e4b5 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 2 Jul 2021 15:16:32 -0500
Subject: [PATCH 63/91] Prevent cycle:
 org.scijava.ops.util/org.scijava.ops.struct

---
 .../ops/{core => }/ExceptionUtils.java        |   0
 .../org/scijava/ops/OpExecutionException.java |  70 +----
 .../src/main/java/org/scijava/ops/OpInfo.java |   1 +
 .../main/java/org/scijava/ops/OpUtils.java    |   1 +
 .../ops/core/OpExecutionException.java        |   9 -
 .../ops/impl/DefaultOpEnvironment.java        |   4 +-
 .../ops/matcher/impl/OpAdaptationInfo.java    |   7 +-
 .../scijava/ops/matcher/impl/OpClassInfo.java |   5 +-
 .../scijava/ops/matcher/impl/OpFieldInfo.java |   4 +-
 .../ops/matcher/impl/OpMethodInfo.java        |   4 +-
 .../ops/simplify/SimplificationUtils.java     |   6 +-
 .../ops/simplify/SimplifiedOpInfo.java        |  10 +-
 .../struct/ClassOpDependencyMemberParser.java |   5 +-
 .../struct/ClassParameterMemberParser.java    |   7 +-
 .../struct/FieldParameterMemberParser.java    |   7 +-
 .../ops/struct/FunctionalParameters.java      | 104 ++++++++
 .../MethodOpDependencyMemberParser.java       |   3 +-
 .../struct/MethodParameterMemberParser.java   |   5 +-
 .../ops/struct/OpRetypingMemberParser.java    |   3 +-
 .../java/org/scijava/ops/struct/Structs.java  | 240 ------------------
 .../java/org/scijava/ops/util/Inject.java     |  28 +-
 .../org/scijava/ops/JavadocParameterTest.java |   7 -
 .../org/scijava/ops/OpCollectionTest.java     |   1 +
 .../src/main/java/module-info.java            |   1 +
 .../org/scijava}/struct/MemberParser.java     |   5 +-
 .../main/java/org/scijava/struct/Structs.java |  83 ++++++
 .../scijava/struct}/ValidityException.java    |   6 +-
 27 files changed, 261 insertions(+), 365 deletions(-)
 rename scijava/scijava-ops/src/main/java/org/scijava/ops/{core => }/ExceptionUtils.java (100%)
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/core/OpExecutionException.java
 create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FunctionalParameters.java
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-struct/src/main/java/org/scijava}/struct/MemberParser.java (84%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-struct/src/main/java/org/scijava/struct}/ValidityException.java (78%)

diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/core/ExceptionUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/ExceptionUtils.java
similarity index 100%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/core/ExceptionUtils.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/ExceptionUtils.java
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpExecutionException.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpExecutionException.java
index 7d9b07185..4bf163832 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpExecutionException.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpExecutionException.java
@@ -1,73 +1,9 @@
-/*
- * #%L
- * SciJava Operations: a framework for reusable algorithms.
- * %%
- * Copyright (C) 2018 SciJava developers.
- * %%
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * #L%
- */
-package org.scijava.ops;
+package org.scijava.ops.core;
 
-/**
- * Thrown to indicate that an Op failed in its execution
- * 
- * @author Gabriel Selzer
- *
- */
-public class OpExecutionException extends RuntimeException {
+public class OpExecutionException extends RuntimeException{
 
-	/**
-	 * Constructs a <code>OpExecutionException</code> with the specified reason for
-	 * failure.
-	 * 
-	 * @param s
-	 *            the reason for the failure
-	 */
-	public OpExecutionException(String s) {
-		super(s);
-	}
-
-	/**
-	 * Constructs a <code>OpExecutionException</code> with the specified cause.
-	 * 
-	 * @param cause
-	 *            the cause of the failure
-	 */
-	public OpExecutionException(Throwable cause) {
+	public OpExecutionException(Exception cause) {
 		super(cause);
 	}
 
-	/**
-	 * Constructs a <code>OpExecutionException</code> with the specified reason for
-	 * failure and cause.
-	 * 
-	 * @param message
-	 *            the reason for the failure
-	 * @param cause
-	 *            the cause of the failure
-	 */
-	public OpExecutionException(String message, Throwable cause) {
-		super(message, cause);
-	}
-
 }
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java
index 8ab8af11c..2d98589b4 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java
@@ -11,6 +11,7 @@
 import org.scijava.struct.Member;
 import org.scijava.struct.Struct;
 import org.scijava.struct.StructInstance;
+import org.scijava.struct.ValidityException;
 import org.scijava.util.MiscUtils;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
index 814603849..0eac98950 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
@@ -43,6 +43,7 @@
 import org.scijava.struct.MemberInstance;
 import org.scijava.struct.Struct;
 import org.scijava.struct.StructInstance;
+import org.scijava.struct.ValidityException;
 import org.scijava.struct.ValueAccessible;
 import org.scijava.types.Types;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/core/OpExecutionException.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/core/OpExecutionException.java
deleted file mode 100644
index 4bf163832..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/core/OpExecutionException.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.scijava.ops.core;
-
-public class OpExecutionException extends RuntimeException{
-
-	public OpExecutionException(Exception cause) {
-		super(cause);
-	}
-
-}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
index 528dc4645..5f0fc48b1 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
@@ -85,7 +85,7 @@
 import org.scijava.ops.matcher.impl.OpMethodInfo;
 import org.scijava.ops.provenance.OpHistoryService;
 import org.scijava.ops.simplify.SimplifiedOpInfo;
-import org.scijava.ops.struct.Structs;
+import org.scijava.ops.struct.FunctionalParameters;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.PluginInfo;
 import org.scijava.plugin.PluginService;
@@ -689,7 +689,7 @@ private OpRef inferOpRef(OpDependencyMember<?> dependency,
 	 */
 	private OpRef inferOpRef(Type type, String name, Map<TypeVariable<?>, Type> typeVarAssigns)
 			{
-		List<FunctionalMethodType> fmts = Structs.findFunctionalMethodTypes(type);
+		List<FunctionalMethodType> fmts = FunctionalParameters.findFunctionalMethodTypes(type);
 		if (fmts == null)
 			return null;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpAdaptationInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpAdaptationInfo.java
index 5d553eb3b..9fd622b1c 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpAdaptationInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpAdaptationInfo.java
@@ -15,15 +15,16 @@
 import org.scijava.ops.OpDependencyMember;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpUtils;
-import org.scijava.ops.ValidityException;
 import org.scijava.ops.hint.ImmutableHints;
 import org.scijava.ops.struct.OpRetypingMemberParser;
+import org.scijava.ops.struct.FunctionalParameters;
 import org.scijava.ops.struct.RetypingRequest;
-import org.scijava.ops.struct.Structs;
 import org.scijava.struct.FunctionalMethodType;
 import org.scijava.struct.ItemIO;
 import org.scijava.struct.Struct;
 import org.scijava.struct.StructInstance;
+import org.scijava.struct.Structs;
+import org.scijava.struct.ValidityException;
 
 /**
  * {@link OpInfo} for ops that have been adapted to some other Op type.
@@ -52,7 +53,7 @@ public OpAdaptationInfo(OpInfo srcInfo, Type type,
 		// not
 		// much for us to do here.
 		List<ValidityProblem> problems = new ArrayList<>();
-		List<FunctionalMethodType> fmts = Structs.findFunctionalMethodTypes(type);
+		List<FunctionalMethodType> fmts = FunctionalParameters.findFunctionalMethodTypes(type);
 		
 		RetypingRequest r = new RetypingRequest(srcInfo.struct(), fmts);
 		struct = Structs.from(r, problems, new OpRetypingMemberParser());
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpClassInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpClassInfo.java
index 7c81bfbc7..2fe4ada0f 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpClassInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpClassInfo.java
@@ -43,14 +43,14 @@
 import org.scijava.ops.OpHints;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpUtils;
-import org.scijava.ops.ValidityException;
 import org.scijava.ops.hint.ImmutableHints;
 import org.scijava.ops.struct.ClassOpDependencyMemberParser;
 import org.scijava.ops.struct.ClassParameterMemberParser;
-import org.scijava.ops.struct.Structs;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.Struct;
 import org.scijava.struct.StructInstance;
+import org.scijava.struct.Structs;
+import org.scijava.struct.ValidityException;
 import org.scijava.types.Types;
 
 /**
@@ -76,7 +76,6 @@ public OpClassInfo(final Class<?> opClass, final double priority) {
 		List<ValidityProblem> problems = new ArrayList<>();
 		try {
 			struct = Structs.from(opClass, problems, new ClassParameterMemberParser(), new ClassOpDependencyMemberParser());
-//			struct = ParameterStructs.structOf(opClass);
 			OpUtils.checkHasSingleOutput(struct);
 		} catch (ValidityException e) {
 			validityException = e;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpFieldInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpFieldInfo.java
index 6ac0a6915..7f172e28e 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpFieldInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpFieldInfo.java
@@ -43,12 +43,12 @@
 import org.scijava.ops.OpHints;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpUtils;
-import org.scijava.ops.ValidityException;
 import org.scijava.ops.hint.ImmutableHints;
 import org.scijava.ops.struct.FieldParameterMemberParser;
-import org.scijava.ops.struct.Structs;
 import org.scijava.struct.Struct;
 import org.scijava.struct.StructInstance;
+import org.scijava.struct.Structs;
+import org.scijava.struct.ValidityException;
 
 /**
  * Metadata about an op implementation defined as a field.
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java
index 55488ebe2..fa0a30b75 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java
@@ -51,16 +51,16 @@
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpMethod;
 import org.scijava.ops.OpUtils;
-import org.scijava.ops.ValidityException;
 import org.scijava.ops.hint.ImmutableHints;
 import org.scijava.ops.struct.MethodOpDependencyMemberParser;
 import org.scijava.ops.struct.MethodParameterMemberParser;
-import org.scijava.ops.struct.Structs;
 import org.scijava.ops.util.Adapt;
 import org.scijava.ops.util.OpMethodUtils;
 import org.scijava.struct.Member;
 import org.scijava.struct.Struct;
 import org.scijava.struct.StructInstance;
+import org.scijava.struct.Structs;
+import org.scijava.struct.ValidityException;
 import org.scijava.types.Types;
 import org.scijava.types.inference.InterfaceInference;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java
index 5d521b418..0f641263b 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java
@@ -24,7 +24,7 @@
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpRef;
-import org.scijava.ops.struct.Structs;
+import org.scijava.ops.OpUtils;
 import org.scijava.ops.util.AnnotationUtils;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
@@ -67,7 +67,7 @@ public static ParameterizedType retypeOpType(Type originalOpType, Type[] newArgs
 			if (!(originalOpType instanceof ParameterizedType))
 				throw new IllegalStateException("We hadn't thought about this yet.");
 			Class<?> opType = Types.raw(originalOpType);
-			Method fMethod = Structs.findFMethod(opType);
+			Method fMethod = OpUtils.findFunctionalMethod(opType);
 
 			Map<TypeVariable<?>, Type> typeVarAssigns = new HashMap<>();
 
@@ -127,7 +127,7 @@ private static Type[] typesFromOpType(Class<?> opType, Method fMethod, Type... t
 	 * @return the index of the mutable argument (or -1 iff the output is returned).
 	 */
 	public static int findMutableArgIndex(Class<?> c) {
-		Method fMethod = Structs.findFMethod(c);
+		Method fMethod = OpUtils.findFunctionalMethod(c);
 		for (int i = 0; i < fMethod.getParameterCount(); i++) {
 			if (AnnotationUtils.getMethodParameterAnnotation(fMethod, i,
 				Mutable.class) != null) return i;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java
index cf0f992e0..551522753 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java
@@ -1,16 +1,10 @@
 package org.scijava.ops.simplify;
 
-import com.google.common.collect.Streams;
-
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-import java.util.function.BiFunction;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.scijava.Priority;
 import org.scijava.ValidityProblem;
@@ -20,18 +14,18 @@
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpUtils;
-import org.scijava.ops.ValidityException;
 import org.scijava.ops.conversionLoss.LossReporter;
 import org.scijava.ops.hint.ImmutableHints;
 import org.scijava.ops.matcher.OpMatchingException;
 import org.scijava.ops.struct.OpRetypingMemberParser;
 import org.scijava.ops.struct.RetypingRequest;
-import org.scijava.ops.struct.Structs;
 import org.scijava.struct.FunctionalMethodType;
 import org.scijava.struct.ItemIO;
 import org.scijava.struct.Member;
 import org.scijava.struct.Struct;
 import org.scijava.struct.StructInstance;
+import org.scijava.struct.Structs;
+import org.scijava.struct.ValidityException;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
 import org.scijava.util.MiscUtils;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassOpDependencyMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassOpDependencyMemberParser.java
index 7ce8575bc..5301c8f29 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassOpDependencyMemberParser.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassOpDependencyMemberParser.java
@@ -9,7 +9,8 @@
 import org.scijava.ValidityProblem;
 import org.scijava.ops.FieldOpDependencyMember;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.ValidityException;
+import org.scijava.struct.MemberParser;
+import org.scijava.struct.ValidityException;
 import org.scijava.util.ClassUtils;
 
 public class ClassOpDependencyMemberParser implements
@@ -26,7 +27,7 @@ public List<FieldOpDependencyMember<?>> parse(Class<?> source)
 				final ArrayList<ValidityProblem> problems = new ArrayList<>();
 
 				// NB: Reject abstract classes.
-				Structs.checkModifiers(source.getName() + ": ", problems, source.getModifiers(), true, Modifier.ABSTRACT);
+				org.scijava.struct.Structs.checkModifiers(source.getName() + ": ", problems, source.getModifiers(), true, Modifier.ABSTRACT);
 
 				// Parse field level @OpDependency annotations.
 				parseFieldOpDependencies(items, problems, source);
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassParameterMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassParameterMemberParser.java
index c07433925..17316e50c 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassParameterMemberParser.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassParameterMemberParser.java
@@ -8,7 +8,8 @@
 import java.util.Set;
 
 import org.scijava.ValidityProblem;
-import org.scijava.ops.ValidityException;
+import org.scijava.struct.MemberParser;
+import org.scijava.struct.ValidityException;
 
 public class ClassParameterMemberParser implements
 	MemberParser<Class<?>, SynthesizedParameterMember<?>>
@@ -25,7 +26,7 @@ public List<SynthesizedParameterMember<?>> parse(Class<?> source)
 		final Set<String> names = new HashSet<>();
 
 		// NB: Reject abstract classes.
-		Structs.checkModifiers(source.getName() + ": ", problems, source.getModifiers(), true, Modifier.ABSTRACT);
+		org.scijava.struct.Structs.checkModifiers(source.getName() + ": ", problems, source.getModifiers(), true, Modifier.ABSTRACT);
 
 		// obtain a parameterData (preferably one that scrapes the javadoc)
 		ParameterData paramData;
@@ -35,7 +36,7 @@ public List<SynthesizedParameterMember<?>> parse(Class<?> source)
 			paramData = new SynthesizedParameterData();
 		}
 
-		Structs.parseFunctionalParameters(items, names, problems, source, paramData);
+		FunctionalParameters.parseFunctionalParameters(items, names, problems, source, paramData);
 
 		// Fail if there were any problems.
 		if (!problems.isEmpty()) throw new ValidityException(problems);
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FieldParameterMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FieldParameterMemberParser.java
index f4f20ddea..34e5b9285 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FieldParameterMemberParser.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FieldParameterMemberParser.java
@@ -10,7 +10,8 @@
 import java.util.Set;
 
 import org.scijava.ValidityProblem;
-import org.scijava.ops.ValidityException;
+import org.scijava.struct.MemberParser;
+import org.scijava.struct.ValidityException;
 import org.scijava.types.Types;
 
 public class FieldParameterMemberParser implements
@@ -38,9 +39,9 @@ public List<SynthesizedParameterMember<?>> parse(Field source)
 		final Set<String> names = new HashSet<>();
 		final Type fieldType = Types.fieldType(source, c);
 
-		Structs.checkModifiers(source.toString() + ": ", problems, source
+		org.scijava.struct.Structs.checkModifiers(source.toString() + ": ", problems, source
 			.getModifiers(), false, Modifier.FINAL);
-		Structs.parseFunctionalParameters(items, names, problems, fieldType,
+		FunctionalParameters.parseFunctionalParameters(items, names, problems, fieldType,
 			paramData);
 		// Fail if there were any problems.
 		if (!problems.isEmpty()) {
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FunctionalParameters.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FunctionalParameters.java
new file mode 100644
index 000000000..fe935a4e3
--- /dev/null
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FunctionalParameters.java
@@ -0,0 +1,104 @@
+package org.scijava.ops.struct;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.scijava.ValidityProblem;
+import org.scijava.function.Container;
+import org.scijava.function.Mutable;
+import org.scijava.ops.OpUtils;
+import org.scijava.ops.util.AnnotationUtils;
+import org.scijava.struct.FunctionalMethodType;
+import org.scijava.struct.ItemIO;
+import org.scijava.types.Types;
+
+public class FunctionalParameters {
+
+	public static void parseFunctionalParameters(
+		final ArrayList<SynthesizedParameterMember<?>> items, final Set<String> names,
+		final ArrayList<ValidityProblem> problems, Type type, ParameterData data)
+	{
+		// Search for the functional method of 'type' and map its signature to
+		// ItemIO
+		List<FunctionalMethodType> fmts;
+		try {
+			fmts = FunctionalParameters.findFunctionalMethodTypes(type);
+		}
+		catch (IllegalArgumentException e) {
+			problems.add(new ValidityProblem("Could not find functional method of " +
+				type.getTypeName()));
+			return;
+		}
+	
+		// Synthesize members
+		List<SynthesizedParameterMember<?>> fmtMembers = data.synthesizeMembers(fmts);
+	
+		for (SynthesizedParameterMember<?> m : fmtMembers) {
+			String key = m.getKey();
+			final Type itemType = m.getType();
+	
+			final boolean valid = org.scijava.struct.Structs.checkValidity(m, key, Types.raw(itemType), false,
+				names, problems);
+			if (!valid) continue;
+			items.add(m);
+			names.add(m.getKey());
+		}
+	}
+
+	/**
+	 * Returns a list of {@link FunctionalMethodType}s describing the input and
+	 * output types of the functional method of the specified functional type. In
+	 * doing so, the return type of the method will me marked as
+	 * {@link ItemIO#OUTPUT} and the all method parameters as
+	 * {@link ItemIO#OUTPUT}, except for parameters annotated with
+	 * {@link Container} or {@link Mutable} which will be marked as
+	 * {@link ItemIO#CONTAINER} or {@link ItemIO#MUTABLE} respectively. If the
+	 * specified type does not have a functional method in its hierarchy,
+	 * {@code null} will be returned.<br>
+	 * The order will be the following: method parameters from left to right, then
+	 * return type.
+	 * 
+	 * @param functionalType
+	 * @return
+	 */
+	public static List<FunctionalMethodType> findFunctionalMethodTypes(
+		Type functionalType)
+	{
+		Method functionalMethod = OpUtils.findFunctionalMethod(Types.raw(functionalType));
+		if (functionalMethod == null) throw new IllegalArgumentException("Type " +
+			functionalType +
+			" is not a functional type, thus its functional method types cannot be determined");
+	
+		Type paramfunctionalType = functionalType;
+		if (functionalType instanceof Class) {
+			paramfunctionalType = Types.parameterizeRaw((Class<?>) functionalType);
+		}
+	
+		List<FunctionalMethodType> out = new ArrayList<>();
+		int i = 0;
+		for (Type t : Types.getExactParameterTypes(functionalMethod,
+			paramfunctionalType))
+		{
+			final ItemIO ioType;
+			if (AnnotationUtils.getMethodParameterAnnotation(functionalMethod, i,
+				Container.class) != null) ioType = ItemIO.CONTAINER;
+			else if (AnnotationUtils.getMethodParameterAnnotation(functionalMethod, i,
+				Mutable.class) != null) ioType = ItemIO.MUTABLE;
+			else ioType = ItemIO.INPUT;
+			out.add(new FunctionalMethodType(t, ioType));
+			i++;
+		}
+	
+		Type returnType = Types.getExactReturnType(functionalMethod,
+			paramfunctionalType);
+		if (!returnType.equals(void.class)) {
+			out.add(new FunctionalMethodType(returnType, ItemIO.OUTPUT));
+		}
+	
+		return out;
+	}
+
+}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodOpDependencyMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodOpDependencyMemberParser.java
index 22a524b07..d1bf90435 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodOpDependencyMemberParser.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodOpDependencyMemberParser.java
@@ -10,7 +10,8 @@
 import org.scijava.ValidityProblem;
 import org.scijava.ops.MethodParameterOpDependencyMember;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.ValidityException;
+import org.scijava.struct.MemberParser;
+import org.scijava.struct.ValidityException;
 
 public class MethodOpDependencyMemberParser implements
 	MemberParser<Method, MethodParameterOpDependencyMember<?>>
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodParameterMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodParameterMemberParser.java
index ef6ce4f40..d35468537 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodParameterMemberParser.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodParameterMemberParser.java
@@ -10,8 +10,9 @@
 
 import org.scijava.ValidityProblem;
 import org.scijava.ops.OpMethod;
-import org.scijava.ops.ValidityException;
 import org.scijava.ops.util.OpMethodUtils;
+import org.scijava.struct.MemberParser;
+import org.scijava.struct.ValidityException;
 import org.scijava.types.Types;
 
 public class MethodParameterMemberParser implements
@@ -51,7 +52,7 @@ public List<SynthesizedParameterMember<?>> parse(Method source)
 		}
 
 		// Parse method level @Parameter annotations.
-		Structs.parseFunctionalParameters(items, names, problems, functionalType,
+		FunctionalParameters.parseFunctionalParameters(items, names, problems, functionalType,
 			paramData);
 
 		// Fail if there were any problems.
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/OpRetypingMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/OpRetypingMemberParser.java
index d9abf3635..2e31765eb 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/OpRetypingMemberParser.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/OpRetypingMemberParser.java
@@ -4,12 +4,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.scijava.ops.ValidityException;
 import org.scijava.ops.simplify.SimplifiedOpInfo;
 import org.scijava.struct.FunctionalMethodType;
 import org.scijava.struct.ItemIO;
 import org.scijava.struct.Member;
+import org.scijava.struct.MemberParser;
 import org.scijava.struct.Struct;
+import org.scijava.struct.ValidityException;
 
 public class OpRetypingMemberParser implements
 	MemberParser<RetypingRequest, Member<?>>
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java
deleted file mode 100644
index 4bd574bfe..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java
+++ /dev/null
@@ -1,240 +0,0 @@
-
-package org.scijava.ops.struct;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.scijava.ValidityProblem;
-import org.scijava.function.Container;
-import org.scijava.function.Mutable;
-import org.scijava.ops.OpUtils;
-import org.scijava.ops.ValidityException;
-import org.scijava.ops.util.AnnotationUtils;
-import org.scijava.struct.FunctionalMethodType;
-import org.scijava.struct.ItemIO;
-import org.scijava.struct.Member;
-import org.scijava.struct.Struct;
-import org.scijava.struct.StructInstance;
-import org.scijava.types.Types;
-import org.scijava.types.inference.InterfaceInference;
-
-public class Structs {
-
-	@SafeVarargs
-	public static <S> Struct from(S source, List<ValidityProblem> problems,
-		MemberParser<S, ? extends Member<?>>... parsers)
-	{
-		List<Member<?>> members = new ArrayList<>();
-		for (MemberParser<S, ? extends Member<?>> p : parsers) {
-			try {
-				members.addAll(p.parse(source));
-			}
-			catch (ValidityException e) {
-				problems.addAll(e.problems());
-			}
-		}
-		return () -> members;
-	}
-
-	/**
-	 * Helper to check for several modifiers at once.
-	 * 
-	 * @param message
-	 * @param problems
-	 * @param actualModifiers
-	 * @param requiredModifiers
-	 */
-	public static void checkModifiers(String message, final ArrayList<ValidityProblem> problems,
-			final int actualModifiers, final boolean negate, final int... requiredModifiers) {
-		for (int mod : requiredModifiers) {
-			if (negate) {
-				if ((actualModifiers & mod) != 0) {
-					problems.add(
-							new ValidityProblem(message + "Illegal modifier. Must not be " + Modifier.toString(mod)));
-				}
-			} else {
-				if ((actualModifiers & mod) == 0) {
-					problems.add(new ValidityProblem(message + "Illegal modifier. Must be " + Modifier.toString(mod)));
-				}
-			}
-		}
-	}
-
-	public static void parseFunctionalParameters(
-		final ArrayList<SynthesizedParameterMember<?>> items, final Set<String> names,
-		final ArrayList<ValidityProblem> problems, Type type, ParameterData data)
-	{
-		// Search for the functional method of 'type' and map its signature to
-		// ItemIO
-		List<FunctionalMethodType> fmts;
-		try {
-			fmts = findFunctionalMethodTypes(type);
-		}
-		catch (IllegalArgumentException e) {
-			problems.add(new ValidityProblem("Could not find functional method of " +
-				type.getTypeName()));
-			return;
-		}
-
-		// Synthesize members
-		List<SynthesizedParameterMember<?>> fmtMembers = data.synthesizeMembers(fmts);
-
-		for (SynthesizedParameterMember<?> m : fmtMembers) {
-			String key = m.getKey();
-			final Type itemType = m.getType();
-
-			final boolean valid = checkValidity(m, key, Types.raw(itemType), false,
-				names, problems);
-			if (!valid) continue;
-			items.add(m);
-			names.add(m.getKey());
-		}
-	}
-
-	/**
-	 * Returns a list of {@link FunctionalMethodType}s describing the input and
-	 * output types of the functional method of the specified functional type. In
-	 * doing so, the return type of the method will me marked as
-	 * {@link ItemIO#OUTPUT} and the all method parameters as
-	 * {@link ItemIO#OUTPUT}, except for parameters annotated with
-	 * {@link Container} or {@link Mutable} which will be marked as
-	 * {@link ItemIO#CONTAINER} or {@link ItemIO#MUTABLE} respectively. If the
-	 * specified type does not have a functional method in its hierarchy,
-	 * {@code null} will be returned.<br>
-	 * The order will be the following: method parameters from left to right, then
-	 * return type.
-	 * 
-	 * @param functionalType
-	 * @return
-	 */
-	public static List<FunctionalMethodType> findFunctionalMethodTypes(
-		Type functionalType)
-	{
-		Method functionalMethod = findFunctionalMethod(Types.raw(functionalType));
-		if (functionalMethod == null) throw new IllegalArgumentException("Type " +
-			functionalType +
-			" is not a functional type, thus its functional method types cannot be determined");
-
-		Type paramfunctionalType = functionalType;
-		if (functionalType instanceof Class) {
-			paramfunctionalType = Types.parameterizeRaw((Class<?>) functionalType);
-		}
-
-		List<FunctionalMethodType> out = new ArrayList<>();
-		int i = 0;
-		for (Type t : Types.getExactParameterTypes(functionalMethod,
-			paramfunctionalType))
-		{
-			final ItemIO ioType;
-			if (AnnotationUtils.getMethodParameterAnnotation(functionalMethod, i,
-				Container.class) != null) ioType = ItemIO.CONTAINER;
-			else if (AnnotationUtils.getMethodParameterAnnotation(functionalMethod, i,
-				Mutable.class) != null) ioType = ItemIO.MUTABLE;
-			else ioType = ItemIO.INPUT;
-			out.add(new FunctionalMethodType(t, ioType));
-			i++;
-		}
-
-		Type returnType = Types.getExactReturnType(functionalMethod,
-			paramfunctionalType);
-		if (!returnType.equals(void.class)) {
-			out.add(new FunctionalMethodType(returnType, ItemIO.OUTPUT));
-		}
-
-		return out;
-	}
-
-	/**
-	 * Attempts to find the single functional method of the specified class, by
-	 * scanning the for functional interfaces. If there is no functional
-	 * interface, null will be returned.
-	 * 
-	 * @param cls
-	 * @return
-	 */
-	private static Method findFunctionalMethod(Class<?> cls) {
-		Class<?> iFace = OpUtils.findFunctionalInterface(cls);
-		if (iFace == null) {
-			return null;
-		}
-
-		List<Method> nonDefaults = Arrays.stream(iFace.getMethods()).filter(m -> !m
-			.isDefault()).collect(Collectors.toList());
-
-		// The single non default method must be the functional one
-		if (nonDefaults.size() != 1) {
-			for (Class<?> i : iFace.getInterfaces()) {
-				final Method result = findFunctionalMethod(i);
-				if (result != null) return result;
-			}
-		}
-
-		return nonDefaults.get(0);
-	}
-
-	private static boolean checkValidity(Member<?> m, String name, Class<?> type,
-		boolean isFinal, Set<String> names, ArrayList<ValidityProblem> problems)
-	{
-		boolean valid = true;
-
-		if (names.contains(name)) {
-			// NB: Shadowed parameters are bad because they are ambiguous.
-			final String error = "Invalid duplicate parameter: " + name;
-			problems.add(new ValidityProblem(error));
-			valid = false;
-		}
-
-		if ((m.getIOType() == ItemIO.MUTABLE || m
-			.getIOType() == ItemIO.CONTAINER) && isImmutable(type))
-		{
-			// NB: The MUTABLE and CONTAINER types signify that the parameter
-			// will be written to, but immutable parameters cannot be changed in
-			// such a manner, so it makes no sense to label them as such.
-			final String error = "Immutable " + m.getIOType() + " parameter: " +
-				name + " (" + type.getName() + " is immutable)";
-			problems.add(new ValidityProblem(error));
-			valid = false;
-		}
-
-		return valid;
-	}
-
-	private static boolean isImmutable(final Class<?> type) {
-		// NB: All eight primitive types, as well as the boxed primitive
-		// wrapper classes, as well as strings, are immutable objects.
-		return Types.isNumber(type) || Types.isText(type) || //
-			Types.isBoolean(type);
-	}
-
-	/**
-	 * Convenience method to call
-	 * {@link Structs#from(Object, List, MemberParser...)} dot
-	 * {@link Struct#createInstance(Object)}
-	 * 
-	 * @param object the {@link Object} from which the {@link StructInstance} is
-	 *          created.
-	 * @return an instance of the {@link Struct} created from {@code object}
-	 * @throws ValidityException
-	 */
-	public static <C> StructInstance<C> create(final C object)
-		throws ValidityException
-	{
-		Struct s = from(object.getClass(), new ArrayList<>(),
-			new ClassParameterMemberParser(), new ClassOpDependencyMemberParser());
-		return s.createInstance(object);
-	}
-
-	// TODO: extract this method to a more general utility class
-	public static Method findFMethod(Class<?> c) {
-			Class<?> fIface = OpUtils.findFunctionalInterface(c);
-			if(fIface == null) throw new IllegalArgumentException("Class " + c +" does not implement a functional interface!");
-			return InterfaceInference.singularAbstractMethod(fIface);
-	}
-
-}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Inject.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Inject.java
index 4a381e13a..cb26fdaf4 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Inject.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Inject.java
@@ -1,5 +1,6 @@
 package org.scijava.ops.util;
 
+import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.function.Predicate;
@@ -7,8 +8,10 @@
 
 import org.scijava.command.Command;
 import org.scijava.ops.OpDependencyMember;
-import org.scijava.ops.ValidityException;
+import org.scijava.ops.struct.ClassOpDependencyMemberParser;
+import org.scijava.ops.struct.ClassParameterMemberParser;
 import org.scijava.struct.ItemIO;
+import org.scijava.struct.Struct;
 import org.scijava.struct.StructInstance;
 import org.scijava.struct.ValueAccessibleMemberInstance;
 
@@ -79,4 +82,27 @@ private static List<ValueAccessibleMemberInstance<?>> filterAccessibles(
 		}
 	}
 
+	public static class Commands {
+		private Commands() {
+		}
+
+		public static void inputs(Command command, Object... objs) {
+			Structs.inputs(commandToStructInstance(command), objs);
+		}
+
+		public static void outputs(Command command, Object... objs) {
+			Structs.outputs(commandToStructInstance(command), objs);
+		}
+
+		public static void all(Command command, Object... objs) {
+			Structs.all(commandToStructInstance(command), objs);
+		}
+
+		public static StructInstance<Command> commandToStructInstance(Command command) {
+			Struct s = org.scijava.struct.Structs.from(command.getClass(),
+				new ArrayList<>(), new ClassParameterMemberParser(),
+				new ClassOpDependencyMemberParser());
+			return s.createInstance(command);
+		}
+	}
 }
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java
index c75e35748..8069d0489 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java
@@ -15,13 +15,6 @@
 import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.Op;
-import org.scijava.ops.OpCollection;
-import org.scijava.ops.OpDependency;
-import org.scijava.ops.OpField;
-import org.scijava.ops.OpInfo;
-import org.scijava.ops.OpMethod;
-import org.scijava.ops.OpUtils;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCollectionTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCollectionTest.java
index a74f3848d..78ba809d6 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCollectionTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCollectionTest.java
@@ -32,6 +32,7 @@
 import java.util.function.BiFunction;
 
 import org.junit.Test;
+import org.scijava.struct.ValidityException;
 import org.scijava.types.Nil;
 
 public class OpCollectionTest extends AbstractTestEnvironment {
diff --git a/scijava/scijava-struct/src/main/java/module-info.java b/scijava/scijava-struct/src/main/java/module-info.java
index 6eec255f9..aee8a31c1 100644
--- a/scijava/scijava-struct/src/main/java/module-info.java
+++ b/scijava/scijava-struct/src/main/java/module-info.java
@@ -3,4 +3,5 @@
 	exports org.scijava.struct;
 
 	requires org.scijava.types;
+	requires org.scijava;
 }
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MemberParser.java b/scijava/scijava-struct/src/main/java/org/scijava/struct/MemberParser.java
similarity index 84%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MemberParser.java
rename to scijava/scijava-struct/src/main/java/org/scijava/struct/MemberParser.java
index 860c41a16..0afbb6ecc 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MemberParser.java
+++ b/scijava/scijava-struct/src/main/java/org/scijava/struct/MemberParser.java
@@ -1,12 +1,9 @@
 
-package org.scijava.ops.struct;
+package org.scijava.struct;
 
 import java.lang.reflect.Type;
 import java.util.List;
 
-import org.scijava.ops.ValidityException;
-import org.scijava.struct.Member;
-
 /**
  * Parses a set of {@link Member}s from a source {@link Object}
  * 
diff --git a/scijava/scijava-struct/src/main/java/org/scijava/struct/Structs.java b/scijava/scijava-struct/src/main/java/org/scijava/struct/Structs.java
index ce65d4171..87797093a 100644
--- a/scijava/scijava-struct/src/main/java/org/scijava/struct/Structs.java
+++ b/scijava/scijava-struct/src/main/java/org/scijava/struct/Structs.java
@@ -1,6 +1,14 @@
 
 package org.scijava.struct;
 
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.scijava.ValidityProblem;
+import org.scijava.types.Types;
+
 public final class Structs {
 
 	private Structs() {
@@ -20,4 +28,79 @@ public static <T> StructInstance<T> expand(
 		return memberInstance.member().childStruct().createInstance(//
 			memberInstance.get());
 	}
+
+	@SafeVarargs
+	public static <S> Struct from(S source, List<ValidityProblem> problems,
+		MemberParser<S, ? extends Member<?>>... parsers)
+	{
+		List<Member<?>> members = new ArrayList<>();
+		for (MemberParser<S, ? extends Member<?>> p : parsers) {
+			try {
+				members.addAll(p.parse(source));
+			}
+			catch (ValidityException e) {
+				problems.addAll(e.problems());
+			}
+		}
+		return () -> members;
+	}
+
+	/**
+	 * Helper to check for several modifiers at once.
+	 * 
+	 * @param message
+	 * @param problems
+	 * @param actualModifiers
+	 * @param requiredModifiers
+	 */
+	public static void checkModifiers(String message, final ArrayList<ValidityProblem> problems,
+			final int actualModifiers, final boolean negate, final int... requiredModifiers) {
+		for (int mod : requiredModifiers) {
+			if (negate) {
+				if ((actualModifiers & mod) != 0) {
+					problems.add(
+							new ValidityProblem(message + "Illegal modifier. Must not be " + Modifier.toString(mod)));
+				}
+			} else {
+				if ((actualModifiers & mod) == 0) {
+					problems.add(new ValidityProblem(message + "Illegal modifier. Must be " + Modifier.toString(mod)));
+				}
+			}
+		}
+	}
+
+	public static boolean checkValidity(Member<?> m, String name, Class<?> type,
+		boolean isFinal, Set<String> names, ArrayList<ValidityProblem> problems)
+	{
+		boolean valid = true;
+	
+		if (names.contains(name)) {
+			// NB: Shadowed parameters are bad because they are ambiguous.
+			final String error = "Invalid duplicate parameter: " + name;
+			problems.add(new ValidityProblem(error));
+			valid = false;
+		}
+	
+		if ((m.getIOType() == ItemIO.MUTABLE || m
+			.getIOType() == ItemIO.CONTAINER) && Structs.isImmutable(type))
+		{
+			// NB: The MUTABLE and CONTAINER types signify that the parameter
+			// will be written to, but immutable parameters cannot be changed in
+			// such a manner, so it makes no sense to label them as such.
+			final String error = "Immutable " + m.getIOType() + " parameter: " +
+				name + " (" + type.getName() + " is immutable)";
+			problems.add(new ValidityProblem(error));
+			valid = false;
+		}
+	
+		return valid;
+	}
+
+	public static boolean isImmutable(final Class<?> type) {
+		// NB: All eight primitive types, as well as the boxed primitive
+		// wrapper classes, as well as strings, are immutable objects.
+		return Types.isNumber(type) || Types.isText(type) || //
+			Types.isBoolean(type);
+	}
+
 }
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/ValidityException.java b/scijava/scijava-struct/src/main/java/org/scijava/struct/ValidityException.java
similarity index 78%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/ValidityException.java
rename to scijava/scijava-struct/src/main/java/org/scijava/struct/ValidityException.java
index 35f2079c9..e19f8e9d5 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/ValidityException.java
+++ b/scijava/scijava-struct/src/main/java/org/scijava/struct/ValidityException.java
@@ -1,4 +1,4 @@
-package org.scijava.ops;
+package org.scijava.struct;
 
 import java.util.Collections;
 import java.util.List;
@@ -8,6 +8,7 @@
 /**
  * hasdjf
  *
+ * TODO: move upstream with {@link ValidityProblem} 
  * @author Curtis Rueden
  */
 public final class ValidityException extends Exception {
@@ -18,10 +19,11 @@ public ValidityException(final String message) {
 		this(Collections.singletonList(new ValidityProblem(message)));
 	}
 
-	public ValidityException(final List<ValidityProblem> problems) {
+	public ValidityException(@SuppressWarnings("exports") final List<ValidityProblem> problems) {
 		this.problems = problems;
 	}
 
+	@SuppressWarnings("exports")
 	public List<ValidityProblem> problems() {
 		return problems;
 	}

From e150cc02592fc38e7938bc7c655edc629cdc3313 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 2 Jul 2021 15:16:56 -0500
Subject: [PATCH 64/91] WIP: Fix ExceptionUtils

---
 .../ops2/morphology/DistanceTransforms.java   |  2 +-
 .../src/main/java/module-info.java            |  1 -
 .../java/org/scijava/ops/ExceptionUtils.java  |  2 +-
 .../org/scijava/ops/OpExecutionException.java | 66 ++++++++++++++++++-
 .../java/org/scijava/ops/util/Inject.java     | 23 -------
 5 files changed, 65 insertions(+), 29 deletions(-)

diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java
index e84c47632..551eb3eb4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java
@@ -10,9 +10,9 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
+import org.scijava.ops.ExceptionUtils;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
-import org.scijava.ops.core.ExceptionUtils;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/main/java/module-info.java b/scijava/scijava-ops/src/main/java/module-info.java
index 25271150b..21ced234b 100644
--- a/scijava/scijava-ops/src/main/java/module-info.java
+++ b/scijava/scijava-ops/src/main/java/module-info.java
@@ -34,7 +34,6 @@
 	opens org.scijava.ops.struct to therapi.runtime.javadoc;
 	opens org.scijava.ops.simplify to therapi.runtime.javadoc;
 	opens org.scijava.ops.stats to therapi.runtime.javadoc;
-	opens org.scijava.ops.core to therapi.runtime.javadoc;
 	opens org.scijava.ops.provenance.impl to therapi.runtime.javadoc, org.scijava;
 
 	// FIXME: This is a file name and is thus unstable
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/ExceptionUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/ExceptionUtils.java
index f19da7477..6c9aa34af 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/ExceptionUtils.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/ExceptionUtils.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.core;
+package org.scijava.ops;
 
 public class ExceptionUtils {
 	// For void methods
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpExecutionException.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpExecutionException.java
index 4bf163832..509bb0dbc 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpExecutionException.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpExecutionException.java
@@ -1,9 +1,69 @@
-package org.scijava.ops.core;
+/*
+ * #%L
+ * SciJava Operations: a framework for reusable algorithms.
+ * %%
+ * Copyright (C) 2018 SciJava developers.
+ * %%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
 
-public class OpExecutionException extends RuntimeException{
+package org.scijava.ops;
 
-	public OpExecutionException(Exception cause) {
+/**
+ * Thrown to indicate that an Op failed in its execution
+ * 
+ * @author Gabriel Selzer
+ */
+public class OpExecutionException extends RuntimeException {
+
+	/**
+	 * Constructs a <code>OpExecutionException</code> with the specified reason
+	 * for failure.
+	 * 
+	 * @param s the reason for the failure
+	 */
+	public OpExecutionException(String s) {
+		super(s);
+	}
+
+	/**
+	 * Constructs a <code>OpExecutionException</code> with the specified cause.
+	 * 
+	 * @param cause the cause of the failure
+	 */
+	public OpExecutionException(Throwable cause) {
 		super(cause);
 	}
 
+	/**
+	 * Constructs a <code>OpExecutionException</code> with the specified reason
+	 * for failure and cause.
+	 * 
+	 * @param message the reason for the failure
+	 * @param cause the cause of the failure
+	 */
+	public OpExecutionException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
 }
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Inject.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Inject.java
index cb26fdaf4..5fa1f2504 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Inject.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Inject.java
@@ -82,27 +82,4 @@ private static List<ValueAccessibleMemberInstance<?>> filterAccessibles(
 		}
 	}
 
-	public static class Commands {
-		private Commands() {
-		}
-
-		public static void inputs(Command command, Object... objs) {
-			Structs.inputs(commandToStructInstance(command), objs);
-		}
-
-		public static void outputs(Command command, Object... objs) {
-			Structs.outputs(commandToStructInstance(command), objs);
-		}
-
-		public static void all(Command command, Object... objs) {
-			Structs.all(commandToStructInstance(command), objs);
-		}
-
-		public static StructInstance<Command> commandToStructInstance(Command command) {
-			Struct s = org.scijava.struct.Structs.from(command.getClass(),
-				new ArrayList<>(), new ClassParameterMemberParser(),
-				new ClassOpDependencyMemberParser());
-			return s.createInstance(command);
-		}
-	}
 }

From 02bec4daafa8fe013d0215ca4b6f2aad3a3f1877 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 2 Jul 2021 15:46:40 -0500
Subject: [PATCH 65/91] Resolve package cycle: geom tests

---
 .../net/imagej/ops2/geom/{ => geom2d}/PolygonFeatureTests.java | 3 ++-
 .../net/imagej/ops2/geom/{ => geom3d}/MeshFeatureTests.java    | 2 +-
 .../net/imagej/ops2/geom/{ => geom3d}/QuickHull3DTest.java     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/{ => geom2d}/PolygonFeatureTests.java (99%)
 rename imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/{ => geom3d}/MeshFeatureTests.java (99%)
 rename imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/{ => geom3d}/QuickHull3DTest.java (99%)

diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/PolygonFeatureTests.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/geom2d/PolygonFeatureTests.java
similarity index 99%
rename from imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/PolygonFeatureTests.java
rename to imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/geom2d/PolygonFeatureTests.java
index e888c9a4e..6831ec645 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/PolygonFeatureTests.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/geom2d/PolygonFeatureTests.java
@@ -26,13 +26,14 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
-package net.imagej.ops2.geom;
+package net.imagej.ops2.geom.geom2d;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.List;
 
 import net.imagej.ops2.features.AbstractFeatureTest;
+import net.imagej.ops2.geom.GeomUtils;
 import net.imagej.ops2.geom.geom2d.LabelRegionToPolygonConverter;
 import net.imglib2.RealLocalizable;
 import net.imglib2.RealPoint;
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/MeshFeatureTests.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/geom3d/MeshFeatureTests.java
similarity index 99%
rename from imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/MeshFeatureTests.java
rename to imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/geom3d/MeshFeatureTests.java
index 9b9123fab..90a0ea93f 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/MeshFeatureTests.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/geom3d/MeshFeatureTests.java
@@ -26,7 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
-package net.imagej.ops2.geom;
+package net.imagej.ops2.geom.geom3d;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/QuickHull3DTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/geom3d/QuickHull3DTest.java
similarity index 99%
rename from imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/QuickHull3DTest.java
rename to imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/geom3d/QuickHull3DTest.java
index 566f23c79..1b2367345 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/QuickHull3DTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/geom3d/QuickHull3DTest.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package net.imagej.ops2.geom;
+package net.imagej.ops2.geom.geom3d;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;

From 04d42865755c51aea05c19bd8d02825a9ac06c44 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 2 Jul 2021 15:51:32 -0500
Subject: [PATCH 66/91] Fix package cycle: Persist tests

---
 .../java/org/scijava/persist/{testobjects => }/Circle.java | 2 +-
 .../scijava/persist/{testobjects => }/CircleAdapter.java   | 2 +-
 .../test/java/org/scijava/persist/SerializationTests.java  | 7 ++-----
 .../src/test/java/org/scijava/persist/Shape.java           | 4 ++++
 .../java/org/scijava/persist/{testobjects => }/Shapes.java | 2 +-
 .../test/java/org/scijava/persist/testobjects/Shape.java   | 4 ----
 6 files changed, 9 insertions(+), 12 deletions(-)
 rename scijava/scijava-persist/src/test/java/org/scijava/persist/{testobjects => }/Circle.java (58%)
 rename scijava/scijava-persist/src/test/java/org/scijava/persist/{testobjects => }/CircleAdapter.java (90%)
 create mode 100644 scijava/scijava-persist/src/test/java/org/scijava/persist/Shape.java
 rename scijava/scijava-persist/src/test/java/org/scijava/persist/{testobjects => }/Shapes.java (96%)
 delete mode 100644 scijava/scijava-persist/src/test/java/org/scijava/persist/testobjects/Shape.java

diff --git a/scijava/scijava-persist/src/test/java/org/scijava/persist/testobjects/Circle.java b/scijava/scijava-persist/src/test/java/org/scijava/persist/Circle.java
similarity index 58%
rename from scijava/scijava-persist/src/test/java/org/scijava/persist/testobjects/Circle.java
rename to scijava/scijava-persist/src/test/java/org/scijava/persist/Circle.java
index 862fc599d..b7e9735ba 100644
--- a/scijava/scijava-persist/src/test/java/org/scijava/persist/testobjects/Circle.java
+++ b/scijava/scijava-persist/src/test/java/org/scijava/persist/Circle.java
@@ -1,5 +1,5 @@
 
-package org.scijava.persist.testobjects;
+package org.scijava.persist;
 
 public class Circle implements Shape {
 
diff --git a/scijava/scijava-persist/src/test/java/org/scijava/persist/testobjects/CircleAdapter.java b/scijava/scijava-persist/src/test/java/org/scijava/persist/CircleAdapter.java
similarity index 90%
rename from scijava/scijava-persist/src/test/java/org/scijava/persist/testobjects/CircleAdapter.java
rename to scijava/scijava-persist/src/test/java/org/scijava/persist/CircleAdapter.java
index 8eebecb2e..cb31e4722 100644
--- a/scijava/scijava-persist/src/test/java/org/scijava/persist/testobjects/CircleAdapter.java
+++ b/scijava/scijava-persist/src/test/java/org/scijava/persist/CircleAdapter.java
@@ -1,5 +1,5 @@
 
-package org.scijava.persist.testobjects;
+package org.scijava.persist;
 
 import org.scijava.persist.IClassRuntimeAdapter;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-persist/src/test/java/org/scijava/persist/SerializationTests.java b/scijava/scijava-persist/src/test/java/org/scijava/persist/SerializationTests.java
index ce9e95137..db89d6aa2 100644
--- a/scijava/scijava-persist/src/test/java/org/scijava/persist/SerializationTests.java
+++ b/scijava/scijava-persist/src/test/java/org/scijava/persist/SerializationTests.java
@@ -7,9 +7,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.scijava.Context;
-import org.scijava.persist.testobjects.Circle;
-import org.scijava.persist.testobjects.Shape;
-import org.scijava.persist.testobjects.Shapes;
 
 public class SerializationTests {
 
@@ -43,7 +40,7 @@ public void closeFiji() throws Exception {
 	}
 
 	/**
-	 * Test {@link org.scijava.persist.testobjects.CircleAdapter}
+	 * Test {@link org.scijava.persist.CircleAdapter}
 	 */
 	@Test
 	public void testCircleObject() {
@@ -52,7 +49,7 @@ public void testCircleObject() {
 	}
 
 	/**
-	 * Test adapters located in {@link org.scijava.persist.testobjects.Shapes}
+	 * Test adapters located in {@link org.scijava.persist.Shapes}
 	 */
 	@Test
 	public void testDrawingObject() {
diff --git a/scijava/scijava-persist/src/test/java/org/scijava/persist/Shape.java b/scijava/scijava-persist/src/test/java/org/scijava/persist/Shape.java
new file mode 100644
index 000000000..d65f73755
--- /dev/null
+++ b/scijava/scijava-persist/src/test/java/org/scijava/persist/Shape.java
@@ -0,0 +1,4 @@
+
+package org.scijava.persist;
+
+public interface Shape {}
diff --git a/scijava/scijava-persist/src/test/java/org/scijava/persist/testobjects/Shapes.java b/scijava/scijava-persist/src/test/java/org/scijava/persist/Shapes.java
similarity index 96%
rename from scijava/scijava-persist/src/test/java/org/scijava/persist/testobjects/Shapes.java
rename to scijava/scijava-persist/src/test/java/org/scijava/persist/Shapes.java
index 3e45b8eed..d222cc4ed 100644
--- a/scijava/scijava-persist/src/test/java/org/scijava/persist/testobjects/Shapes.java
+++ b/scijava/scijava-persist/src/test/java/org/scijava/persist/Shapes.java
@@ -1,5 +1,5 @@
 
-package org.scijava.persist.testobjects;
+package org.scijava.persist;
 
 import org.scijava.persist.IClassRuntimeAdapter;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-persist/src/test/java/org/scijava/persist/testobjects/Shape.java b/scijava/scijava-persist/src/test/java/org/scijava/persist/testobjects/Shape.java
deleted file mode 100644
index fda4e4d18..000000000
--- a/scijava/scijava-persist/src/test/java/org/scijava/persist/testobjects/Shape.java
+++ /dev/null
@@ -1,4 +0,0 @@
-
-package org.scijava.persist.testobjects;
-
-public interface Shape {}

From a9f1dd1b1813eb2d29d27b919092f92d1fc042f3 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Mon, 12 Jul 2021 16:00:07 -0500
Subject: [PATCH 67/91] WIP: Use scijava-packages-plugin

NOTE: This commit forward requires the usage of scijava-packages-plugin
(https://github.com/scijava/scijava-packages-plugin). Since no release
has yet been made for this plugin, you must download and build this
repository to use the plugin (and thus build from this commit forward)
---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 86e1fbcd9..3cad076ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,9 +125,9 @@
 				<artifactId>maven-enforcer-plugin</artifactId>
 				<dependencies>
 					<dependency>
-						<groupId>de.andrena.tools.nopackagecycles</groupId>
-						<artifactId>no-package-cycles-enforcer-rule</artifactId>
-						<version>1.0.9</version>
+						<groupId>org.scijava</groupId>
+						<artifactId>scijava-packages-rules</artifactId>
+						<version>0-SNAPSHOT</version>
 					</dependency>
 				</dependencies>
 				<executions>
@@ -140,7 +140,7 @@
 						<configuration>
 							<rules>
 								<NoPackageCyclesRule
-									implementation="de.andrena.tools.nopackagecycles.NoPackageCyclesRule" />
+									implementation="org.scijava.packages.rules.NoPackageCyclesRule" />
 							</rules>
 						</configuration>
 					</execution>

From 4919ffad5fa346c55d82df064286fff6187c0b4d Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Tue, 13 Jul 2021 14:05:57 -0500
Subject: [PATCH 68/91] Consolidate create packages

The current situation is untenable since Creators depends on the
net.imagej.ops2.create.kernel and net.imagej.ops2.create.img packages.
Ideally, we'd split out the image- and kernel create Ops into their own
packages like we had, but the kernel and image creator Op fields rely on
the (non-static) Op fields in the main package. Therefore if we moved
these Ops to the subpackages, we would have to duplicate code. To
prevent this duplication, we shall just consolidate to one package.
---
 imagej/imagej-ops2/src/main/java/module-info.java         | 2 --
 .../src/main/java/net/imagej/ops2/create/Creators.java    | 8 --------
 .../{kernel => }/DefaultCreateKernel2ndDerivBiGauss.java  | 2 +-
 .../create/{kernel => }/DefaultCreateKernelBiGauss.java   | 2 +-
 .../create/{kernel => }/DefaultCreateKernelGabor.java     | 2 +-
 .../create/{kernel => }/DefaultCreateKernelGauss.java     | 2 +-
 .../{kernel => }/DefaultCreateKernelGibsonLanni.java      | 2 +-
 .../ops2/create/{kernel => }/DefaultCreateKernelLog.java  | 2 +-
 .../create/{kernel => }/DefaultCreateKernelSobel.java     | 2 +-
 .../main/java/net/imagej/ops2/create/{img => }/Imgs.java  | 2 +-
 .../net/imagej/ops2/create/CreateKernelGaborTest.java     | 1 -
 11 files changed, 8 insertions(+), 19 deletions(-)
 rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/{kernel => }/DefaultCreateKernel2ndDerivBiGauss.java (99%)
 rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/{kernel => }/DefaultCreateKernelBiGauss.java (99%)
 rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/{kernel => }/DefaultCreateKernelGabor.java (99%)
 rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/{kernel => }/DefaultCreateKernelGauss.java (98%)
 rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/{kernel => }/DefaultCreateKernelGibsonLanni.java (99%)
 rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/{kernel => }/DefaultCreateKernelLog.java (99%)
 rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/{kernel => }/DefaultCreateKernelSobel.java (98%)
 rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/{img => }/Imgs.java (99%)

diff --git a/imagej/imagej-ops2/src/main/java/module-info.java b/imagej/imagej-ops2/src/main/java/module-info.java
index be89169af..81080025d 100644
--- a/imagej/imagej-ops2/src/main/java/module-info.java
+++ b/imagej/imagej-ops2/src/main/java/module-info.java
@@ -13,8 +13,6 @@
 	opens net.imagej.ops2.convert.copy to org.scijava, org.scijava.ops;
 	opens net.imagej.ops2.copy to org.scijava, org.scijava.ops;
 	opens net.imagej.ops2.create to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.create.img to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.create.kernel to org.scijava, org.scijava.ops;
 	opens net.imagej.ops2.deconvolve to org.scijava, org.scijava.ops;
 	opens net.imagej.ops2.deconvolve.accelerate to org.scijava, org.scijava.ops;
 	opens net.imagej.ops2.eval to org.scijava, org.scijava.ops;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java
index 127a95d60..726d634a2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java
@@ -6,14 +6,6 @@
 
 import net.imagej.ImgPlus;
 import net.imagej.ImgPlusMetadata;
-import net.imagej.ops2.create.img.Imgs;
-import net.imagej.ops2.create.kernel.DefaultCreateKernel2ndDerivBiGauss;
-import net.imagej.ops2.create.kernel.DefaultCreateKernelBiGauss;
-import net.imagej.ops2.create.kernel.DefaultCreateKernelGabor;
-import net.imagej.ops2.create.kernel.DefaultCreateKernelGauss;
-import net.imagej.ops2.create.kernel.DefaultCreateKernelGibsonLanni;
-import net.imagej.ops2.create.kernel.DefaultCreateKernelLog;
-import net.imagej.ops2.create.kernel.DefaultCreateKernelSobel;
 import net.imglib2.Cursor;
 import net.imglib2.Dimensions;
 import net.imglib2.FinalDimensions;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernel2ndDerivBiGauss.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernel2ndDerivBiGauss.java
similarity index 99%
rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernel2ndDerivBiGauss.java
rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernel2ndDerivBiGauss.java
index e34a382e5..64333421a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernel2ndDerivBiGauss.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernel2ndDerivBiGauss.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package net.imagej.ops2.create.kernel;
+package net.imagej.ops2.create;
 
 import java.util.function.BiFunction;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelBiGauss.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelBiGauss.java
similarity index 99%
rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelBiGauss.java
rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelBiGauss.java
index f78a025b5..671cfdc39 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelBiGauss.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelBiGauss.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package net.imagej.ops2.create.kernel;
+package net.imagej.ops2.create;
 
 import java.util.function.BiFunction;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelGabor.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelGabor.java
similarity index 99%
rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelGabor.java
rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelGabor.java
index 532eedcdb..88ccc1e1c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelGabor.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelGabor.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package net.imagej.ops2.create.kernel;
+package net.imagej.ops2.create;
 
 import java.util.function.BiFunction;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelGauss.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelGauss.java
similarity index 98%
rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelGauss.java
rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelGauss.java
index 29dd6b65d..4f0eaff9e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelGauss.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelGauss.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package net.imagej.ops2.create.kernel;
+package net.imagej.ops2.create;
 
 import java.util.function.BiFunction;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelGibsonLanni.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelGibsonLanni.java
similarity index 99%
rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelGibsonLanni.java
rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelGibsonLanni.java
index 9d3106593..c13b66a9b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelGibsonLanni.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelGibsonLanni.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package net.imagej.ops2.create.kernel;
+package net.imagej.ops2.create;
 
 import java.util.function.BiFunction;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelLog.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelLog.java
similarity index 99%
rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelLog.java
rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelLog.java
index 016da987e..0c1298498 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelLog.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelLog.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package net.imagej.ops2.create.kernel;
+package net.imagej.ops2.create;
 
 import java.util.function.BiFunction;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelSobel.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelSobel.java
similarity index 98%
rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelSobel.java
rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelSobel.java
index e3993b740..ececfd61c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelSobel.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelSobel.java
@@ -26,7 +26,7 @@
  * #L%
  */
 
-package net.imagej.ops2.create.kernel;
+package net.imagej.ops2.create;
 
 import java.util.function.BiFunction;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/img/Imgs.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Imgs.java
similarity index 99%
rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/img/Imgs.java
rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Imgs.java
index fb2b9fc88..6e3c0190a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/img/Imgs.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Imgs.java
@@ -26,7 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
-package net.imagej.ops2.create.img;
+package net.imagej.ops2.create;
 
 import net.imglib2.Dimensions;
 import net.imglib2.Interval;
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaborTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaborTest.java
index b8e37b84e..a2a34e4f4 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaborTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaborTest.java
@@ -34,7 +34,6 @@
 import java.util.function.BiFunction;
 
 import net.imagej.ops2.AbstractOpTest;
-import net.imagej.ops2.create.kernel.DefaultCreateKernelGabor;
 import net.imglib2.RandomAccess;
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.type.numeric.ComplexType;

From 137653c83f5ee8d93f909b35b3fa186a26993f44 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Tue, 13 Jul 2021 15:07:11 -0500
Subject: [PATCH 69/91] Absorb zernike helper into zernike package

---
 imagej/imagej-ops2/src/main/java/module-info.java               | 1 -
 .../imagej/ops2/features/zernike/DefaultMagnitudeFeature.java   | 1 -
 .../net/imagej/ops2/features/zernike/DefaultPhaseFeature.java   | 1 -
 .../net/imagej/ops2/features/zernike/{helper => }/Polynom.java  | 2 +-
 .../ops2/features/zernike/{helper => }/ZernikeComputer.java     | 2 +-
 .../ops2/features/zernike/{helper => }/ZernikeMoment.java       | 2 +-
 6 files changed, 3 insertions(+), 6 deletions(-)
 rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/{helper => }/Polynom.java (98%)
 rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/{helper => }/ZernikeComputer.java (99%)
 rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/{helper => }/ZernikeMoment.java (98%)

diff --git a/imagej/imagej-ops2/src/main/java/module-info.java b/imagej/imagej-ops2/src/main/java/module-info.java
index 81080025d..31a313873 100644
--- a/imagej/imagej-ops2/src/main/java/module-info.java
+++ b/imagej/imagej-ops2/src/main/java/module-info.java
@@ -22,7 +22,6 @@
 	opens net.imagej.ops2.features.lbp2d to org.scijava, org.scijava.ops;
 	opens net.imagej.ops2.features.tamura2d to org.scijava, org.scijava.ops;
 	opens net.imagej.ops2.features.zernike to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.features.zernike.helper to org.scijava, org.scijava.ops;
 	opens net.imagej.ops2.filter to org.scijava, org.scijava.ops;
 	opens net.imagej.ops2.filter.addNoise to org.scijava, org.scijava.ops;
 	opens net.imagej.ops2.filter.bilateral to org.scijava, org.scijava.ops;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java
index 19f5f964d..78496aaab 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java
@@ -28,7 +28,6 @@
  */
 package net.imagej.ops2.features.zernike;
 
-import net.imagej.ops2.features.zernike.helper.ZernikeMoment;
 import net.imglib2.IterableInterval;
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java
index a70e5e242..ded51a433 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java
@@ -28,7 +28,6 @@
  */
 package net.imagej.ops2.features.zernike;
 
-import net.imagej.ops2.features.zernike.helper.ZernikeMoment;
 import net.imglib2.IterableInterval;
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/Polynom.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/Polynom.java
similarity index 98%
rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/Polynom.java
rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/Polynom.java
index 6041c4f6d..9600ee424 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/Polynom.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/Polynom.java
@@ -26,7 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
-package net.imagej.ops2.features.zernike.helper;
+package net.imagej.ops2.features.zernike;
 
 /**
  * class used to represent a zernike moment polynomial.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/ZernikeComputer.java
similarity index 99%
rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java
rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/ZernikeComputer.java
index d0bd30f60..498a1bd02 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/ZernikeComputer.java
@@ -26,7 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
-package net.imagej.ops2.features.zernike.helper;
+package net.imagej.ops2.features.zernike;
 
 import net.imagej.types.BigComplex;
 import net.imglib2.Cursor;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeMoment.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/ZernikeMoment.java
similarity index 98%
rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeMoment.java
rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/ZernikeMoment.java
index f70c33a8b..faac05240 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeMoment.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/ZernikeMoment.java
@@ -26,7 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
-package net.imagej.ops2.features.zernike.helper;
+package net.imagej.ops2.features.zernike;
 
 import net.imagej.types.BigComplex;
 

From dc1e3eedb65789f440859e84c765a7a4cc1beb85 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Tue, 13 Jul 2021 15:21:28 -0500
Subject: [PATCH 70/91] Absorb net.imagej.ops2.geom.geom3d.mesh

There seemed to be no reason for this package. The contents did not
really deal with Meshes, and many Ops in the net.imagej.ops2.geom.geom3d
package (that actually imported Mesh) depended on this subpackage (which
is bad). For these reasons, let's just absorb the mesh subpackage into
the geom3d package
---
 imagej/imagej-ops2/src/main/java/module-info.java             | 1 -
 .../geom/geom3d/{mesh => }/AbstractVertexInterpolator.java    | 2 +-
 .../geom/geom3d/{mesh => }/BitTypeVertexInterpolator.java     | 2 +-
 .../java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java | 3 ---
 .../net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java     | 2 --
 .../geom/geom3d/{mesh => }/DefaultVertexInterpolator.java     | 2 +-
 .../java/net/imagej/ops2/geom/geom3d/{mesh => }/Facet.java    | 2 +-
 .../java/net/imagej/ops2/geom/geom3d/{mesh => }/Horizon.java  | 2 +-
 .../ops2/geom/geom3d/{mesh => }/RAIToMeshConverter.java       | 2 +-
 .../imagej/ops2/geom/geom3d/{mesh => }/TriangularFacet.java   | 4 +---
 .../ops2/geom/geom3d/{mesh => }/UpdateablePointSet.java       | 2 +-
 .../java/net/imagej/ops2/geom/geom3d/{mesh => }/Vertex.java   | 2 +-
 .../ops2/geom/geom3d/{mesh => }/VertexInterpolator.java       | 2 +-
 13 files changed, 10 insertions(+), 18 deletions(-)
 rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/{mesh => }/AbstractVertexInterpolator.java (98%)
 rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/{mesh => }/BitTypeVertexInterpolator.java (97%)
 rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/{mesh => }/DefaultVertexInterpolator.java (98%)
 rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/{mesh => }/Facet.java (97%)
 rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/{mesh => }/Horizon.java (99%)
 rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/{mesh => }/RAIToMeshConverter.java (98%)
 rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/{mesh => }/TriangularFacet.java (98%)
 rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/{mesh => }/UpdateablePointSet.java (99%)
 rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/{mesh => }/Vertex.java (98%)
 rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/{mesh => }/VertexInterpolator.java (97%)

diff --git a/imagej/imagej-ops2/src/main/java/module-info.java b/imagej/imagej-ops2/src/main/java/module-info.java
index 31a313873..f2d48467b 100644
--- a/imagej/imagej-ops2/src/main/java/module-info.java
+++ b/imagej/imagej-ops2/src/main/java/module-info.java
@@ -48,7 +48,6 @@
 	opens net.imagej.ops2.geom to org.scijava, org.scijava.ops;
 	opens net.imagej.ops2.geom.geom2d to org.scijava, org.scijava.ops;
 	opens net.imagej.ops2.geom.geom3d to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.geom.geom3d.mesh to org.scijava, org.scijava.ops;
 	opens net.imagej.ops2.identity to org.scijava, org.scijava.ops;
 	opens net.imagej.ops2.image.ascii to org.scijava, org.scijava.ops;
 	opens net.imagej.ops2.image.cooccurrenceMatrix to org.scijava, org.scijava.ops;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/AbstractVertexInterpolator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/AbstractVertexInterpolator.java
similarity index 98%
rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/AbstractVertexInterpolator.java
rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/AbstractVertexInterpolator.java
index 301788527..59d62d152 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/AbstractVertexInterpolator.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/AbstractVertexInterpolator.java
@@ -26,7 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
-package net.imagej.ops2.geom.geom3d.mesh;
+package net.imagej.ops2.geom.geom3d;
 
 /**
  * This is the {@link AbstractVertexInterpolator}. A vertex interpolator
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/BitTypeVertexInterpolator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/BitTypeVertexInterpolator.java
similarity index 97%
rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/BitTypeVertexInterpolator.java
rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/BitTypeVertexInterpolator.java
index bfe3f5166..45ff6f860 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/BitTypeVertexInterpolator.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/BitTypeVertexInterpolator.java
@@ -26,7 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
-package net.imagej.ops2.geom.geom3d.mesh;
+package net.imagej.ops2.geom.geom3d;
 
 /**
  * The {@link BitTypeVertexInterpolator} returns the point which is in the
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java
index 179e29ac2..87b18885b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java
@@ -40,9 +40,6 @@
 
 import net.imagej.mesh.Mesh;
 import net.imagej.mesh.naive.NaiveDoubleMesh;
-import net.imagej.ops2.geom.geom3d.mesh.Horizon;
-import net.imagej.ops2.geom.geom3d.mesh.TriangularFacet;
-import net.imagej.ops2.geom.geom3d.mesh.Vertex;
 import net.imglib2.util.Pair;
 import net.imglib2.util.ValuePair;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java
index e09e0e6e6..fa4add7b2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java
@@ -33,8 +33,6 @@
 
 import net.imagej.mesh.Mesh;
 import net.imagej.mesh.naive.NaiveDoubleMesh;
-import net.imagej.ops2.geom.geom3d.mesh.DefaultVertexInterpolator;
-import net.imagej.ops2.geom.geom3d.mesh.VertexInterpolator;
 import net.imglib2.Cursor;
 import net.imglib2.FinalInterval;
 import net.imglib2.RandomAccessibleInterval;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/DefaultVertexInterpolator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVertexInterpolator.java
similarity index 98%
rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/DefaultVertexInterpolator.java
rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVertexInterpolator.java
index e93b479a3..995e5355e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/DefaultVertexInterpolator.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVertexInterpolator.java
@@ -26,7 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
-package net.imagej.ops2.geom.geom3d.mesh;
+package net.imagej.ops2.geom.geom3d;
 
 /**
  * Linearly interpolate the position where an isosurface cuts an edge between
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/Facet.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/Facet.java
similarity index 97%
rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/Facet.java
rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/Facet.java
index 19175bffd..606904a18 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/Facet.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/Facet.java
@@ -26,7 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
-package net.imagej.ops2.geom.geom3d.mesh;
+package net.imagej.ops2.geom.geom3d;
 
 public interface Facet {
 	// NB: Marker Interface
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/Horizon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/Horizon.java
similarity index 99%
rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/Horizon.java
rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/Horizon.java
index 1bf644f1c..67716e8ed 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/Horizon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/Horizon.java
@@ -26,7 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
-package net.imagej.ops2.geom.geom3d.mesh;
+package net.imagej.ops2.geom.geom3d;
 
 /**
  * A Horizon is the result of n neighboring {@link TriangularFacet} which are merged.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/RAIToMeshConverter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/RAIToMeshConverter.java
similarity index 98%
rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/RAIToMeshConverter.java
rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/RAIToMeshConverter.java
index fdcae963a..94695afda 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/RAIToMeshConverter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/RAIToMeshConverter.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package net.imagej.ops2.geom.geom3d.mesh;
+package net.imagej.ops2.geom.geom3d;
 
 import java.lang.reflect.Type;
 import java.util.function.Function;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/TriangularFacet.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/TriangularFacet.java
similarity index 98%
rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/TriangularFacet.java
rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/TriangularFacet.java
index a52fad74a..2d45fd534 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/TriangularFacet.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/TriangularFacet.java
@@ -26,14 +26,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
-package net.imagej.ops2.geom.geom3d.mesh;
+package net.imagej.ops2.geom.geom3d;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import net.imagej.ops2.geom.geom3d.DefaultConvexHull3D;
-
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/UpdateablePointSet.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/UpdateablePointSet.java
similarity index 99%
rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/UpdateablePointSet.java
rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/UpdateablePointSet.java
index 99f9d9faf..72cca5aba 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/UpdateablePointSet.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/UpdateablePointSet.java
@@ -26,7 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
-package net.imagej.ops2.geom.geom3d.mesh;
+package net.imagej.ops2.geom.geom3d;
 
 import java.util.List;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/Vertex.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/Vertex.java
similarity index 98%
rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/Vertex.java
rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/Vertex.java
index 004337f34..c6a99568b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/Vertex.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/Vertex.java
@@ -26,7 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
-package net.imagej.ops2.geom.geom3d.mesh;
+package net.imagej.ops2.geom.geom3d;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/VertexInterpolator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/VertexInterpolator.java
similarity index 97%
rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/VertexInterpolator.java
rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/VertexInterpolator.java
index e94d64824..d07512b55 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/VertexInterpolator.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/VertexInterpolator.java
@@ -26,7 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
-package net.imagej.ops2.geom.geom3d.mesh;
+package net.imagej.ops2.geom.geom3d;
 
 public interface VertexInterpolator {
 

From c1900bf460746b1110a0587a8d66de3c99ae496d Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Tue, 13 Jul 2021 13:48:26 -0500
Subject: [PATCH 71/91] Add subpackage depedency prevention rule

---
 pom.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pom.xml b/pom.xml
index 3cad076ef..857219085 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,6 +144,19 @@
 							</rules>
 						</configuration>
 					</execution>
+					<execution>
+						<id>enforce-no-subpackage-dependence</id>
+						<goals>
+							<goal>enforce</goal>
+						</goals>
+						<phase>test</phase>
+						<configuration>
+							<rules>
+								<NoSubpackageDependenceRule
+									implementation="org.scijava.packages.rules.NoSubpackageDependenceRule" />
+							</rules>
+						</configuration>
+					</execution>
 				</executions>
 			</plugin>
 		</plugins>

From 462831855fc22966aaf2503df52c5bb8d61d1027 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Thu, 5 Aug 2021 12:57:15 -0500
Subject: [PATCH 72/91] Resolve provenance package cycle

This was a tough decision, as I'd like to keep the provenance stuff
separate from the matcher, but we have to take the OpHistory in the
OpWrappers, so we have to make this change. It is probably worth
considering making a scijava-ops-provenance module that can stand alone
from scijava-ops(-engine)
---
 .../src/test/java/net/imagej/ops2/AbstractOpTest.java       | 2 +-
 .../test/java/net/imagej/ops2/coloc/ColocalisationTest.java | 2 +-
 .../imagej/ops2/filter/vesselness/FrangiVesselnessTest.java | 4 ++--
 scijava/scijava-ops/src/main/java/module-info.java          | 3 ---
 .../scijava-ops/src/main/java/org/scijava/ops/Hints.java    | 1 -
 .../scijava/ops/{provenance => }/OpExecutionSummary.java    | 3 +--
 .../java/org/scijava/ops/{provenance => }/OpHistory.java    | 3 +--
 .../org/scijava/ops/{provenance => }/OpHistoryService.java  | 2 +-
 .../src/main/java/org/scijava/ops/OpWrapper.java            | 1 -
 .../org/scijava/ops/conversionLoss/LossReporterWrapper.java | 4 ++--
 .../java/org/scijava/ops/impl/DefaultOpEnvironment.java     | 2 +-
 .../scijava/ops/{provenance => }/impl/DefaultOpHistory.java | 6 +++---
 .../{provenance => }/impl/SingletonOpHistoryService.java    | 6 +++---
 .../main/java/org/scijava/ops/matcher/impl/OpWrappers.java  | 4 ++--
 .../test/java/org/scijava/ops/AbstractTestEnvironment.java  | 1 -
 .../src/test/java/org/scijava/ops/impl/OpCachingTest.java   | 2 +-
 .../java/org/scijava/ops/provenance/ProvenanceTest.java     | 2 ++
 scijava/scijava-ops/templates/main/java/module-info.vm      | 3 +--
 .../main/java/org/scijava/ops/matcher/impl/OpWrappers.vm    | 4 ++--
 19 files changed, 24 insertions(+), 31 deletions(-)
 rename scijava/scijava-ops/src/main/java/org/scijava/ops/{provenance => }/OpExecutionSummary.java (93%)
 rename scijava/scijava-ops/src/main/java/org/scijava/ops/{provenance => }/OpHistory.java (95%)
 rename scijava/scijava-ops/src/main/java/org/scijava/ops/{provenance => }/OpHistoryService.java (74%)
 rename scijava/scijava-ops/src/main/java/org/scijava/ops/{provenance => }/impl/DefaultOpHistory.java (95%)
 rename scijava/scijava-ops/src/main/java/org/scijava/ops/{provenance => }/impl/SingletonOpHistoryService.java (73%)

diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java
index 4c7df5f41..784c211b1 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java
@@ -51,8 +51,8 @@
 import org.scijava.Context;
 import org.scijava.cache.CacheService;
 import org.scijava.ops.Op;
+import org.scijava.ops.OpHistoryService;
 import org.scijava.ops.OpService;
-import org.scijava.ops.provenance.OpHistoryService;
 import org.scijava.plugin.PluginService;
 import org.scijava.thread.ThreadService;
 import org.scijava.types.TypeService;
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/ColocalisationTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/ColocalisationTest.java
index a768395f3..40079996e 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/ColocalisationTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/ColocalisationTest.java
@@ -60,8 +60,8 @@
 import org.scijava.cache.CacheService;
 import org.scijava.io.location.FileLocation;
 import org.scijava.ops.OpBuilder;
+import org.scijava.ops.OpHistoryService;
 import org.scijava.ops.OpService;
-import org.scijava.ops.provenance.OpHistoryService;
 import org.scijava.plugin.PluginService;
 import org.scijava.thread.ThreadService;
 import org.scijava.types.TypeService;
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/vesselness/FrangiVesselnessTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/vesselness/FrangiVesselnessTest.java
index e087a908d..3d851e00b 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/vesselness/FrangiVesselnessTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/vesselness/FrangiVesselnessTest.java
@@ -49,9 +49,9 @@
 import org.scijava.Context;
 import org.scijava.cache.CacheService;
 import org.scijava.ops.OpBuilder;
+import org.scijava.ops.OpHistory;
+import org.scijava.ops.OpHistoryService;
 import org.scijava.ops.OpService;
-import org.scijava.ops.provenance.OpHistory;
-import org.scijava.ops.provenance.OpHistoryService;
 import org.scijava.plugin.PluginService;
 import org.scijava.script.ScriptService;
 import org.scijava.thread.ThreadService;
diff --git a/scijava/scijava-ops/src/main/java/module-info.java b/scijava/scijava-ops/src/main/java/module-info.java
index 21ced234b..213ec3e5c 100644
--- a/scijava/scijava-ops/src/main/java/module-info.java
+++ b/scijava/scijava-ops/src/main/java/module-info.java
@@ -11,7 +11,6 @@
 	exports org.scijava.ops.math;
 	exports org.scijava.ops.simplify;
 	exports org.scijava.ops.conversionLoss;
-	exports org.scijava.ops.provenance;
 	// TODO: move OpWrapper to its own package (org.scijava.ops.wrap??)
 	exports org.scijava.ops.util; // contains OpWrapper interface
 
@@ -26,7 +25,6 @@
 	opens org.scijava.ops.create to therapi.runtime.javadoc;
 	opens org.scijava.ops.impl to therapi.runtime.javadoc, org.scijava;
 	opens org.scijava.ops.monitor to therapi.runtime.javadoc;
-	opens org.scijava.ops.provenance to therapi.runtime.javadoc;
 	opens org.scijava.ops.adapt.functional to therapi.runtime.javadoc;
 	opens org.scijava.ops to therapi.runtime.javadoc, org.scijava;
 	opens org.scijava.ops.util to therapi.runtime.javadoc;
@@ -34,7 +32,6 @@
 	opens org.scijava.ops.struct to therapi.runtime.javadoc;
 	opens org.scijava.ops.simplify to therapi.runtime.javadoc;
 	opens org.scijava.ops.stats to therapi.runtime.javadoc;
-	opens org.scijava.ops.provenance.impl to therapi.runtime.javadoc, org.scijava;
 
 	// FIXME: This is a file name and is thus unstable
 	requires geantyref;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/Hints.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/Hints.java
index 4b7fb1f42..a449457ec 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/Hints.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/Hints.java
@@ -6,7 +6,6 @@
 import java.util.UUID;
 
 import org.scijava.ops.BaseOpHints.Simplification;
-import org.scijava.ops.provenance.OpHistory;
 
 /**
  * A basic interface for storing and accessing Hints. The general structure for a Hint is
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/OpExecutionSummary.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpExecutionSummary.java
similarity index 93%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/OpExecutionSummary.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/OpExecutionSummary.java
index ba8f970f5..e84b4f83e 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/OpExecutionSummary.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpExecutionSummary.java
@@ -1,9 +1,8 @@
 
-package org.scijava.ops.provenance;
+package org.scijava.ops;
 
 import java.util.UUID;
 
-import org.scijava.ops.OpInfo;
 import org.scijava.ops.impl.DefaultOpEnvironment;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/OpHistory.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpHistory.java
similarity index 95%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/OpHistory.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/OpHistory.java
index 1ea8c3a0a..285de5306 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/OpHistory.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpHistory.java
@@ -1,12 +1,11 @@
 
-package org.scijava.ops.provenance;
+package org.scijava.ops;
 
 import com.google.common.graph.Graph;
 
 import java.util.List;
 import java.util.UUID;
 
-import org.scijava.ops.OpInfo;
 import org.scijava.service.SciJavaService;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/OpHistoryService.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpHistoryService.java
similarity index 74%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/OpHistoryService.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/OpHistoryService.java
index 8318d434d..1b5600da4 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/OpHistoryService.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpHistoryService.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.provenance;
+package org.scijava.ops;
 
 import org.scijava.service.SciJavaService;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpWrapper.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpWrapper.java
index 56dad4885..d2d631281 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpWrapper.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpWrapper.java
@@ -6,7 +6,6 @@
 
 import org.scijava.ops.Hints;
 import org.scijava.ops.OpInfo;
-import org.scijava.ops.provenance.OpHistory;
 import org.scijava.plugin.SciJavaPlugin;
 import org.scijava.types.Types;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporterWrapper.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporterWrapper.java
index abb9071de..a0af5d463 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporterWrapper.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporterWrapper.java
@@ -5,10 +5,10 @@
 
 import org.scijava.ops.BaseOpHints.DependencyMatching;
 import org.scijava.ops.Hints;
+import org.scijava.ops.OpExecutionSummary;
+import org.scijava.ops.OpHistory;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpWrapper;
-import org.scijava.ops.provenance.OpExecutionSummary;
-import org.scijava.ops.provenance.OpHistory;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.GenericTyped;
 import org.scijava.types.Nil;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
index 5f0fc48b1..159f69fdc 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
@@ -65,6 +65,7 @@
 import org.scijava.ops.OpDependencyMember;
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.OpField;
+import org.scijava.ops.OpHistoryService;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpInstance;
 import org.scijava.ops.OpMethod;
@@ -83,7 +84,6 @@
 import org.scijava.ops.matcher.impl.OpClassInfo;
 import org.scijava.ops.matcher.impl.OpFieldInfo;
 import org.scijava.ops.matcher.impl.OpMethodInfo;
-import org.scijava.ops.provenance.OpHistoryService;
 import org.scijava.ops.simplify.SimplifiedOpInfo;
 import org.scijava.ops.struct.FunctionalParameters;
 import org.scijava.plugin.Parameter;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/impl/DefaultOpHistory.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpHistory.java
similarity index 95%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/impl/DefaultOpHistory.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpHistory.java
index b46516dfe..f624e61bf 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/impl/DefaultOpHistory.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpHistory.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops.provenance.impl;
+package org.scijava.ops.impl;
 
 import com.google.common.graph.Graph;
 import com.google.common.graph.GraphBuilder;
@@ -14,9 +14,9 @@
 import java.util.stream.Collectors;
 
 import org.scijava.ops.OpDependency;
+import org.scijava.ops.OpExecutionSummary;
+import org.scijava.ops.OpHistory;
 import org.scijava.ops.OpInfo;
-import org.scijava.ops.provenance.OpExecutionSummary;
-import org.scijava.ops.provenance.OpHistory;
 import org.scijava.plugin.Plugin;
 import org.scijava.service.AbstractService;
 import org.scijava.service.Service;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/impl/SingletonOpHistoryService.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/SingletonOpHistoryService.java
similarity index 73%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/impl/SingletonOpHistoryService.java
rename to scijava/scijava-ops/src/main/java/org/scijava/ops/impl/SingletonOpHistoryService.java
index a773beca9..951116aa9 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/impl/SingletonOpHistoryService.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/SingletonOpHistoryService.java
@@ -1,7 +1,7 @@
-package org.scijava.ops.provenance.impl;
+package org.scijava.ops.impl;
 
-import org.scijava.ops.provenance.OpHistory;
-import org.scijava.ops.provenance.OpHistoryService;
+import org.scijava.ops.OpHistory;
+import org.scijava.ops.OpHistoryService;
 import org.scijava.plugin.Plugin;
 import org.scijava.service.AbstractService;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpWrappers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpWrappers.java
index 97936c716..8c7e59ceb 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpWrappers.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpWrappers.java
@@ -17,10 +17,10 @@
 import org.scijava.function.Producer;
 import org.scijava.ops.BaseOpHints.DependencyMatching;
 import org.scijava.ops.Hints;
+import org.scijava.ops.OpExecutionSummary;
+import org.scijava.ops.OpHistory;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpWrapper;
-import org.scijava.ops.provenance.OpExecutionSummary;
-import org.scijava.ops.provenance.OpHistory;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.GenericTyped;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/AbstractTestEnvironment.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/AbstractTestEnvironment.java
index 346df1e01..e2bce62c2 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/AbstractTestEnvironment.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/AbstractTestEnvironment.java
@@ -11,7 +11,6 @@
 import org.junit.BeforeClass;
 import org.scijava.Context;
 import org.scijava.cache.CacheService;
-import org.scijava.ops.provenance.OpHistoryService;
 import org.scijava.plugin.PluginService;
 import org.scijava.thread.ThreadService;
 import org.scijava.types.TypeService;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java
index 0eaf3ed88..cd98aea31 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java
@@ -46,9 +46,9 @@
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.OpField;
+import org.scijava.ops.OpHistoryService;
 import org.scijava.ops.OpInstance;
 import org.scijava.ops.OpService;
-import org.scijava.ops.provenance.OpHistoryService;
 import org.scijava.plugin.Plugin;
 import org.scijava.plugin.PluginService;
 import org.scijava.types.TypeService;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java
index 6fb17de2f..a9e50d1f5 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java
@@ -16,7 +16,9 @@
 import org.scijava.ops.Hints;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpDependency;
+import org.scijava.ops.OpExecutionSummary;
 import org.scijava.ops.OpField;
+import org.scijava.ops.OpHistoryService;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpMethod;
 import org.scijava.ops.hint.DefaultHints;
diff --git a/scijava/scijava-ops/templates/main/java/module-info.vm b/scijava/scijava-ops/templates/main/java/module-info.vm
index 332cb1a86..f667db44b 100644
--- a/scijava/scijava-ops/templates/main/java/module-info.vm
+++ b/scijava/scijava-ops/templates/main/java/module-info.vm
@@ -8,7 +8,7 @@ module org.scijava.ops {
 ## Determines all packages in the module
 #set($packages = $modulePackages.call("src/main/java/org/scijava"))
 ## Defines the packages that should be exported to org.scijava
-#set($scijavaPackages = ["org.scijava.ops", "org.scijava.ops.impl", "org.scijava.ops.matcher.impl", "org.scijava.ops.provenance.impl"])
+#set($scijavaPackages = ["org.scijava.ops", "org.scijava.ops.impl", "org.scijava.ops.matcher.impl"])
 ## Defines the packages that should be exported to therapi.runtime.javadoc
 #set($therapiPackages = $modulePackages.call("src/main/java/org/scijava"))
 	//TODO: rearrange packages to export only needed classes
@@ -17,7 +17,6 @@ module org.scijava.ops {
 	exports org.scijava.ops.math;
 	exports org.scijava.ops.simplify;
 	exports org.scijava.ops.conversionLoss;
-	exports org.scijava.ops.provenance;
 	// TODO: move OpWrapper to its own package (org.scijava.ops.wrap??)
 	exports org.scijava.ops.util; // contains OpWrapper interface
 
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/impl/OpWrappers.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/impl/OpWrappers.vm
index e2b95552a..cf7559aad 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/impl/OpWrappers.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/impl/OpWrappers.vm
@@ -17,10 +17,10 @@ import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
 import org.scijava.ops.BaseOpHints.DependencyMatching;
 import org.scijava.ops.Hints;
+import org.scijava.ops.OpExecutionSummary;
+import org.scijava.ops.OpHistory;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpWrapper;
-import org.scijava.ops.provenance.OpExecutionSummary;
-import org.scijava.ops.provenance.OpHistory;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.GenericTyped;
 

From 6716c79f06b9291c1dc4406998bedaa8703ac310 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Tue, 20 Jul 2021 17:01:55 -0500
Subject: [PATCH 73/91] Separate out API module to contain annotations

---
 pom.xml                                       |   1 +
 scijava/scijava-ops-api/.gitignore            |   2 +
 scijava/scijava-ops-api/LICENSE.txt           |  24 ++
 scijava/scijava-ops-api/README.md             |  12 +
 scijava/scijava-ops-api/bin/generate.groovy   | 238 ++++++++++++++++++
 scijava/scijava-ops-api/pom.xml               | 119 +++++++++
 .../src/main/java/module-info.java            |   7 +
 .../src/main/java/org/scijava/ops/api/Op.java |   7 +
 .../org/scijava/ops/api/OpCollection.java     |   8 +
 .../org/scijava/ops/api/OpDependency.java     |  18 ++
 .../java/org/scijava/ops/api/OpField.java     |  24 ++
 .../java/org/scijava/ops/api/OpMethod.java    |  53 ++++
 12 files changed, 513 insertions(+)
 create mode 100644 scijava/scijava-ops-api/.gitignore
 create mode 100644 scijava/scijava-ops-api/LICENSE.txt
 create mode 100644 scijava/scijava-ops-api/README.md
 create mode 100644 scijava/scijava-ops-api/bin/generate.groovy
 create mode 100644 scijava/scijava-ops-api/pom.xml
 create mode 100644 scijava/scijava-ops-api/src/main/java/module-info.java
 create mode 100644 scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/Op.java
 create mode 100644 scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpCollection.java
 create mode 100644 scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpDependency.java
 create mode 100644 scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpField.java
 create mode 100644 scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpMethod.java

diff --git a/pom.xml b/pom.xml
index 857219085..2f38e2560 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,7 @@
 		<module>scijava/scijava-function</module>
 		<module>scijava/scijava-ops</module>
 		<module>scijava/scijava-struct</module>
+		<module>scijava/scijava-ops-api</module>
 		<module>scijava/scijava-taglets</module>
 		<module>scijava/scijava-testutil</module>
 		<module>scijava/scijava-types</module>
diff --git a/scijava/scijava-ops-api/.gitignore b/scijava/scijava-ops-api/.gitignore
new file mode 100644
index 000000000..00d2ab71d
--- /dev/null
+++ b/scijava/scijava-ops-api/.gitignore
@@ -0,0 +1,2 @@
+/.apt_generated/
+/.apt_generated_tests/
diff --git a/scijava/scijava-ops-api/LICENSE.txt b/scijava/scijava-ops-api/LICENSE.txt
new file mode 100644
index 000000000..ef17d5e7a
--- /dev/null
+++ b/scijava/scijava-ops-api/LICENSE.txt
@@ -0,0 +1,24 @@
+Copyright (c) 2016 - 2019, SciJava Ops developers.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/scijava/scijava-ops-api/README.md b/scijava/scijava-ops-api/README.md
new file mode 100644
index 000000000..90608641c
--- /dev/null
+++ b/scijava/scijava-ops-api/README.md
@@ -0,0 +1,12 @@
+The SciJava Ops projects offers a framework for typed operations, or Ops.
+
+Each op implements a particular functional interface, possessing typed inputs
+or outputs. The system provides the ability to request ops matching particular
+constraints, including implementing interface, input types and output types. 
+
+It is like Java's method overloading, but more powerful, and more extensible.
+
+More documentation coming later.
+
+See also [ImageJ Ops](https://github.com/imagej/imagej-ops), a collection of
+ops focused on scientific image processing and analysis.
diff --git a/scijava/scijava-ops-api/bin/generate.groovy b/scijava/scijava-ops-api/bin/generate.groovy
new file mode 100644
index 000000000..3e26050d9
--- /dev/null
+++ b/scijava/scijava-ops-api/bin/generate.groovy
@@ -0,0 +1,238 @@
+#!/usr/bin/env groovy
+
+/*
+ * #%L
+ * SciJava Operations: a framework for reusable algorithms.
+ * %%
+ * Copyright (C) 2018 SciJava developers.
+ * %%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+debug = System.getenv('DEBUG')
+def debug(msg) {
+	if (debug) System.err.println("[DEBUG] $msg")
+}
+
+@Grab('org.apache.velocity:velocity:1.7')
+import org.apache.velocity.app.VelocityEngine
+
+// TODO: Get path to Groovy script and make these dirs relative to that.
+templateDirectory = 'templates'
+outputDirectory = 'src'
+
+knownFiles = new java.util.HashSet();
+
+/* Gets the last modified timestamp for the given file. */
+def timestamp(dir, file) {
+	if (file == null) return Long.MAX_VALUE;
+	file = new java.io.File(dir, file);
+	knownFiles.add(file);
+	return file.lastModified();
+}
+
+/* Processes a template using Apache Velocity. */
+def processTemplate(engine, context, templateFile, outFilename) {
+	debug("processTemplate('$engine', '$context', '$templateFile', '$outFilename')")
+
+	if (outFilename == null) return; // nothing to do
+
+	// create output directory if it does not already exist
+	outFile = new java.io.File(outputDirectory, outFilename);
+	knownFiles.add(outFile);
+	if (outFile.getParentFile() != null) outFile.getParentFile().mkdirs();
+
+	// apply the template and write out the result
+	t = engine.getTemplate(templateFile);
+	writer = new StringWriter();
+	t.merge(context, writer);
+	out = new PrintWriter(outFile, "UTF-8");
+	out.print(writer.toString());
+	out.close();
+}
+
+/* Evaluates a string using Groovy. */
+def parseValue(sh, translationsFile, key, expression) {
+	try {
+		result = sh.evaluate(expression)
+		sh.setVariable(key, result)
+		return result
+	}
+	catch (groovy.lang.GroovyRuntimeException e) {
+		print("[WARNING] $translationsFile: " +
+			"key '$key' has unparseable value: " + e.getMessage());
+	}
+}
+
+/* Reads a translations File */
+def readTranslation(engine, globalContext, reader, templateSubdirectory, templateFile, translationsFile, isInclude){
+	sh = new groovy.lang.GroovyShell();
+	for (;;) {
+		// read the line
+		line = reader.readLine();
+
+		if (line == null) break;
+		// check if the line starts a new section
+		if (line.startsWith("[") && line.endsWith("]")) {
+			// if we are parsing a .include file, return when we hit any sections
+			if(isInclude){
+				println("[WARNING] $translationsFile: Section definition in .include file. Ending processing of $translationsFile");
+				return context; 
+			}
+			// write out the previous file
+			processTemplate(engine, context, templateFile, outputFilename);
+
+			// start a new file
+			outputFilename = line.substring(1, line.length() - 1);
+			if (!templateDirectory.equals(templateSubdirectory)) {
+				subPath = templateSubdirectory.substring(templateDirectory.length() + 1);
+				outputFilename = "$subPath/$outputFilename";
+			}
+			context = new org.apache.velocity.VelocityContext(globalContext);
+			continue;
+		}
+
+		// ignore blank lines
+		trimmedLine = line.trim();
+		if (trimmedLine.isEmpty()) continue;
+
+		// ignore comments
+		if (trimmedLine.startsWith("#")) continue;
+
+		// include any global files
+		if (trimmedLine.startsWith(".include")){
+			includeFile = line.substring(9);
+			if(includeFile.startsWith("templates")){
+				includeSubdirectory = includeFile.substring(0, includeFile.lastIndexOf("/"))
+				includeFile = includeFile.substring(includeFile.lastIndexOf("/"))
+			}
+			else{
+			includeSubdirectory = templateSubdirectory
+			}
+			globalReader = new java.io.BufferedReader(new java.io.FileReader("$includeSubdirectory/$includeFile"));
+			encapsulatedContext = new org.apache.velocity.VelocityContext(context)
+			context = readTranslation(engine, encapsulatedContext, globalReader, templateSubdirectory, templateFile, includeFile, true) 
+			continue;
+		}
+		
+		if (!line.contains('=')) {
+			print("[WARNING] $translationsFile: Ignoring spurious line: $line");
+			continue;
+		}
+
+		int idx = line.indexOf('=');
+		key = line.substring(0, idx).trim();
+		value = line.substring(idx + 1);
+
+		if (value.trim().equals('```')) {
+			// multi-line value
+			builder = new StringBuilder();
+			for (;;) {
+				line = reader.readLine();
+				if (line == null) {
+					throw new RuntimeException("Unfinished value: " + builder.toString());
+				}
+				if (line.equals('```')) {
+					break;
+				}
+				if (builder.length() > 0) {
+					builder.append("\n");
+				}
+				builder.append(line);
+			}
+			value = builder.toString();
+		}
+
+		context.put(key, parseValue(sh, translationsFile, key, value));
+	}
+	
+	return context;
+}
+
+/*
+ * Translates a template into many files in the outputDirectory,
+ * given a translations file in INI style; e.g.:
+ *
+ * [filename1]
+ * variable1 = value1
+ * variable2 = value2
+ * ...
+ * [filename2]
+ * variable1 = value3
+ * variable2 = value4
+ * ...
+ */
+def translate(templateSubdirectory, templateFile, translationsFile) {
+	debug("translate('$templateSubdirectory', '$templateFile', '$translationsFile')")
+
+	// initialize the Velocity engine
+	engine = new org.apache.velocity.app.VelocityEngine();
+	p = new java.util.Properties();
+	// fail if template uses an invalid expression; e.g., an undefined variable
+	p.setProperty("runtime.references.strict", "true");
+	// tell Velocity where the templates are located
+	p.setProperty("file.resource.loader.path", "$templateSubdirectory");
+	// tell Velocity to log to stderr rather than to a velocity.log file
+	p.setProperty(org.apache.velocity.runtime.RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS,
+			"org.apache.velocity.runtime.log.SystemLogChute");
+	engine.init(p);
+
+	// read translation lines
+	outputFilename = null;
+	context = globalContext = new org.apache.velocity.VelocityContext();
+	reader = new java.io.BufferedReader(new java.io.FileReader("$templateSubdirectory/$translationsFile"));
+
+	readTranslation(engine, context, reader, templateSubdirectory, templateFile, translationsFile, false);
+
+	reader.close();
+
+	// process the template
+	processTemplate(engine, context, templateFile, outputFilename);
+}
+
+/* Recursively translates all templates in the given directory. */
+def translateDirectory(templateSubdirectory) {
+	debug("translateDirectory('$templateSubdirectory')")
+
+	for (file in new java.io.File(templateSubdirectory).listFiles()) {
+		if (file.isDirectory()) {
+			// process subdirectories recursively
+			translateDirectory(file.getPath());
+		}
+		else {
+			// process Velocity template files only
+			name = file.getName();
+			if (!name.endsWith('.vm')) continue;
+			prefix = name.substring(0, name.lastIndexOf('.'));
+			translate(templateSubdirectory, name, prefix + '.list');
+		}
+	}
+}
+
+try {
+	translateDirectory(templateDirectory);
+}
+catch (Throwable t) {
+	t.printStackTrace(System.err);
+	throw t;
+}
diff --git a/scijava/scijava-ops-api/pom.xml b/scijava/scijava-ops-api/pom.xml
new file mode 100644
index 000000000..f0b2e7eeb
--- /dev/null
+++ b/scijava/scijava-ops-api/pom.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.scijava</groupId>
+		<artifactId>scijava-incubator</artifactId>
+		<version>0-SNAPSHOT</version>
+		<relativePath>../..</relativePath>
+	</parent>
+
+	<artifactId>scijava-ops-api</artifactId>
+
+	<name>SciJava Ops API</name>
+	<description>SciJava Operations API: annotations used by the SciJava Operations framework.</description>
+	<url>https://github.com/scijava/scijava-ops-api</url>
+	<inceptionYear>2021</inceptionYear>
+	<organization>
+		<name>SciJava</name>
+		<url>https://scijava.org/</url>
+	</organization>
+	<licenses>
+		<license>
+			<name>Simplified BSD License</name>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+
+	<developers>
+		<developer>
+			<id>ctrueden</id>
+			<name>Curtis Rueden</name>
+			<url>https://imagej.net/User:Rueden</url>
+			<roles>
+				<role>founder</role>
+				<role>lead</role>
+				<role>reviewer</role>
+				<role>support</role>
+				<role>maintainer</role>
+			</roles>
+		</developer>
+		<developer>
+			<id>gselzer</id>
+			<name>Gabriel Selzer</name>
+			<roles>
+				<role>founder</role>
+				<role>developer</role>
+				<role>debugger</role>
+				<role>reviewer</role>
+				<role>support</role>
+			</roles>
+		</developer>
+	</developers>
+	<contributors>
+		<contributor>
+			<name>Christian Dietz</name>
+			<url>https://imagej.net/User:Dietzc</url>
+			<roles>
+				<role>founder</role>
+			</roles>
+			<properties>
+				<id>dietzc</id>
+			</properties>
+		</contributor>
+		<contributor>
+			<name>David Kolb</name>
+			<roles>
+				<role>founder</role>
+			</roles>
+			<properties>
+				<id>Treiblesschorle</id>
+			</properties>
+		</contributor>
+	</contributors>
+
+	<mailingLists>
+		<mailingList>
+			<name>Image.sc Forum</name>
+			<archive>https://forum.image.sc/tags/scijava-ops-api</archive>
+		</mailingList>
+	</mailingLists>
+
+	<scm>
+		<connection>scm:git:git://github.com/scijava/incubator</connection>
+		<developerConnection>scm:git:git@github.com:scijava/incubator</developerConnection>
+		<tag>HEAD</tag>
+		<url>https://github.com/scijava/incubator</url>
+	</scm>
+	<issueManagement>
+		<system>GitHub Issues</system>
+		<url>https://github.com/scijava/scijava-ops-api/issues</url>
+	</issueManagement>
+	<ciManagement>
+		<system>Travis CI</system>
+		<url>https://travis-ci.com/scijava/incubator</url>
+	</ciManagement>
+
+	<properties>
+		<main-class>org.scijava.ops.api.Main</main-class>
+		<package-name>org.scijava.ops.api</package-name>
+
+		<license.licenseName>bsd_2</license.licenseName>
+		<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
+		<!--  <enforcer.skip>true</enforcer.skip>-->
+		<scijava-ops-api.allowedDuplicateClasses>${scijava.allowedDuplicateClasses},com.github.therapi.runtimejavadoc.repack.com.eclipsesource.json.*</scijava-ops-api.allowedDuplicateClasses>
+		<allowedDuplicateClasses>${scijava-ops-api.allowedDuplicateClasses}</allowedDuplicateClasses>
+	</properties>
+	<dependencies>
+		<!-- SciJava dependencies -->
+		<dependency>
+			<groupId>org.scijava</groupId>
+			<artifactId>scijava-common</artifactId>
+		</dependency>
+
+		<!-- Test scope dependencies -->
+	</dependencies>
+</project>
diff --git a/scijava/scijava-ops-api/src/main/java/module-info.java b/scijava/scijava-ops-api/src/main/java/module-info.java
new file mode 100644
index 000000000..5f402635c
--- /dev/null
+++ b/scijava/scijava-ops-api/src/main/java/module-info.java
@@ -0,0 +1,7 @@
+module org.scijava.ops.api {
+
+	exports org.scijava.ops.api;
+
+	requires org.scijava;
+
+}
diff --git a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/Op.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/Op.java
new file mode 100644
index 000000000..99bf90292
--- /dev/null
+++ b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/Op.java
@@ -0,0 +1,7 @@
+package org.scijava.ops.api;
+
+import org.scijava.plugin.SciJavaPlugin;
+
+public interface Op extends SciJavaPlugin {
+	// Marker interface.
+}
diff --git a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpCollection.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpCollection.java
new file mode 100644
index 000000000..8053cdd53
--- /dev/null
+++ b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpCollection.java
@@ -0,0 +1,8 @@
+package org.scijava.ops.api;
+
+import org.scijava.plugin.SciJavaPlugin;
+
+/** A plugin marking a collection of ops defined as instance fields. */
+public interface OpCollection extends SciJavaPlugin {
+	// Marker interface.
+}
diff --git a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpDependency.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpDependency.java
new file mode 100644
index 000000000..07155e640
--- /dev/null
+++ b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpDependency.java
@@ -0,0 +1,18 @@
+package org.scijava.ops.api;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/** Annotates a helper op as a field that should be auto injected.*/
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.FIELD, ElementType.PARAMETER})
+public @interface OpDependency {
+	
+	/** The name of the Op to inject. */
+	String name();
+	
+	/** Set to false if the dependency should not be adapted */
+	boolean adaptable() default true;
+}
diff --git a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpField.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpField.java
new file mode 100644
index 000000000..cbf15ac46
--- /dev/null
+++ b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpField.java
@@ -0,0 +1,24 @@
+package org.scijava.ops.api;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.scijava.Priority;
+
+/** Annotates an op declared as a field in an {@link OpCollection}. */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface OpField {
+
+	String names();
+
+	// the names of the parameters (inputs and outputs) that will appear in a call
+	// to help().
+	//TODO: add default names support in OpFieldInfo
+	String[] params() default "";
+
+	double priority() default Priority.NORMAL;
+
+}
diff --git a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpMethod.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpMethod.java
new file mode 100644
index 000000000..d01ac1d4f
--- /dev/null
+++ b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpMethod.java
@@ -0,0 +1,53 @@
+/*
+ * #%L
+ * ImageJ software for multidimensional image processing and analysis.
+ * %%
+ * Copyright (C) 2014 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison and University of Konstanz.
+ * %%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.ops.api;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.scijava.Priority;
+
+/**
+ * @author Marcel Wiedenmann
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface OpMethod {
+
+	String names();
+
+	Class<?> type();
+
+	double priority() default Priority.NORMAL;
+
+}
\ No newline at end of file

From ded809f47b58804173a4608828abd039febab292 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Wed, 21 Jul 2021 10:25:41 -0500
Subject: [PATCH 74/91] Remove subpackage dependence rule

We need a TEMPORARY removal of this rule to partition out the modules
---
 pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pom.xml b/pom.xml
index 2f38e2560..b9ffa7553 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,6 +145,7 @@
 							</rules>
 						</configuration>
 					</execution>
+					<!--
 					<execution>
 						<id>enforce-no-subpackage-dependence</id>
 						<goals>
@@ -158,6 +159,7 @@
 							</rules>
 						</configuration>
 					</execution>
+					-->
 				</executions>
 			</plugin>
 		</plugins>

From 80e16db377d96c3a9dd539cdf8533d1ee826db08 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Wed, 21 Jul 2021 10:26:14 -0500
Subject: [PATCH 75/91] Refactor ops to use org.scijava.ops.api.Op

---
 imagej/imagej-ops2/src/main/java/module-info.java          | 1 +
 .../src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java     | 2 +-
 .../net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java  | 2 +-
 .../java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java    | 2 +-
 .../java/net/imagej/ops2/coloc/pValue/DefaultPValue.java   | 2 +-
 .../net/imagej/ops2/coloc/pearsons/DefaultPearsons.java    | 2 +-
 .../java/net/imagej/ops2/convert/clip/ClipRealTypes.java   | 2 +-
 .../java/net/imagej/ops2/convert/copy/CopyRealTypes.java   | 2 +-
 .../src/main/java/net/imagej/ops2/copy/CopyArrayImg.java   | 2 +-
 .../src/main/java/net/imagej/ops2/copy/CopyII.java         | 2 +-
 .../src/main/java/net/imagej/ops2/copy/CopyImg.java        | 2 +-
 .../main/java/net/imagej/ops2/copy/CopyImgLabeling.java    | 2 +-
 .../java/net/imagej/ops2/copy/CopyLabelingMapping.java     | 2 +-
 .../src/main/java/net/imagej/ops2/copy/CopyRAI.java        | 2 +-
 .../src/main/java/net/imagej/ops2/copy/CopyType.java       | 2 +-
 .../net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java | 2 +-
 .../ops2/deconvolve/NonCirculantNormalizationFactor.java   | 2 +-
 .../java/net/imagej/ops2/deconvolve/RichardsonLucyC.java   | 2 +-
 .../imagej/ops2/deconvolve/RichardsonLucyCorrection.java   | 2 +-
 .../java/net/imagej/ops2/deconvolve/RichardsonLucyF.java   | 2 +-
 .../java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java | 2 +-
 .../net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java | 2 +-
 .../net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java   | 2 +-
 .../ops2/deconvolve/accelerate/VectorAccelerator.java      | 2 +-
 .../src/main/java/net/imagej/ops2/eval/DefaultEval.java    | 2 +-
 .../src/main/java/net/imagej/ops2/eval/OpEvaluator.java    | 2 +-
 .../java/net/imagej/ops2/features/haralick/DefaultASM.java | 2 +-
 .../ops2/features/haralick/DefaultClusterPromenence.java   | 2 +-
 .../imagej/ops2/features/haralick/DefaultClusterShade.java | 2 +-
 .../net/imagej/ops2/features/haralick/DefaultContrast.java | 2 +-
 .../imagej/ops2/features/haralick/DefaultCorrelation.java  | 2 +-
 .../ops2/features/haralick/DefaultDifferenceEntropy.java   | 2 +-
 .../ops2/features/haralick/DefaultDifferenceVariance.java  | 2 +-
 .../net/imagej/ops2/features/haralick/DefaultEntropy.java  | 2 +-
 .../net/imagej/ops2/features/haralick/DefaultICM1.java     | 2 +-
 .../net/imagej/ops2/features/haralick/DefaultICM2.java     | 2 +-
 .../net/imagej/ops2/features/haralick/DefaultIFDM.java     | 2 +-
 .../ops2/features/haralick/DefaultMaxProbability.java      | 2 +-
 .../imagej/ops2/features/haralick/DefaultSumAverage.java   | 2 +-
 .../imagej/ops2/features/haralick/DefaultSumEntropy.java   | 2 +-
 .../imagej/ops2/features/haralick/DefaultSumVariance.java  | 2 +-
 .../ops2/features/haralick/DefaultTextureHomogeneity.java  | 2 +-
 .../net/imagej/ops2/features/haralick/DefaultVariance.java | 2 +-
 .../net/imagej/ops2/features/haralick/helper/CoocHXY.java  | 2 +-
 .../imagej/ops2/features/haralick/helper/CoocMeanX.java    | 2 +-
 .../imagej/ops2/features/haralick/helper/CoocMeanY.java    | 2 +-
 .../net/imagej/ops2/features/haralick/helper/CoocPX.java   | 2 +-
 .../imagej/ops2/features/haralick/helper/CoocPXMinusY.java | 2 +-
 .../imagej/ops2/features/haralick/helper/CoocPXPlusY.java  | 2 +-
 .../net/imagej/ops2/features/haralick/helper/CoocPY.java   | 2 +-
 .../net/imagej/ops2/features/haralick/helper/CoocStdX.java | 2 +-
 .../net/imagej/ops2/features/haralick/helper/CoocStdY.java | 2 +-
 .../ops2/features/hog/HistogramOfOrientedGradients2D.java  | 2 +-
 .../java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java  | 2 +-
 .../ops2/features/tamura2d/DefaultCoarsenessFeature.java   | 2 +-
 .../ops2/features/tamura2d/DefaultContrastFeature.java     | 2 +-
 .../features/tamura2d/DefaultDirectionalityFeature.java    | 2 +-
 .../ops2/features/zernike/DefaultMagnitudeFeature.java     | 2 +-
 .../imagej/ops2/features/zernike/DefaultPhaseFeature.java  | 2 +-
 .../net/imagej/ops2/features/zernike/ZernikeComputer.java  | 2 +-
 .../net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java | 2 +-
 .../net/imagej/ops2/filter/bilateral/DefaultBilateral.java | 2 +-
 .../java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java | 2 +-
 .../java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java | 2 +-
 .../net/imagej/ops2/filter/convolve/ConvolveNaiveC.java    | 2 +-
 .../net/imagej/ops2/filter/convolve/ConvolveNaiveF.java    | 2 +-
 .../net/imagej/ops2/filter/correlate/CorrelateFFTC.java    | 2 +-
 .../net/imagej/ops2/filter/correlate/CorrelateFFTF.java    | 2 +-
 .../ops2/filter/derivative/PartialDerivativeRAI.java       | 2 +-
 .../ops2/filter/derivative/PartialDerivativesRAI.java      | 2 +-
 .../filter/derivativeGauss/DefaultDerivativeGauss.java     | 2 +-
 .../main/java/net/imagej/ops2/filter/dog/DefaultDoG.java   | 2 +-
 .../java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java  | 2 +-
 .../net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java | 2 +-
 .../java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java     | 2 +-
 .../java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java     | 2 +-
 .../imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java  | 2 +-
 .../net/imagej/ops2/filter/fftSize/ComputeFFTSize.java     | 2 +-
 .../imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java  | 2 +-
 .../java/net/imagej/ops2/filter/hessian/HessianRAI.java    | 2 +-
 .../java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java   | 2 +-
 .../java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java   | 2 +-
 .../java/net/imagej/ops2/filter/max/DefaultMaxFilter.java  | 2 +-
 .../net/imagej/ops2/filter/mean/DefaultMeanFilter.java     | 2 +-
 .../net/imagej/ops2/filter/median/DefaultMedianFilter.java | 2 +-
 .../java/net/imagej/ops2/filter/min/DefaultMinFilter.java  | 2 +-
 .../net/imagej/ops2/filter/pad/DefaultPadInputFFT.java     | 2 +-
 .../imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java   | 2 +-
 .../src/main/java/net/imagej/ops2/filter/pad/PadInput.java | 2 +-
 .../net/imagej/ops2/filter/pad/PadInputFFTMethods.java     | 2 +-
 .../java/net/imagej/ops2/filter/pad/PadShiftKernel.java    | 2 +-
 .../imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java   | 2 +-
 .../imagej/ops2/filter/pad/PaddingIntervalCentered.java    | 2 +-
 .../net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java  | 2 +-
 .../net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java   | 2 +-
 .../main/java/net/imagej/ops2/filter/sobel/SobelRAI.java   | 2 +-
 .../net/imagej/ops2/filter/tubeness/DefaultTubeness.java   | 2 +-
 .../imagej/ops2/filter/variance/DefaultVarianceFilter.java | 2 +-
 .../net/imagej/ops2/filter/vesselness/DefaultFrangi.java   | 2 +-
 .../src/main/java/net/imagej/ops2/geom/CentroidII.java     | 2 +-
 .../java/net/imagej/ops2/geom/CentroidLabelRegion.java     | 2 +-
 .../src/main/java/net/imagej/ops2/geom/CentroidMesh.java   | 2 +-
 .../main/java/net/imagej/ops2/geom/CentroidPolygon.java    | 2 +-
 .../java/net/imagej/ops2/geom/DefaultCenterOfGravity.java  | 2 +-
 .../src/main/java/net/imagej/ops2/geom/SizeII.java         | 2 +-
 .../geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java  | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java    | 2 +-
 .../imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java    | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultCircularity.java    | 2 +-
 .../java/net/imagej/ops2/geom/geom2d/DefaultContour.java   | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java   | 2 +-
 .../imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java   | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultEccentricity.java   | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultElongation.java     | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java    | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java | 2 +-
 .../ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java    | 2 +-
 .../java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java   | 2 +-
 .../imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java  | 2 +-
 .../ops2/geom/geom2d/DefaultMaximumFeretDiameter.java      | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java   | 2 +-
 .../imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java  | 2 +-
 .../ops2/geom/geom2d/DefaultMinimumFeretDiameter.java      | 2 +-
 .../java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java | 2 +-
 .../imagej/ops2/geom/geom2d/DefaultPerimeterLength.java    | 2 +-
 .../java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java | 2 +-
 .../ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java     | 2 +-
 .../net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java    | 2 +-
 .../geom/geom2d/DefaultSmallestEnclosingRectangle.java     | 2 +-
 .../imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java    | 2 +-
 .../geom/geom2d/DefaultVerticesCountConvexHullPolygon.java | 2 +-
 .../ops2/geom/geom2d/DefaultVerticesCountPolygon.java      | 2 +-
 .../net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java   | 2 +-
 .../net/imagej/ops2/geom/geom3d/DefaultCompactness.java    | 2 +-
 .../net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java   | 2 +-
 .../net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java  | 2 +-
 .../imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java    | 2 +-
 .../ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java       | 2 +-
 .../net/imagej/ops2/geom/geom3d/DefaultMainElongation.java | 2 +-
 .../net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java  | 2 +-
 .../imagej/ops2/geom/geom3d/DefaultMedianElongation.java   | 2 +-
 .../net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java   | 2 +-
 .../net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java  | 2 +-
 .../net/imagej/ops2/geom/geom3d/DefaultSphericity.java     | 2 +-
 .../net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java    | 2 +-
 .../ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java | 2 +-
 .../geom/geom3d/DefaultVerticesCountConvexHullMesh.java    | 2 +-
 .../imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java  | 2 +-
 .../ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java      | 2 +-
 .../net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java     | 2 +-
 .../net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java | 2 +-
 .../src/main/java/net/imagej/ops2/help/HelpForName.java    | 2 +-
 .../java/net/imagej/ops2/identity/DefaultIdentity.java     | 2 +-
 .../java/net/imagej/ops2/image/ascii/DefaultASCII.java     | 2 +-
 .../ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java  | 2 +-
 .../distancetransform/CalibratedDistanceTransformer.java   | 2 +-
 .../DefaultDistanceTransformCalibration.java               | 2 +-
 .../ops2/image/distancetransform/DistanceTransformer.java  | 2 +-
 .../ops2/image/equation/DefaultCoordinatesEquation.java    | 2 +-
 .../net/imagej/ops2/image/equation/DefaultEquation.java    | 2 +-
 .../main/java/net/imagej/ops2/image/fill/DefaultFill.java  | 2 +-
 .../src/main/java/net/imagej/ops2/image/fill/FillRAI.java  | 2 +-
 .../net/imagej/ops2/image/histogram/HistogramCreate.java   | 2 +-
 .../net/imagej/ops2/image/integral/DefaultIntegralImg.java | 2 +-
 .../net/imagej/ops2/image/integral/SquareIntegralImg.java  | 2 +-
 .../net/imagej/ops2/image/integral/WrappedIntegralImg.java | 2 +-
 .../imagej/ops2/image/normalize/NormalizeIIComputer.java   | 2 +-
 .../imagej/ops2/image/normalize/NormalizeIIFunction.java   | 2 +-
 .../net/imagej/ops2/image/normalize/NormalizeIILazy.java   | 2 +-
 .../ops2/image/normalize/NormalizeIILazyFunction.java      | 2 +-
 .../java/net/imagej/ops2/image/watershed/Watershed.java    | 2 +-
 .../net/imagej/ops2/image/watershed/WatershedBinary.java   | 2 +-
 .../ops2/image/watershed/WatershedBinarySingleSigma.java   | 2 +-
 .../net/imagej/ops2/image/watershed/WatershedSeeded.java   | 2 +-
 .../centralmoments/DefaultCentralMoment00.java             | 2 +-
 .../centralmoments/DefaultCentralMoment01.java             | 2 +-
 .../centralmoments/DefaultCentralMoment02.java             | 2 +-
 .../centralmoments/DefaultCentralMoment03.java             | 2 +-
 .../centralmoments/DefaultCentralMoment10.java             | 2 +-
 .../centralmoments/DefaultCentralMoment11.java             | 2 +-
 .../centralmoments/DefaultCentralMoment12.java             | 2 +-
 .../centralmoments/DefaultCentralMoment20.java             | 2 +-
 .../centralmoments/DefaultCentralMoment21.java             | 2 +-
 .../centralmoments/DefaultCentralMoment30.java             | 2 +-
 .../centralmoments/IterableCentralMoment00.java            | 2 +-
 .../centralmoments/IterableCentralMoment11.java            | 2 +-
 .../net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java  | 2 +-
 .../net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java  | 2 +-
 .../net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java  | 2 +-
 .../net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java  | 2 +-
 .../net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java  | 2 +-
 .../net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java  | 2 +-
 .../net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java  | 2 +-
 .../imagej/ops2/imagemoments/moments/DefaultMoment00.java  | 2 +-
 .../imagej/ops2/imagemoments/moments/DefaultMoment01.java  | 2 +-
 .../imagej/ops2/imagemoments/moments/DefaultMoment10.java  | 2 +-
 .../imagej/ops2/imagemoments/moments/DefaultMoment11.java  | 2 +-
 .../DefaultNormalizedCentralMoment02.java                  | 2 +-
 .../DefaultNormalizedCentralMoment03.java                  | 2 +-
 .../DefaultNormalizedCentralMoment11.java                  | 2 +-
 .../DefaultNormalizedCentralMoment12.java                  | 2 +-
 .../DefaultNormalizedCentralMoment20.java                  | 2 +-
 .../DefaultNormalizedCentralMoment21.java                  | 2 +-
 .../DefaultNormalizedCentralMoment30.java                  | 2 +-
 .../main/java/net/imagej/ops2/labeling/MergeLabeling.java  | 2 +-
 .../main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java | 2 +-
 .../src/main/java/net/imagej/ops2/logic/Default.java       | 2 +-
 .../src/main/java/net/imagej/ops2/logic/Ternary.java       | 2 +-
 .../ops2/map/neighborhood/DefaultMapNeighborhood.java      | 2 +-
 .../ops2/map/neighborhood/MapNeighborhoodWithCenter.java   | 2 +-
 .../ops2/math/multiply/ComplexConjugateMultiplyOp.java     | 2 +-
 .../main/java/net/imagej/ops2/morphology/ExtractHoles.java | 2 +-
 .../main/java/net/imagej/ops2/morphology/FillHoles.java    | 2 +-
 .../src/main/java/net/imagej/ops2/morphology/Outline.java  | 2 +-
 .../java/net/imagej/ops2/morphology/thin/ThinGuoHall.java  | 2 +-
 .../java/net/imagej/ops2/morphology/thin/ThinHilditch.java | 2 +-
 .../net/imagej/ops2/morphology/thin/ThinMorphological.java | 2 +-
 .../net/imagej/ops2/morphology/thin/ThinZhangSuen.java     | 2 +-
 .../net/imagej/ops2/project/DefaultProjectParallel.java    | 2 +-
 .../imagej/ops2/project/ProjectRAIToIterableInterval.java  | 2 +-
 .../segment/detectJunctions/DefaultDetectJunctions.java    | 2 +-
 .../ops2/segment/detectRidges/DefaultDetectRidges.java     | 2 +-
 .../src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java  | 2 +-
 .../java/net/imagej/ops2/stats/DefaultGeometricMean.java   | 2 +-
 .../java/net/imagej/ops2/stats/DefaultHarmonicMean.java    | 2 +-
 .../main/java/net/imagej/ops2/stats/DefaultKurtosis.java   | 2 +-
 .../src/main/java/net/imagej/ops2/stats/DefaultMax.java    | 2 +-
 .../src/main/java/net/imagej/ops2/stats/DefaultMean.java   | 2 +-
 .../src/main/java/net/imagej/ops2/stats/DefaultMedian.java | 2 +-
 .../src/main/java/net/imagej/ops2/stats/DefaultMin.java    | 2 +-
 .../src/main/java/net/imagej/ops2/stats/DefaultMinMax.java | 2 +-
 .../net/imagej/ops2/stats/DefaultMoment1AboutMean.java     | 2 +-
 .../net/imagej/ops2/stats/DefaultMoment2AboutMean.java     | 2 +-
 .../net/imagej/ops2/stats/DefaultMoment3AboutMean.java     | 2 +-
 .../net/imagej/ops2/stats/DefaultMoment4AboutMean.java     | 2 +-
 .../net/imagej/ops2/stats/DefaultMomentNAboutMean.java     | 2 +-
 .../main/java/net/imagej/ops2/stats/DefaultPercentile.java | 2 +-
 .../main/java/net/imagej/ops2/stats/DefaultQuantile.java   | 2 +-
 .../src/main/java/net/imagej/ops2/stats/DefaultSize.java   | 2 +-
 .../main/java/net/imagej/ops2/stats/DefaultSkewness.java   | 2 +-
 .../net/imagej/ops2/stats/DefaultStandardDeviation.java    | 2 +-
 .../src/main/java/net/imagej/ops2/stats/DefaultSum.java    | 2 +-
 .../java/net/imagej/ops2/stats/DefaultSumOfInverses.java   | 2 +-
 .../main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java  | 2 +-
 .../java/net/imagej/ops2/stats/DefaultSumOfSquares.java    | 2 +-
 .../main/java/net/imagej/ops2/stats/DefaultVariance.java   | 2 +-
 .../src/main/java/net/imagej/ops2/stats/IntegralMean.java  | 2 +-
 .../src/main/java/net/imagej/ops2/stats/IntegralSum.java   | 2 +-
 .../main/java/net/imagej/ops2/stats/IntegralVariance.java  | 2 +-
 .../java/net/imagej/ops2/stats/IterableGeometricMean.java  | 2 +-
 .../java/net/imagej/ops2/stats/IterableHarmonicMean.java   | 2 +-
 .../src/main/java/net/imagej/ops2/stats/IterableMax.java   | 2 +-
 .../src/main/java/net/imagej/ops2/stats/IterableMean.java  | 2 +-
 .../src/main/java/net/imagej/ops2/stats/IterableMin.java   | 2 +-
 .../main/java/net/imagej/ops2/stats/IterableMinMax.java    | 2 +-
 .../net/imagej/ops2/stats/IterableMoment3AboutMean.java    | 2 +-
 .../net/imagej/ops2/stats/IterableMoment4AboutMean.java    | 2 +-
 .../src/main/java/net/imagej/ops2/stats/IterableSize.java  | 2 +-
 .../net/imagej/ops2/stats/IterableStandardDeviation.java   | 2 +-
 .../src/main/java/net/imagej/ops2/stats/IterableSum.java   | 2 +-
 .../java/net/imagej/ops2/stats/IterableSumOfInverses.java  | 2 +-
 .../main/java/net/imagej/ops2/stats/IterableSumOfLogs.java | 2 +-
 .../java/net/imagej/ops2/stats/IterableSumOfSquares.java   | 2 +-
 .../main/java/net/imagej/ops2/stats/IterableVariance.java  | 2 +-
 .../imagej/ops2/stats/regression/leastSquares/Quadric.java | 2 +-
 .../net/imagej/ops2/thread/chunker/ChunkerInterleaved.java | 2 +-
 .../net/imagej/ops2/thread/chunker/DefaultChunker.java     | 2 +-
 .../net/imagej/ops2/threshold/ApplyThresholdMethod.java    | 2 +-
 .../imagej/ops2/threshold/ApplyThresholdMethodLocal.java   | 2 +-
 .../ops2/threshold/apply/ApplyConstantThreshold.java       | 2 +-
 .../ops2/threshold/apply/ApplyThresholdComparable.java     | 2 +-
 .../ops2/threshold/apply/ApplyThresholdComparator.java     | 2 +-
 .../imagej/ops2/threshold/huang/ComputeHuangThreshold.java | 2 +-
 .../net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java | 2 +-
 .../threshold/intermodes/ComputeIntermodesThreshold.java   | 2 +-
 .../ops2/threshold/isoData/ComputeIsoDataThreshold.java    | 2 +-
 .../net/imagej/ops2/threshold/li/ComputeLiThreshold.java   | 2 +-
 .../localBernsen/ComputeLocalBernsenThreshold.java         | 2 +-
 .../ops2/threshold/localBernsen/LocalBernsenThreshold.java | 2 +-
 .../localContrast/ComputeLocalContrastThreshold.java       | 2 +-
 .../threshold/localContrast/LocalContrastThreshold.java    | 2 +-
 .../threshold/localMean/ComputeLocalMeanThreshold.java     | 2 +-
 .../localMean/ComputeLocalMeanThresholdIntegral.java       | 2 +-
 .../ops2/threshold/localMean/LocalMeanThreshold.java       | 2 +-
 .../threshold/localMedian/ComputeLocalMedianThreshold.java | 2 +-
 .../ops2/threshold/localMedian/LocalMedianThreshold.java   | 2 +-
 .../localMidGrey/ComputeLocalMidGreyThreshold.java         | 2 +-
 .../ops2/threshold/localMidGrey/LocalMidGreyThreshold.java | 2 +-
 .../localNiblack/ComputeLocalNiblackThreshold.java         | 2 +-
 .../localNiblack/ComputeLocalNiblackThresholdIntegral.java | 2 +-
 .../ops2/threshold/localNiblack/LocalNiblackThreshold.java | 2 +-
 .../localPhansalkar/ComputeLocalPhansalkarThreshold.java   | 2 +-
 .../ComputeLocalPhansalkarThresholdIntegral.java           | 2 +-
 .../localPhansalkar/LocalPhansalkarThreshold.java          | 2 +-
 .../localSauvola/ComputeLocalSauvolaThreshold.java         | 2 +-
 .../localSauvola/ComputeLocalSauvolaThresholdIntegral.java | 2 +-
 .../ops2/threshold/localSauvola/LocalSauvolaThreshold.java | 2 +-
 .../threshold/maxEntropy/ComputeMaxEntropyThreshold.java   | 2 +-
 .../maxLikelihood/ComputeMaxLikelihoodThreshold.java       | 2 +-
 .../imagej/ops2/threshold/mean/ComputeMeanThreshold.java   | 2 +-
 .../ops2/threshold/minError/ComputeMinErrorThreshold.java  | 2 +-
 .../ops2/threshold/minimum/ComputeMinimumThreshold.java    | 2 +-
 .../ops2/threshold/moments/ComputeMomentsThreshold.java    | 2 +-
 .../imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java   | 2 +-
 .../threshold/percentile/ComputePercentileThreshold.java   | 2 +-
 .../renyiEntropy/ComputeRenyiEntropyThreshold.java         | 2 +-
 .../imagej/ops2/threshold/rosin/ComputeRosinThreshold.java | 2 +-
 .../ops2/threshold/shanbhag/ComputeShanbhagThreshold.java  | 2 +-
 .../ops2/threshold/triangle/ComputeTriangleThreshold.java  | 2 +-
 .../net/imagej/ops2/threshold/yen/ComputeYenThreshold.java | 2 +-
 .../src/main/java/net/imagej/ops2/topology/BoxCount.java   | 2 +-
 .../eulerCharacteristic/EulerCharacteristic26N.java        | 2 +-
 .../EulerCharacteristic26NFloating.java                    | 2 +-
 .../ops2/topology/eulerCharacteristic/EulerCorrection.java | 2 +-
 .../main/java/net/imagej/ops2/transform/Transforms.java    | 2 +-
 .../src/test/java/net/imagej/ops2/AbstractOpTest.java      | 2 +-
 scijava/scijava-ops/pom.xml                                | 5 +++++
 scijava/scijava-ops/src/main/java/module-info.java         | 1 +
 scijava/scijava-ops/src/main/java/org/scijava/ops/Op.java  | 7 -------
 .../ops/adapt/complexLift/ComputersToFunctionsAndLift.java | 2 +-
 .../ops/adapt/complexLift/FunctionsToComputersAndLift.java | 2 +-
 .../adapt/functional/ComputersToFunctionsViaFunction.java  | 2 +-
 .../adapt/functional/ComputersToFunctionsViaSource.java    | 2 +-
 .../scijava/ops/adapt/functional/FunctionsToComputers.java | 2 +-
 .../scijava/ops/adapt/functional/InplacesToFunctions.java  | 2 +-
 .../scijava/ops/conversionLoss/IdentityLossReporter.java   | 2 +-
 .../java/org/scijava/ops/impl/DefaultOpEnvironment.java    | 2 +-
 .../java/org/scijava/ops/matcher/impl/DefaultOpRef.java    | 2 +-
 .../src/main/java/org/scijava/ops/math/Normalize.java      | 2 +-
 .../src/main/java/org/scijava/ops/simplify/Identity.java   | 2 +-
 .../org/scijava/ops/simplify/PrimitiveListSimplifier.java  | 2 +-
 .../java/org/scijava/ops/simplify/SimplifiedOpInfo.java    | 2 +-
 .../src/main/java/org/scijava/ops/stats/Mean.java          | 2 +-
 .../src/main/java/org/scijava/ops/stats/Size.java          | 2 +-
 .../src/main/java/org/scijava/ops/util/Adapt.java          | 2 +-
 .../test/java/org/scijava/ops/JavadocParameterTest.java    | 1 +
 .../src/test/java/org/scijava/ops/OpPriorityTest.java      | 3 ++-
 .../scijava-ops/src/test/java/org/scijava/ops/TestOps.java | 1 +
 .../src/test/java/org/scijava/ops/impl/OpCachingTest.java  | 2 +-
 .../org/scijava/ops/matcher/DefaultMatchingErrorTest.java  | 2 +-
 .../java/org/scijava/ops/matcher/MatchingWithAnyTest.java  | 2 +-
 .../test/java/org/scijava/ops/monitor/OpMonitorTest.java   | 2 +-
 .../java/org/scijava/ops/util/OpsAsParametersTest.java     | 2 +-
 scijava/scijava-ops/templates/main/java/module-info.vm     | 1 +
 .../ops/adapt/complexLift/ComputersToFunctionsAndLift.vm   | 2 +-
 .../ops/adapt/complexLift/FunctionsToComputersAndLift.vm   | 2 +-
 .../adapt/functional/ComputersToFunctionsViaFunction.vm    | 2 +-
 .../ops/adapt/functional/ComputersToFunctionsViaSource.vm  | 2 +-
 .../scijava/ops/adapt/functional/FunctionsToComputers.vm   | 2 +-
 .../scijava/ops/adapt/functional/InplacesToFunctions.vm    | 2 +-
 352 files changed, 356 insertions(+), 352 deletions(-)
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/Op.java

diff --git a/imagej/imagej-ops2/src/main/java/module-info.java b/imagej/imagej-ops2/src/main/java/module-info.java
index f2d48467b..77a79b22a 100644
--- a/imagej/imagej-ops2/src/main/java/module-info.java
+++ b/imagej/imagej-ops2/src/main/java/module-info.java
@@ -136,5 +136,6 @@
 	requires imglib2.algorithm.fft;
 	requires mines.jtk;
 	requires org.scijava.function;
+	requires org.scijava.ops.api;
 
 }
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java
index e0703369b..df5836b69 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java
@@ -38,7 +38,7 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java
index e2ce3e89f..f0a2c0d26 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java
@@ -38,7 +38,7 @@
 import net.imglib2.util.IterablePair;
 import net.imglib2.util.Pair;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java
index e1669bc7b..bfc67d420 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java
@@ -49,7 +49,7 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 import org.scijava.util.IntArray;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java
index 08afcec5e..8df887b18 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java
@@ -48,7 +48,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java
index 40385a7ac..d4c211451 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java
@@ -35,7 +35,7 @@
 import net.imglib2.util.IterablePair;
 import net.imglib2.util.Pair;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java
index 89b59a3d4..78a12381e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java
@@ -32,7 +32,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java
index 8e7e796ed..122effeb7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java
@@ -32,7 +32,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java
index 63501e636..ae952809c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java
@@ -39,7 +39,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java
index 9edc5dc11..d0458c9a6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java
@@ -36,7 +36,7 @@
 import net.imglib2.IterableInterval;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.util.Maps;
 import org.scijava.plugin.Plugin;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java
index 6effa322d..75a8c9219 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java
@@ -35,7 +35,7 @@
 import net.imglib2.type.NativeType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java
index 7b93b3365..ee465b296 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java
@@ -38,7 +38,7 @@
 import net.imglib2.util.Util;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java
index b179298c5..ee4060eb7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java
@@ -37,7 +37,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java
index 353ee023b..ad11c1477 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java
@@ -35,7 +35,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java
index 49471381a..03ba2033c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java
@@ -32,7 +32,7 @@
 import net.imglib2.type.Type;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java
index 5b770504f..6c3279e68 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java
@@ -42,7 +42,7 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java
index fe93429b3..24a3f744c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java
@@ -50,7 +50,7 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java
index a9aba9759..b3e9e3afd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java
@@ -45,7 +45,7 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java
index 5bae9dbd2..67de61ea6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java
@@ -44,7 +44,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java
index bf39470cc..28c3360f0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java
@@ -47,7 +47,7 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java
index 08317ddf4..cf1fa45fd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java
@@ -48,7 +48,7 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java
index 99a66ee55..0185e433e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java
@@ -45,7 +45,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java
index c9abb7585..d702ce771 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java
@@ -34,7 +34,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java
index 4bb65d8d7..6c4045443 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java
@@ -46,7 +46,7 @@
 import org.scijava.Priority;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.util.Adapt;
 import org.scijava.plugin.Plugin;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java
index 58ac47cac..a3c5de82e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java
@@ -32,7 +32,7 @@
 import java.util.Map;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpService;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/OpEvaluator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/OpEvaluator.java
index 12546598f..12bcc0310 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/OpEvaluator.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/OpEvaluator.java
@@ -37,7 +37,7 @@
 import java.util.Map;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpService;
 import org.scijava.ops.util.FunctionUtils;
 import org.scijava.parsington.Operator;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java
index e2ea01efd..3cdfc0db7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java
index 2ef4f3d8c..6b3389a83 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java
@@ -35,7 +35,7 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java
index 6226c6927..acaa22f87 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java
@@ -35,7 +35,7 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java
index 40c537e7a..1a6920555 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java
@@ -35,7 +35,7 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java
index ea36119b4..15513b7a3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java
@@ -35,7 +35,7 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java
index 1602ec07a..da7353f73 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java
@@ -35,7 +35,7 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java
index 0375c9fc8..26664dbfb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java
@@ -35,7 +35,7 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java
index 1b13d68fd..c4966cff9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java
index 447b5d8d4..4cd16aee4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java
@@ -37,7 +37,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java
index f334a8556..ff92c873b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java
@@ -37,7 +37,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java
index c2c314a23..699459a29 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java
index 61efd7f59..0fb3a1d81 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java
index 2a96f1f8d..377e0ae21 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java
@@ -36,7 +36,7 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java
index aa0abcbd0..90c242b19 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java
@@ -35,7 +35,7 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java
index 53e4c5d95..901b5a265 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java
@@ -37,7 +37,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java
index e48830613..f9ad577cf 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java
index f05cbb29b..7fe5bb88e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java
index c044a10f6..162545f53 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java
@@ -31,7 +31,7 @@
 
 import java.util.function.Function;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java
index f25e0865f..b3b274679 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java
@@ -32,7 +32,7 @@
 
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java
index 59f22517d..7f5a03ddb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java
@@ -33,7 +33,7 @@
 
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java
index 399fad6a6..ba542aef2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java
@@ -30,7 +30,7 @@
 
 import java.util.function.Function;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java
index a4e3662c3..de4bc75b7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java
@@ -30,7 +30,7 @@
 
 import java.util.function.Function;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java
index ca9153c64..096c79b18 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java
@@ -30,7 +30,7 @@
 
 import java.util.function.Function;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java
index 9513243e6..71511c03a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java
@@ -30,7 +30,7 @@
 
 import java.util.function.Function;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java
index 5a2c851d7..55a426832 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java
@@ -32,7 +32,7 @@
 
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java
index a4e52c429..75220e926 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java
@@ -33,7 +33,7 @@
 
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java
index f8a16ee73..a1b3f6e13 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java
@@ -59,7 +59,7 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java
index b3491eba6..acf65d632 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java
@@ -43,7 +43,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java
index 5faf234c5..22b9cafdd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java
@@ -48,7 +48,7 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java
index aa53bf2e4..87c33a3e8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java
index 8450fcf27..563073676 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java
@@ -45,7 +45,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java
index 78496aaab..847343b64 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java
@@ -34,7 +34,7 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java
index ded51a433..18eb2053d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java
@@ -34,7 +34,7 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/ZernikeComputer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/ZernikeComputer.java
index 498a1bd02..0a4dc0c38 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/ZernikeComputer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/ZernikeComputer.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java
index 2dfb81979..fb31115ab 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java
@@ -40,7 +40,7 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java
index 983c6e3f4..6e858642d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java
@@ -41,7 +41,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java
index eb4b7e003..6834b5eaf 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java
@@ -37,7 +37,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java
index 3de3ddb41..a706adcdb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java
@@ -47,7 +47,7 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java
index 56473fbbf..aa33cc1c6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java
@@ -39,7 +39,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java
index b7de5c4d7..056c304f9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java
@@ -45,7 +45,7 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java
index bdb1c3410..3454cd063 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java
@@ -36,7 +36,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java
index 4b5841ced..1ff727d3a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java
@@ -44,7 +44,7 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java
index aaaf17e62..eaeba696d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java
@@ -41,7 +41,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java
index e34c66743..1bcdf70b7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java
@@ -39,7 +39,7 @@
 import net.imglib2.view.composite.RealComposite;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java
index a7ff0bc40..5d52a34a0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java
@@ -42,7 +42,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java
index f7507eed3..72900c6b4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java
@@ -39,7 +39,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java
index d6af00693..8c9a86338 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java
@@ -37,7 +37,7 @@
 import net.imglib2.type.numeric.NumericType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java
index f50286375..30f77e548 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java
@@ -35,7 +35,7 @@
 import net.imglib2.img.Img;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java
index 0161724ff..4c79b19d6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java
@@ -38,7 +38,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java
index 0e65cdba2..4a2ee750f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java
@@ -41,7 +41,7 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java
index 7cd31aaa6..d433def2e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java
@@ -33,7 +33,7 @@
 import net.imglib2.algorithm.fft2.FFTMethods;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java
index 813762c08..e7f4ffefd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java
@@ -37,7 +37,7 @@
 import net.imglib2.util.ValuePair;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java
index 52e8e38c3..2b09acbfa 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java
@@ -33,7 +33,7 @@
 
 import net.imglib2.Dimensions;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java
index 04aff4d29..c47f9ab26 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java
@@ -39,7 +39,7 @@
 import net.imglib2.view.composite.RealComposite;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java
index 45a234480..130700c9a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java
@@ -38,7 +38,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java
index 6c8dd87a1..3d9994abe 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java
@@ -36,7 +36,7 @@
 import net.imglib2.type.numeric.ComplexType;
 
 import org.scijava.function.Inplaces;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java
index aa0bc71dc..07780357d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java
@@ -36,7 +36,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java
index d7acd365d..47cc85b8b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java
@@ -36,7 +36,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java
index 4bc3560d3..af15c3132 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java
@@ -35,7 +35,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java
index ce0a76af8..b9ed9a277 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java
@@ -35,7 +35,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java
index 18f0e9e63..7639b7f0b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java
@@ -37,7 +37,7 @@
 import net.imglib2.type.numeric.ComplexType;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.util.Adapt;
 import org.scijava.plugin.Plugin;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java
index 067e3eada..f9e7cd6df 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java
@@ -37,7 +37,7 @@
 import net.imglib2.type.numeric.ComplexType;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.util.Adapt;
 import org.scijava.plugin.Plugin;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java
index c7cbd0c32..ae9e706db 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java
@@ -42,7 +42,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java
index 22d5b9d31..8e5ab50d5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java
@@ -37,7 +37,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.util.Adapt;
 import org.scijava.plugin.Plugin;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java
index 4ea0a55db..61988fcda 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java
@@ -40,7 +40,7 @@
 import net.imglib2.util.Util;
 import net.imglib2.view.Views;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java
index 2c7e6e562..c0556b249 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java
@@ -37,7 +37,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.util.Adapt;
 import org.scijava.plugin.Plugin;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java
index 8cb3adb0d..2b743ba54 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java
@@ -39,7 +39,7 @@
 import net.imglib2.type.numeric.ComplexType;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java
index 03f1c32a9..c33f664f6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java
@@ -37,7 +37,7 @@
 import net.imglib2.type.numeric.ComplexType;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java
index e380bcd06..cdef07def 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java
@@ -38,7 +38,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java
index 7541ef050..9d480b53a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java
index 0a4f3cf74..e7b027236 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java
@@ -50,7 +50,7 @@
 
 import org.scijava.Cancelable;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java
index 00badca46..d4b29c523 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java
@@ -36,7 +36,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java
index c2562c205..0301409c4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java
@@ -42,7 +42,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 import Jama.EigenvalueDecomposition;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java
index 65525e556..ab3a990eb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java
@@ -36,7 +36,7 @@
 import net.imglib2.RealPoint;
 import net.imglib2.roi.IterableRegion;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java
index 032947322..06201bff6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java
@@ -36,7 +36,7 @@
 import net.imglib2.roi.IterableRegion;
 import net.imglib2.roi.labeling.LabelRegion;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java
index c90c39c0a..878daafc3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java
@@ -36,7 +36,7 @@
 import net.imglib2.RealPoint;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java
index 165349c08..344be0aa1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java
@@ -36,7 +36,7 @@
 import net.imglib2.roi.geom.real.Polygon2D;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java
index 14f6cea77..c2c3da402 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java
@@ -38,7 +38,7 @@
 import net.imglib2.roi.IterableRegion;
 import net.imglib2.type.numeric.RealType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java
index e0e803bb5..30cfe9439 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java
@@ -35,7 +35,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java
index da027659f..4e36fae8d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java
@@ -33,7 +33,7 @@
 import net.imglib2.roi.geom.real.Polygon2D;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java
index e37b9a7c3..318b9e502 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java
@@ -39,7 +39,7 @@
 import net.imglib2.roi.geom.real.DefaultWritablePolygon2D;
 import net.imglib2.roi.geom.real.Polygon2D;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java
index df1b47507..67e4c3d66 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java
@@ -33,7 +33,7 @@
 import net.imglib2.roi.geom.real.Polygon2D;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java
index 5c6208726..3527317e5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java
@@ -35,7 +35,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java
index e9a3f2a36..bc0491dc0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java
@@ -44,7 +44,7 @@
 import net.imglib2.util.Util;
 import net.imglib2.view.Views;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java
index 6432ec156..b808c30a3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java
@@ -40,7 +40,7 @@
 import net.imglib2.roi.geom.real.DefaultWritablePolygon2D;
 import net.imglib2.roi.geom.real.Polygon2D;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java
index 715e62ba9..73432d9e3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java
@@ -32,7 +32,7 @@
 import net.imglib2.roi.geom.real.Polygon2D;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java
index d7b982403..0e922df96 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java
@@ -35,7 +35,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java
index 46eff3164..ec67e41cb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java
@@ -38,7 +38,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java
index 2df120804..a35d772b9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java
@@ -34,7 +34,7 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java
index df81ac266..8a3411238 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java
@@ -34,7 +34,7 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java
index f062a425c..5015d7a2d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java
@@ -38,7 +38,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java
index 8a3487cfb..dd78d18d0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java
@@ -36,7 +36,7 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java
index 382504813..b09a4de31 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java
@@ -38,7 +38,7 @@
 import net.imglib2.util.Pair;
 import net.imglib2.util.ValuePair;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java
index ccc3cbe1c..0fa0ee394 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java
@@ -36,7 +36,7 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java
index c4a101b6d..e0af8b7c6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java
@@ -36,7 +36,7 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java
index cbc9565c3..9046a493f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java
@@ -41,7 +41,7 @@
 
 import org.apache.commons.math3.geometry.euclidean.twod.Line;
 import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java
index 733658c41..d02ac039f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java
@@ -36,7 +36,7 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java
index 6aa4b9612..79ace0ac5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java
@@ -36,7 +36,7 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java
index daaa95e90..d0cbc4c08 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java
@@ -36,7 +36,7 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java
index 88b72c028..b9d3507fc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java
@@ -42,7 +42,7 @@
 import net.imglib2.util.Pair;
 import net.imglib2.util.ValuePair;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java
index f343d27c6..c43e529be 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java
@@ -37,7 +37,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java
index cc6f04ff5..fc7d7bcd7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java
@@ -35,7 +35,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java
index a4d8817ba..c78fa0a2c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java
@@ -33,7 +33,7 @@
 import net.imglib2.roi.geom.real.Polygon2D;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java
index 1e6eb067d..f0deda47b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java
@@ -37,7 +37,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java
index 04ef57348..fe02b5646 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java
@@ -40,7 +40,7 @@
 import net.imglib2.roi.geom.real.Polygon2D;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java
index 076a2319e..4a7db78a6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java
@@ -33,7 +33,7 @@
 import net.imglib2.roi.geom.real.Polygon2D;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java
index bae0427eb..e2cdad3c2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java
@@ -36,7 +36,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java
index 85b106167..55d90a4b3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java
@@ -34,7 +34,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java
index 55c8554b3..c5da84f3c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java
@@ -33,7 +33,7 @@
 import net.imagej.ops2.geom.AbstractBoxivity;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java
index efdaf461b..67356552b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java
@@ -36,7 +36,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java
index 87b18885b..884ebb11f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java
@@ -44,7 +44,7 @@
 import net.imglib2.util.ValuePair;
 
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java
index af39027cd..a0960f89f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java
@@ -33,7 +33,7 @@
 import net.imagej.ops2.geom.AbstractConvexity;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java
index efd502ee0..aedbcbd2c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java
@@ -38,7 +38,7 @@
 
 import org.apache.commons.math3.linear.BlockRealMatrix;
 import org.apache.commons.math3.linear.RealMatrix;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java
index b4405aa0a..c004c7f0b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java
@@ -38,7 +38,7 @@
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
 import org.apache.commons.math3.linear.BlockRealMatrix;
 import org.apache.commons.math3.linear.RealMatrix;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java
index 0926d73d5..cf91544b9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java
@@ -38,7 +38,7 @@
 import org.apache.commons.math3.linear.RealMatrix;
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java
index fa4add7b2..7671c4d37 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java
@@ -43,7 +43,7 @@
 
 import org.apache.commons.math3.util.MathArrays;
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java
index 91eb2748b..b54d600b9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java
@@ -38,7 +38,7 @@
 import org.apache.commons.math3.linear.RealMatrix;
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java
index 1b96f50c9..34451abca 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java
@@ -33,7 +33,7 @@
 import net.imagej.ops2.geom.AbstractSolidity;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java
index 3a7d1d60c..2f9876e9e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java
@@ -38,7 +38,7 @@
 import org.apache.commons.math3.linear.RealMatrix;
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java
index 50b9a0387..029929cf4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java
@@ -36,7 +36,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java
index 3152931a4..6071541a3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java
@@ -36,7 +36,7 @@
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java
index 0f390ec00..1319f6009 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java
@@ -33,7 +33,7 @@
 import net.imagej.ops2.geom.AbstractBoundarySizeConvexHull;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java
index a17ae444b..51239c3fa 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java
@@ -36,7 +36,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java
index eee191d52..d524f597d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java
@@ -34,7 +34,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java
index 3beeddd1a..802ab93f4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java
@@ -33,7 +33,7 @@
 import net.imagej.ops2.geom.AbstractSizeConvexHull;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java
index f56b42084..764562c5d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java
@@ -36,7 +36,7 @@
 
 import org.apache.commons.math3.util.MathArrays;
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java
index aaacf1953..28604e216 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java
@@ -44,7 +44,7 @@
 
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java
index 5c62728a7..0577a4a51 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java
@@ -32,7 +32,7 @@
 import java.util.function.BiFunction;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpService;
 import org.scijava.plugin.Plugin;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java
index 85e63dbd5..957c9268b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java
@@ -30,7 +30,7 @@
 package net.imagej.ops2.identity;
 
 import org.scijava.function.Inplaces;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java
index f38e31472..30b338607 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java
@@ -37,7 +37,7 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java
index 1b776b40a..afc86df71 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java
@@ -7,7 +7,7 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java
index c04707f14..bd2ad7675 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java
@@ -36,7 +36,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java
index 70f5eac6f..7ec38908f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java
@@ -42,7 +42,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java
index a9b832761..e54d1e0a4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java
@@ -36,7 +36,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java
index 388e2cc06..4df6a5f0e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java
@@ -36,7 +36,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java
index 0f4bc7f00..7cf347b3c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java
@@ -41,7 +41,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpExecutionException;
 import org.scijava.plugin.Plugin;
 import org.scijava.script.ScriptLanguage;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java
index aa6305bf3..781ea28ca 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java
@@ -35,7 +35,7 @@
 import net.imglib2.type.Type;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java
index 3973c939e..0280e30b5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java
@@ -35,7 +35,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java
index 8027c3154..994376470 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java
@@ -37,7 +37,7 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.util.Pair;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java
index 61d45b698..5eddc412c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java
@@ -36,7 +36,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java
index 02cb1fd81..6672bdb87 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java
@@ -36,7 +36,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java
index 597f54ac1..504d292d7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java
@@ -38,7 +38,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java
index a1157fa85..de2a1f0de 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java
@@ -39,7 +39,7 @@
 import net.imglib2.util.Util;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java
index c9989a669..49595de1e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java
@@ -37,7 +37,7 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java
index 6dd30a4b1..7ede98158 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java
@@ -37,7 +37,7 @@
 import net.imglib2.util.Util;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java
index 1f6f3d671..c3c3f0066 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java
@@ -35,7 +35,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java
index c3daf9d52..70a3eadc6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java
@@ -56,7 +56,7 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java
index 638023d38..ffc075466 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java
@@ -43,7 +43,7 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java
index d8860a4a4..ce0a033c3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java
@@ -44,7 +44,7 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java
index 99852cf04..4f24ad3b1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java
@@ -66,7 +66,7 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java
index ffb8d92fe..3518fc11f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment01.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment01.java
index ab26a9f75..6db6cc574 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment01.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment01.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java
index e6cdaddcb..afc590e39 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java
@@ -39,7 +39,7 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java
index d104508cf..c397ecc8e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java
@@ -39,7 +39,7 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment10.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment10.java
index ff79fc2c3..f3d452a02 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment10.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment10.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java
index 89d4d103d..152e79b86 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java
@@ -35,7 +35,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java
index b434b8c3d..895c6f5e6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java
@@ -39,7 +39,7 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java
index 864670b03..9c82050d4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java
@@ -38,7 +38,7 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java
index a10239906..eb47849b6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java
@@ -39,7 +39,7 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java
index 52ae6216f..7497105b7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java
@@ -39,7 +39,7 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java
index 42db76fd4..e27476468 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java
@@ -35,7 +35,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java
index 74960e095..9db3b3b30 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java
@@ -35,7 +35,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java
index 5a0d99d20..2d34aa2d9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java
index c4ebbf48e..53b96b88b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java
index 3403b4e35..df125bb8b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java
index abe3beee4..ca68bb401 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java
index 313f95014..834a92d4a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java
index cc5218d1a..295780c27 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java
index 0c8c91645..0910b31ad 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment00.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment00.java
index 79c6b63f9..ae4577707 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment00.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment00.java
@@ -39,7 +39,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment01.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment01.java
index 86fece070..9ddb88c2f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment01.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment01.java
@@ -39,7 +39,7 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment10.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment10.java
index a8116c551..c144c3b32 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment10.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment10.java
@@ -39,7 +39,7 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment11.java
index 56c041ab8..6e72144c6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment11.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment11.java
@@ -39,7 +39,7 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java
index 5120d0f5a..0e3249b45 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java
index 47b902f0f..ad95b0261 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java
index ced69b790..f74703e55 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java
index e5177f8a4..5a13b2322 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java
index b431863af..da925084b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java
index 4797e930f..e1390e9ca 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java
index e6c6dc00e..08c82aa54 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java
index df1169551..18b9e3a33 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java
@@ -47,7 +47,7 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java
index f32038bfd..58cea4a11 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java
@@ -42,7 +42,7 @@
 import net.imglib2.type.numeric.integer.IntType;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java
index 5469fdf47..1513228de 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.Type;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java
index 39fa17bd7..347b98026 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.Type;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java
index 2d066491f..c23ba6b60 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java
@@ -39,7 +39,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java
index cfb7a604a..9a5feb4fa 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java
@@ -40,7 +40,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpEnvironment;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java
index 6a5549f2d..a43018d33 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "math.complexConjugateMultiply", priority = Priority.LOW)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java
index 965c16670..c883d96c6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java
@@ -38,7 +38,7 @@
 import net.imglib2.type.BooleanType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java
index 4287bd727..62bc52417 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java
@@ -38,7 +38,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java
index eef638723..5d334759b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java
@@ -45,7 +45,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java
index b6b26ba0c..8acebce49 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java
@@ -32,7 +32,7 @@
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.type.logic.BitType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java
index 865fc2d13..1c8f692f2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java
@@ -32,7 +32,7 @@
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.type.logic.BitType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java
index 4bc6d4f15..91afbccc0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java
@@ -32,7 +32,7 @@
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.type.logic.BitType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java
index 0ea8fe3ec..8a72de92d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java
@@ -32,7 +32,7 @@
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.type.logic.BitType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java
index 267fd2567..6d5241730 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java
@@ -38,7 +38,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "project",
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java
index 718787a79..9b20810d9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java
@@ -38,7 +38,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "project", priority = Priority.LOW)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java
index ccf043191..eb4ea7ccc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java
@@ -44,7 +44,7 @@
 import net.imglib2.roi.util.RealLocalizableRealPositionable;
 import net.imglib2.util.Intervals;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java
index 2031e8926..2fdc0c42b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java
@@ -48,7 +48,7 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java
index 638b7c8e9..c4afdcffe 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java
@@ -34,7 +34,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java
index 64d98c60d..c474a09f7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java
index 1b973d6c0..3c41f7fa5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java
index 5f52f97c5..f12342d38 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java
index 5b6dd1db9..dc2b74a60 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java
@@ -37,7 +37,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java
index daa04c775..c6744b3fc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java
@@ -34,7 +34,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java
index 752eee08b..c4796911b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java
index f73bcd126..5e3b38978 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java
@@ -37,7 +37,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java
index 798b14636..93c4dafc9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java
@@ -40,7 +40,7 @@
 import net.imglib2.util.ValuePair;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java
index 2b8e3f001..80a4713a1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java
index 580437db8..42d656617 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java
@@ -34,7 +34,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java
index 42659a5b1..a09cf4fcb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java
@@ -34,7 +34,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java
index 912152bbf..fa3fd3b1e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java
@@ -34,7 +34,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java
index aad8b6182..c6593b1c9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java
@@ -38,7 +38,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java
index 1f25b2258..d7514acbf 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java
@@ -32,7 +32,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java
index 70f119b42..3000726c5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java
@@ -37,7 +37,7 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 import org.scijava.util.ArrayUtils;
 import org.scijava.util.DoubleArray;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java
index 2a196d950..99a209690 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java
index 078a3964b..021b15378 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java
index 9df6818b8..0c28f58ff 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java
@@ -34,7 +34,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java
index 055bb38d6..25b13ade8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java
@@ -37,7 +37,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java
index 8daaa48bc..934860110 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java
@@ -38,7 +38,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java
index 8f1637fbc..63518b707 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java
@@ -39,7 +39,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java
index 16723f1de..2d5f5a53e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java
@@ -37,7 +37,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java
index a2380ebbd..c76598bc7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java
@@ -40,7 +40,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java
index 5b0f2017f..49490dca7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java
@@ -39,7 +39,7 @@
 import net.imglib2.view.composite.Composite;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java
index 783b94662..435206e9d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java
@@ -37,7 +37,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java
index 682eb7994..5ac4a986e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java
@@ -39,7 +39,7 @@
 import net.imglib2.view.composite.Composite;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java
index 426becb05..dc0472b7d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java
index 1d49209c3..ad539a9cc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java
index 10098cc3a..91762e55b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java
index 60fb024d9..dbf42154b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java
index 8b8c2bb2d..9b05338aa 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java
index 49879cfc2..424448db5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java
@@ -36,7 +36,7 @@
 import net.imglib2.util.Pair;
 import net.imglib2.util.ValuePair;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java
index ec872eee2..916de0dba 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java
@@ -32,7 +32,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java
index 6a6245307..e133b0ea6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java
@@ -32,7 +32,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java
index 95164e239..b125ded24 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java
index 688652f1d..0cf9add86 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java
index 85217c4ae..b6f828a36 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java
@@ -32,7 +32,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java
index 35d62ed81..cf2ff9554 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java
@@ -32,7 +32,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java
index 06734ee3d..fcde9f155 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java
@@ -32,7 +32,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java
index a636b53cd..382259b41 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java
@@ -32,7 +32,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java
index 571acba40..ba06e6a07 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java
index f93d0af9c..e18fa8181 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java
@@ -38,7 +38,7 @@
 import org.ojalgo.matrix.BasicMatrix;
 import org.ojalgo.matrix.PrimitiveMatrix;
 import org.ojalgo.random.Deterministic;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java
index facf43893..ad7d31e92 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java
@@ -35,7 +35,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java
index 4893ce2b8..1e6fca657 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java
@@ -35,7 +35,7 @@
 import java.util.concurrent.Future;
 
 import org.scijava.function.Inplaces;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethod.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethod.java
index 53c1a480b..15cb62e23 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethod.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethod.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java
index 1e7763ee4..649aa64a5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java
@@ -42,7 +42,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java
index d456c0d67..9194d2802 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java
@@ -35,7 +35,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.util.Adapt;
 import org.scijava.ops.util.Maps;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java
index f9faea52f..40cdbb297 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java
@@ -32,7 +32,7 @@
 import net.imglib2.type.logic.BitType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java
index 2d52e0955..8d0fbd552 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.logic.BitType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java
index 44ae98d05..abca95672 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java
@@ -33,7 +33,7 @@
 import net.imglib2.histogram.Histogram1d;
 import net.imglib2.type.numeric.RealType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 //NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java
index d0cc01c4c..746b3045e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java
index 451fd9935..bbbd55b4c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java
@@ -35,7 +35,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpExecutionException;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java
index e5660c56b..a4faf3c0d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpExecutionException;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java
index 5b5d75c32..0f68be40a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java
index f9e72d64b..30713f232 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java
@@ -37,7 +37,7 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java
index c6a01f7c1..2e16445e7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java
@@ -38,7 +38,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java
index 3d6f52822..098ec52e7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java
@@ -36,7 +36,7 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java
index c6140d2d2..da9915a13 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java
@@ -38,7 +38,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java
index 208e4198f..7c4e2d689 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java
@@ -35,7 +35,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java
index 5f157f905..224371bad 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java
@@ -39,7 +39,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java
index 10f170061..91224e25c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java
@@ -48,7 +48,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java
index 1fd103dda..b3b2f7ff9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java
index f7681e5b7..44b6fb8ea 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java
@@ -38,7 +38,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java
index 0e1cbf24b..bbc42be36 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java
@@ -37,7 +37,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java
index 44ae21f68..0bdf65a58 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java
@@ -39,7 +39,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java
index 6463c8247..4d7161b0b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java
@@ -35,7 +35,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java
index e742f8902..42b2f80a0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java
@@ -40,7 +40,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java
index bbda2088e..af451977a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java
@@ -47,7 +47,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java
index b26aec411..a4a457cf8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java
@@ -35,7 +35,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java
index d26e7e4d1..210919565 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java
@@ -40,7 +40,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java
index a7e4e6413..d1c714285 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java
@@ -47,7 +47,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java
index e22a53d47..bed97ba63 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java
@@ -35,7 +35,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java
index d1a10d3e5..1d5ee05a0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java
@@ -40,7 +40,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java
index a1e389f2f..b7617b0ec 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java
@@ -47,7 +47,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java
index 591f34e69..d9416e1ba 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java
index a90f10106..3ee001340 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java
@@ -35,7 +35,7 @@
 import net.imglib2.histogram.Histogram1d;
 import net.imglib2.type.numeric.RealType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 // This plugin code ported from the original MatLab code of the max likelihood
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java
index 29faffec7..85a58be77 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java
@@ -33,7 +33,7 @@
 import net.imglib2.histogram.Histogram1d;
 import net.imglib2.type.numeric.RealType;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java
index abd70abe0..926aabcf1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java
@@ -36,7 +36,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpExecutionException;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java
index 9a6e6bbaa..b0715d932 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java
@@ -35,7 +35,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java
index 507d439a7..d3762aa18 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java
index c851cc96b..b8e1a6397 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/percentile/ComputePercentileThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/percentile/ComputePercentileThreshold.java
index 0b3dcdffe..d4f70db60 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/percentile/ComputePercentileThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/percentile/ComputePercentileThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java
index bcc8870b1..d3c34b778 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java
index 2abcd7c12..9ad1ce023 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java
index a813983b6..b0c601b06 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java
index 00c949c64..249518b18 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java
index fe17fd56f..1cf3ff24c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java
index 820e9e0c4..472d6726e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java
@@ -47,7 +47,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java
index 437ecc440..fc32ef115 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java
index 8565bfcd3..7d72862d4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java
index 2e8d6bb11..b3048a118 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java
@@ -37,7 +37,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java
index b012e216e..e785395bd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java
@@ -34,7 +34,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java
index 784c211b1..bdb318f34 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java
@@ -50,8 +50,8 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.scijava.Context;
 import org.scijava.cache.CacheService;
-import org.scijava.ops.Op;
 import org.scijava.ops.OpHistoryService;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpService;
 import org.scijava.plugin.PluginService;
 import org.scijava.thread.ThreadService;
diff --git a/scijava/scijava-ops/pom.xml b/scijava/scijava-ops/pom.xml
index 892246bcf..905c4491b 100644
--- a/scijava/scijava-ops/pom.xml
+++ b/scijava/scijava-ops/pom.xml
@@ -121,6 +121,11 @@
 			<groupId>org.scijava</groupId>
 			<artifactId>scijava-common</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.scijava</groupId>
+			<artifactId>scijava-ops-api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.scijava</groupId>
 			<artifactId>scijava-struct</artifactId>
diff --git a/scijava/scijava-ops/src/main/java/module-info.java b/scijava/scijava-ops/src/main/java/module-info.java
index 213ec3e5c..61242154a 100644
--- a/scijava/scijava-ops/src/main/java/module-info.java
+++ b/scijava/scijava-ops/src/main/java/module-info.java
@@ -41,6 +41,7 @@
 	requires org.scijava;
 	requires org.scijava.function;
 	requires org.scijava.struct;
+	requires org.scijava.ops.api;
 	requires org.scijava.types;
 	requires javassist;
 	requires java.compiler;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/Op.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/Op.java
deleted file mode 100644
index 485783fd2..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/Op.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.scijava.ops;
-
-import org.scijava.plugin.SciJavaPlugin;
-
-public interface Op extends SciJavaPlugin {
-	// Marker interface.
-}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java
index 7e9f6b8ee..1a540774b 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java
@@ -75,7 +75,7 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java
index a3aaa5cad..3149a3362 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java
@@ -41,7 +41,7 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java
index d87cc3780..22c51dc03 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java
@@ -40,7 +40,7 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java
index ee70eb362..89a46d74b 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java
@@ -42,7 +42,7 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Producer;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java
index 0037ac545..2473a9b4c 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java
@@ -41,7 +41,7 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Producer;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java
index c3f5e132e..43cde5588 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java
@@ -41,7 +41,7 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/IdentityLossReporter.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/IdentityLossReporter.java
index 9659ed887..7381bf306 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/IdentityLossReporter.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/IdentityLossReporter.java
@@ -1,7 +1,7 @@
 
 package org.scijava.ops.conversionLoss;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpHints;
 import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
index 159f69fdc..5e7ba2143 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
@@ -57,7 +57,7 @@
 import org.scijava.ops.BaseOpHints.DependencyMatching;
 import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.ops.Hints;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpCandidate;
 import org.scijava.ops.OpCandidate.StatusCode;
 import org.scijava.ops.OpCollection;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/DefaultOpRef.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/DefaultOpRef.java
index ed18444e6..a3bc28bad 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/DefaultOpRef.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/DefaultOpRef.java
@@ -35,7 +35,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpRef;
 import org.scijava.ops.matcher.OpMatcher;
 import org.scijava.types.Types;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java
index 38dfb1881..854cba6d6 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java
@@ -3,7 +3,7 @@
 import java.util.Arrays;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 public class Normalize {
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Identity.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Identity.java
index 6aaa382a2..4237c8eb3 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Identity.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Identity.java
@@ -3,7 +3,7 @@
 
 import java.util.function.Function;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpHints;
 import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveListSimplifier.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveListSimplifier.java
index a0fc7f910..6f4d667bd 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveListSimplifier.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveListSimplifier.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import java.util.function.Function;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java
index 551522753..c9230cd49 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java
@@ -10,7 +10,7 @@
 import org.scijava.ValidityProblem;
 import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.ops.Hints;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpUtils;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java
index 6db29c485..56decb354 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java
@@ -3,7 +3,7 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpDependency;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Size.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Size.java
index f9c34d8df..8718f2424 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Size.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Size.java
@@ -4,7 +4,7 @@
 import java.util.function.Function;
 import java.util.stream.StreamSupport;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 public class Size {
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Adapt.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Adapt.java
index ed9f0c50c..58278ec2d 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Adapt.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Adapt.java
@@ -14,7 +14,7 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 
 /**
  * Utility providing adaptation between {@link Op} types.
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java
index 8069d0489..bd255e1a9 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java
@@ -15,6 +15,7 @@
 import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java
index aee9ea41f..8d20fcc38 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java
@@ -33,8 +33,9 @@
 import org.junit.Test;
 import org.scijava.Priority;
 import org.scijava.function.Producer;
-import org.scijava.types.Nil;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
+import org.scijava.types.Nil;
 
 public class OpPriorityTest extends AbstractTestEnvironment {
 	
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java
index a752e7c39..d5f0e489e 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java
@@ -5,6 +5,7 @@
 import java.util.function.Function;
 
 import org.scijava.function.Computers;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java
index cd98aea31..0c6cfc6f0 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java
@@ -41,7 +41,7 @@
 import org.scijava.Context;
 import org.scijava.function.Producer;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.OpEnvironment;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java
index eae5b56d1..38f4ee965 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java
@@ -7,7 +7,7 @@
 import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.OpField;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java
index 6df265558..a6b6589f0 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java
@@ -11,7 +11,7 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Producer;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Any;
 import org.scijava.types.TypeExtractor;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java
index b349c2036..f2c99ebaf 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java
@@ -11,7 +11,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpBuilder;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
index 7a916ed88..aa1c83816 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
@@ -7,7 +7,7 @@
 
 import org.junit.Test;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpBuilder;
 import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpField;
diff --git a/scijava/scijava-ops/templates/main/java/module-info.vm b/scijava/scijava-ops/templates/main/java/module-info.vm
index f667db44b..103d389d9 100644
--- a/scijava/scijava-ops/templates/main/java/module-info.vm
+++ b/scijava/scijava-ops/templates/main/java/module-info.vm
@@ -32,6 +32,7 @@ module org.scijava.ops {
 	requires org.scijava;
 	requires org.scijava.function;
 	requires org.scijava.struct;
+	requires org.scijava.ops.api;
 	requires org.scijava.types;
 	requires javassist;
 	requires java.compiler;
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.vm
index 93da58b1e..c05b32cc7 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.vm
@@ -75,7 +75,7 @@ import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.vm
index 72f65052c..7d75008fc 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.vm
@@ -41,7 +41,7 @@ import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.vm
index ac0e65fc3..f5933122b 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.vm
@@ -40,7 +40,7 @@ import java.util.function.Function;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.vm
index 99306c671..6057f045f 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.vm
@@ -42,7 +42,7 @@ import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Producer;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.vm
index f4879200b..7f3b89f3b 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.vm
@@ -41,7 +41,7 @@ import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Producer;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.vm
index 7e29a5268..eb7c0b972 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.vm
@@ -41,7 +41,7 @@ import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.OpDependency;
-import org.scijava.ops.Op;
+import org.scijava.ops.api.Op;
 import org.scijava.ops.OpCollection;
 import org.scijava.plugin.Plugin;
 

From 0f4af1f66e09854e2e7511f9f55ed8a6bf14067a Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Wed, 21 Jul 2021 10:43:54 -0500
Subject: [PATCH 76/91] Use org.scijava.ops.api.OpCollection

---
 .../main/java/net/imagej/ops2/convert/ConvertTypes.java   | 3 ++-
 .../src/main/java/net/imagej/ops2/convert/Converters.java | 3 ++-
 .../src/main/java/net/imagej/ops2/create/CreateTypes.java | 3 ++-
 .../src/main/java/net/imagej/ops2/create/Creators.java    | 3 ++-
 .../java/net/imagej/ops2/filter/addNoise/NoiseAdders.java | 3 ++-
 .../main/java/net/imagej/ops2/filter/gauss/Gaussians.java | 3 ++-
 .../imagej/ops2/image/integral/AbstractIntegralImg.java   | 3 ++-
 .../main/java/net/imagej/ops2/image/invert/Inverters.java | 3 ++-
 .../java/net/imagej/ops2/linalg/rotate/Rotations.java     | 3 ++-
 .../main/java/net/imagej/ops2/logic/BooleanTypeLogic.java | 3 ++-
 .../java/net/imagej/ops2/math/BinaryNumericTypeMath.java  | 3 ++-
 .../java/net/imagej/ops2/math/BinaryRealTypeMath.java     | 3 ++-
 .../java/net/imagej/ops2/math/NullaryNumericTypeMath.java | 3 ++-
 .../main/java/net/imagej/ops2/math/UnaryRealTypeMath.java | 3 ++-
 .../java/net/imagej/ops2/morphology/BlackTopHats.java     | 3 ++-
 .../src/main/java/net/imagej/ops2/morphology/Closes.java  | 3 ++-
 .../main/java/net/imagej/ops2/morphology/Dilations.java   | 3 ++-
 .../net/imagej/ops2/morphology/DistanceTransforms.java    | 3 ++-
 .../main/java/net/imagej/ops2/morphology/Erosions.java    | 3 ++-
 .../main/java/net/imagej/ops2/morphology/FloodFills.java  | 3 ++-
 .../src/main/java/net/imagej/ops2/morphology/Opens.java   | 3 ++-
 .../main/java/net/imagej/ops2/morphology/Table2Ds.java    | 3 ++-
 .../java/net/imagej/ops2/morphology/WhiteTopHats.java     | 3 ++-
 .../main/java/net/imagej/ops2/transform/Transforms.java   | 3 ++-
 .../net/imagej/ops2/types/adapt/LiftComputersToRAI.java   | 3 ++-
 .../net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java   | 3 ++-
 .../main/java/net/imagej/ops2/types/adapt/RAIToIIOps.java | 3 ++-
 .../net/imagej/ops2/types/maxValue/MaxValueRealTypes.java | 3 ++-
 .../net/imagej/ops2/types/minValue/MinValueRealTypes.java | 3 ++-
 .../src/test/java/net/imagej/ops2/slice/SliceTest.java    | 3 ++-
 .../java/net/imagej/ops2/types/TypeExtractorTests.java    | 3 ++-
 .../imagej/ops2/types/adapt/LiftComputersToRAITest.java   | 3 ++-
 .../imagej/ops2/types/adapt/LiftFunctionsToRAITest.java   | 3 ++-
 .../src/main/java/org/scijava/ops/OpCollection.java       | 8 --------
 .../scijava/ops/adapt/functional/InplacesToFunctions.java | 3 ++-
 .../java/org/scijava/ops/adapt/lift/ComputerToArrays.java | 3 ++-
 .../org/scijava/ops/adapt/lift/ComputerToIterables.java   | 3 ++-
 .../java/org/scijava/ops/adapt/lift/FunctionToArrays.java | 3 ++-
 .../org/scijava/ops/adapt/lift/FunctionToIterables.java   | 3 ++-
 .../java/org/scijava/ops/adapt/lift/InplaceToArrays.java  | 3 ++-
 .../ops/conversionLoss/PrimitiveArrayLossReporters.java   | 3 ++-
 .../ops/conversionLoss/PrimitiveLossReporters.java        | 3 ++-
 .../main/java/org/scijava/ops/copy/CopyOpCollection.java  | 3 ++-
 .../java/org/scijava/ops/create/CreateOpCollection.java   | 3 ++-
 .../java/org/scijava/ops/impl/DefaultOpEnvironment.java   | 4 ++--
 .../src/main/java/org/scijava/ops/math/Add.java           | 3 ++-
 .../main/java/org/scijava/ops/math/MathOpCollection.java  | 3 ++-
 .../src/main/java/org/scijava/ops/math/Power.java         | 3 ++-
 .../src/main/java/org/scijava/ops/math/Sqrt.java          | 3 ++-
 .../src/main/java/org/scijava/ops/math/Zero.java          | 3 ++-
 .../scijava/ops/simplify/PrimitiveArraySimplifiers.java   | 3 ++-
 .../org/scijava/ops/simplify/PrimitiveSimplifiers.java    | 3 ++-
 .../test/java/org/scijava/ops/JavadocParameterTest.java   | 1 +
 .../test/java/org/scijava/ops/OpBuilderNoOutputTest.java  | 3 ++-
 .../src/test/java/org/scijava/ops/OpBuilderTestOps.java   | 3 ++-
 .../org/scijava/ops/OpMethodDependencyPositionTest.java   | 1 +
 .../src/test/java/org/scijava/ops/OpMethodTest.java       | 3 ++-
 .../src/test/java/org/scijava/ops/OpMethodTestOps.java    | 3 ++-
 .../org/scijava/ops/adapt/OpAdaptationPriorityTest.java   | 3 ++-
 .../adapt/functional/ComputerToFunctionAdaptTestOps.java  | 3 ++-
 .../adapt/functional/FunctionToComputerAdaptTestOps.java  | 3 ++-
 .../org/scijava/ops/adapt/lift/ComputerToArraysTest.java  | 3 ++-
 .../org/scijava/ops/adapt/lift/FunctionToArraysTest.java  | 3 ++-
 .../org/scijava/ops/adapt/lift/InplaceToArraysTest.java   | 3 ++-
 .../java/org/scijava/ops/hints/AdaptationHintTest.java    | 3 ++-
 .../org/scijava/ops/hints/SimplificationHintTest.java     | 3 ++-
 .../src/test/java/org/scijava/ops/impl/OpCachingTest.java | 3 ++-
 .../org/scijava/ops/matcher/DefaultMatchingErrorTest.java | 3 ++-
 .../org/scijava/ops/matcher/MatchingWithGCSTTest.java     | 3 ++-
 .../java/org/scijava/ops/provenance/ProvenanceTest.java   | 2 +-
 .../ops/simplify/SimplificationAdaptationTest.java        | 3 ++-
 .../scijava/ops/simplify/SimplificationPriorityTest.java  | 3 ++-
 .../java/org/scijava/ops/simplify/SimplifyIOTest.java     | 3 ++-
 .../test/java/org/scijava/ops/simplify/SimplifyTest.java  | 3 ++-
 .../java/org/scijava/ops/util/OpsAsParametersTest.java    | 3 ++-
 .../scijava/ops/adapt/functional/InplacesToFunctions.vm   | 3 ++-
 .../java/org/scijava/ops/adapt/lift/ComputerToArrays.vm   | 3 ++-
 .../org/scijava/ops/adapt/lift/ComputerToIterables.vm     | 3 ++-
 .../java/org/scijava/ops/adapt/lift/FunctionToArrays.vm   | 3 ++-
 .../org/scijava/ops/adapt/lift/FunctionToIterables.vm     | 3 ++-
 .../java/org/scijava/ops/adapt/lift/InplaceToArrays.vm    | 3 ++-
 .../test/java/org/scijava/ops/OpBuilderTestOps.vm         | 3 ++-
 .../templates/test/java/org/scijava/ops/OpMethodTest.vm   | 3 ++-
 .../test/java/org/scijava/ops/OpMethodTestOps.vm          | 3 ++-
 .../adapt/functional/ComputerToFunctionAdaptTestOps.vm    | 3 ++-
 .../adapt/functional/FunctionToComputerAdaptTestOps.vm    | 3 ++-
 .../org/scijava/ops/adapt/lift/ComputerToArraysTest.vm    | 3 ++-
 .../org/scijava/ops/adapt/lift/FunctionToArraysTest.vm    | 3 ++-
 .../org/scijava/ops/adapt/lift/InplaceToArraysTest.vm     | 3 ++-
 89 files changed, 173 insertions(+), 95 deletions(-)
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/OpCollection.java

diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java
index 2ffe18766..5a96df358 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java
@@ -52,7 +52,8 @@
 import net.imglib2.type.numeric.real.FloatType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java
index 712e2b337..5ca4aaf36 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java
@@ -6,7 +6,8 @@
 import net.imglib2.type.Type;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java
index 5980ef8de..3cf48b911 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java
@@ -19,7 +19,8 @@
 import net.imglib2.type.numeric.real.FloatType;
 
 import org.scijava.function.Producer;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java
index 726d634a2..788bcf494 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java
@@ -42,7 +42,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Functions;
 import org.scijava.function.Producer;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java
index f1e64ac8a..7b0958779 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java
@@ -37,7 +37,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java
index 095144dcf..b174ff171 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java
@@ -47,7 +47,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/AbstractIntegralImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/AbstractIntegralImg.java
index c04f09d60..163f27fc8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/AbstractIntegralImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/AbstractIntegralImg.java
@@ -37,7 +37,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/Inverters.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/Inverters.java
index 7f6a29422..a246fa3bd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/Inverters.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/Inverters.java
@@ -13,7 +13,8 @@
 import net.imglib2.util.Util;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java
index aa12815c9..8bc573de7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java
@@ -37,7 +37,8 @@
 import org.joml.Vector3d;
 import org.joml.Vector3f;
 import org.scijava.function.Computers;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java
index 0ed24563d..e10fc0136 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java
@@ -32,7 +32,8 @@
 import net.imglib2.type.BooleanType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java
index f96d15294..e24b8aad9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java
@@ -34,7 +34,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java
index c579cb420..419bd1610 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java
@@ -32,7 +32,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java
index 5406f9776..b8e61dcd0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java
@@ -33,7 +33,8 @@
 import net.imglib2.type.numeric.NumericType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/UnaryRealTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/UnaryRealTypeMath.java
index a5cf84cb2..fc870c23b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/UnaryRealTypeMath.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/UnaryRealTypeMath.java
@@ -36,7 +36,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/BlackTopHats.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/BlackTopHats.java
index e43d392d8..48146f12f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/BlackTopHats.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/BlackTopHats.java
@@ -14,7 +14,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Closes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Closes.java
index 779f6bab4..02676588f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Closes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Closes.java
@@ -14,7 +14,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Dilations.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Dilations.java
index a021844b7..3fcbe6f0c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Dilations.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Dilations.java
@@ -14,7 +14,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java
index 551eb3eb4..60e7881d1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java
@@ -11,7 +11,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.ExceptionUtils;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Erosions.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Erosions.java
index e61ed8fc5..98b6fa78d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Erosions.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Erosions.java
@@ -14,7 +14,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java
index 75322dbb4..12ce4e777 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java
@@ -14,7 +14,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Opens.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Opens.java
index 050eaf44e..995e334c6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Opens.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Opens.java
@@ -14,7 +14,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java
index 91ab39dda..dc0c9c16a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java
@@ -21,7 +21,8 @@
 import net.imglib2.type.BooleanType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/WhiteTopHats.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/WhiteTopHats.java
index 2bde0e35e..6ef6a6555 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/WhiteTopHats.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/WhiteTopHats.java
@@ -14,7 +14,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java
index e785395bd..d96851b76 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java
@@ -35,7 +35,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java
index f47a9f3f8..95029075d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java
@@ -8,7 +8,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java
index 0423dfa33..dbb588441 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java
@@ -14,7 +14,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Functions;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/RAIToIIOps.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/RAIToIIOps.java
index 669669185..0a80c0389 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/RAIToIIOps.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/RAIToIIOps.java
@@ -6,7 +6,8 @@
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.view.Views;
 
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/maxValue/MaxValueRealTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/maxValue/MaxValueRealTypes.java
index 30d3920c2..3e8c340f1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/maxValue/MaxValueRealTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/maxValue/MaxValueRealTypes.java
@@ -24,7 +24,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 import net.imglib2.type.numeric.real.FloatType;
 
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/minValue/MinValueRealTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/minValue/MinValueRealTypes.java
index af28ece70..6f91dab1f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/minValue/MinValueRealTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/minValue/MinValueRealTypes.java
@@ -24,7 +24,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 import net.imglib2.type.numeric.real.FloatType;
 
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/slice/SliceTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/slice/SliceTest.java
index c8cc021ca..0bd6dbf89 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/slice/SliceTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/slice/SliceTest.java
@@ -51,7 +51,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/TypeExtractorTests.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/TypeExtractorTests.java
index f907e6f71..9cd8f0092 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/TypeExtractorTests.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/TypeExtractorTests.java
@@ -13,7 +13,8 @@
 import net.imglib2.type.numeric.integer.UnsignedByteType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.TypeExtractor;
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftComputersToRAITest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftComputersToRAITest.java
index af0e78c73..9feac0f50 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftComputersToRAITest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftComputersToRAITest.java
@@ -11,7 +11,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.types.Nil;
 import org.scijava.plugin.Plugin;
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAITest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAITest.java
index e0c082e95..14b942d0d 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAITest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAITest.java
@@ -15,7 +15,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpCollection.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpCollection.java
deleted file mode 100644
index 3b6d79a2b..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpCollection.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.scijava.ops;
-
-import org.scijava.plugin.SciJavaPlugin;
-
-/** A plugin marking a collection of ops defined as instance fields. */
-public interface OpCollection extends SciJavaPlugin {
-	// Marker interface.
-}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java
index 43cde5588..f4b9c1a60 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java
@@ -42,7 +42,8 @@
 import org.scijava.function.Inplaces;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java
index eebd67cb5..11208ff40 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java
@@ -38,7 +38,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.OpField;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java
index 83fb04be3..e0eab5392 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java
@@ -39,7 +39,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.OpField;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java
index 25f1a5689..fa22856a1 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java
@@ -40,7 +40,8 @@
 
 import org.scijava.function.Functions;
 import org.scijava.ops.OpField;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java
index 0c6cb0452..892121704 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java
@@ -40,7 +40,8 @@
 
 import org.scijava.function.Functions;
 import org.scijava.ops.OpField;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java
index 3e58d7558..cd3d7e3ff 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java
@@ -38,7 +38,8 @@
 
 import org.scijava.function.Inplaces;
 import org.scijava.ops.OpField;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java
index 29781f59b..d84ec3c9e 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java
@@ -1,6 +1,7 @@
 package org.scijava.ops.conversionLoss;
 
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.ops.OpHints;
 import org.scijava.ops.BaseOpHints.Simplification;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveLossReporters.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveLossReporters.java
index f2d428fc4..13a4997bf 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveLossReporters.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveLossReporters.java
@@ -1,7 +1,8 @@
 
 package org.scijava.ops.conversionLoss;
 
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.ops.OpHints;
 import org.scijava.ops.BaseOpHints.Simplification;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/copy/CopyOpCollection.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/copy/CopyOpCollection.java
index 2e2c21cc3..95692d7cc 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/copy/CopyOpCollection.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/copy/CopyOpCollection.java
@@ -2,7 +2,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java
index fe6ee2f33..c9a7678a0 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java
@@ -5,7 +5,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Producer;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
index 5e7ba2143..8a36e58ea 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
@@ -57,10 +57,8 @@
 import org.scijava.ops.BaseOpHints.DependencyMatching;
 import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.ops.Hints;
-import org.scijava.ops.api.Op;
 import org.scijava.ops.OpCandidate;
 import org.scijava.ops.OpCandidate.StatusCode;
-import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.OpDependencyMember;
 import org.scijava.ops.OpEnvironment;
@@ -72,6 +70,8 @@
 import org.scijava.ops.OpRef;
 import org.scijava.ops.OpUtils;
 import org.scijava.ops.OpWrapper;
+import org.scijava.ops.api.Op;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.hint.AdaptationHints;
 import org.scijava.ops.hint.DefaultHints;
 import org.scijava.ops.hint.SimplificationHints;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Add.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Add.java
index 71324f789..84d321d04 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Add.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Add.java
@@ -11,7 +11,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOpCollection.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOpCollection.java
index 575f20bf1..876d23cdf 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOpCollection.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOpCollection.java
@@ -4,7 +4,8 @@
 import java.util.function.BinaryOperator;
 
 import org.scijava.Priority;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Power.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Power.java
index 2f971f6a8..c7c0e183e 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Power.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Power.java
@@ -3,7 +3,8 @@
 import java.util.function.BiFunction;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Sqrt.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Sqrt.java
index 02107ec02..8b820618a 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Sqrt.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Sqrt.java
@@ -4,7 +4,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java
index ca84cc9e4..3cf76cff3 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java
@@ -3,7 +3,8 @@
 import java.util.stream.IntStream;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveArraySimplifiers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveArraySimplifiers.java
index b2b470174..dbc5420b6 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveArraySimplifiers.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveArraySimplifiers.java
@@ -3,7 +3,8 @@
 
 import java.util.function.Function;
 
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.ops.OpHints;
 import org.scijava.ops.BaseOpHints.Simplification;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveSimplifiers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveSimplifiers.java
index b2c825e57..f58a50696 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveSimplifiers.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveSimplifiers.java
@@ -3,7 +3,8 @@
 
 import java.util.function.Function;
 
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.ops.OpHints;
 import org.scijava.ops.BaseOpHints.Simplification;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java
index bd255e1a9..1aa26bb58 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java
@@ -16,6 +16,7 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.api.Op;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderNoOutputTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderNoOutputTest.java
index 3c163f2b5..3e89dcc95 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderNoOutputTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderNoOutputTest.java
@@ -8,7 +8,8 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.scijava.ops.OpBuilder;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderTestOps.java
index 7e7df8702..4584a92b0 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderTestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderTestOps.java
@@ -37,7 +37,8 @@
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
 import org.scijava.ops.OpField;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodDependencyPositionTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodDependencyPositionTest.java
index 6cb0d1d87..5fd9de8bc 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodDependencyPositionTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodDependencyPositionTest.java
@@ -9,6 +9,7 @@
 import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.plugin.Plugin;
+import org.scijava.ops.api.OpCollection;
 
 @Plugin(type = OpCollection.class)
 public class OpMethodDependencyPositionTest extends AbstractTestEnvironment {
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java
index 313bd23f7..e3836c33d 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java
@@ -42,7 +42,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
index d67e346fe..44af0da5d 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
@@ -37,7 +37,8 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java
index 906836c14..557b02a03 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java
@@ -39,7 +39,8 @@
 import org.scijava.function.Producer;
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.OpBuilder;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.ops.adapt.functional.ComputersToFunctionsViaFunction;
 import org.scijava.ops.adapt.functional.ComputersToFunctionsViaSource;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java
index 453f7aeab..aa5f0fe88 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java
@@ -36,7 +36,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.OpField;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java
index 93bf96dfb..392f2a957 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java
@@ -39,7 +39,8 @@
 
 import org.scijava.function.Functions;
 import org.scijava.ops.OpField;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java
index 0903cf7a6..3d84fef97 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java
@@ -39,7 +39,8 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.OpField;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java
index 79d3285db..71e6fb476 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java
@@ -42,7 +42,8 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.OpField;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java
index 4a049ed93..b33ebf773 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java
@@ -39,7 +39,8 @@
 import org.scijava.function.Inplaces;
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.OpField;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/AdaptationHintTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/AdaptationHintTest.java
index a7c4d7955..cc45dd851 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/AdaptationHintTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/AdaptationHintTest.java
@@ -7,7 +7,8 @@
 import org.junit.Test;
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.Hints;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.ops.OpHints;
 import org.scijava.ops.BaseOpHints.Adaptation;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/SimplificationHintTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/SimplificationHintTest.java
index 618d6d3dd..6a8578b6c 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/SimplificationHintTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/SimplificationHintTest.java
@@ -8,7 +8,8 @@
 import org.junit.Test;
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.Hints;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.ops.OpHints;
 import org.scijava.ops.BaseOpHints.Adaptation;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java
index 0c6cfc6f0..9034e81f7 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java
@@ -42,7 +42,8 @@
 import org.scijava.function.Producer;
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.OpField;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java
index 38f4ee965..55e80ca7d 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java
@@ -8,7 +8,8 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java
index 37597f5c9..22dc4b212 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java
@@ -9,7 +9,8 @@
 import org.junit.Test;
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.OpBuilder;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java
index a9e50d1f5..d71dfa5e3 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java
@@ -14,13 +14,13 @@
 import org.scijava.function.Producer;
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.Hints;
-import org.scijava.ops.OpCollection;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.OpExecutionSummary;
 import org.scijava.ops.OpField;
 import org.scijava.ops.OpHistoryService;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpMethod;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.hint.DefaultHints;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationAdaptationTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationAdaptationTest.java
index 8c5b7f11b..677debf73 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationAdaptationTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationAdaptationTest.java
@@ -4,7 +4,8 @@
 import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationPriorityTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationPriorityTest.java
index 44824d677..9798c17df 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationPriorityTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationPriorityTest.java
@@ -8,7 +8,8 @@
 
 import org.junit.Test;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.ops.OpHints;
 import org.scijava.ops.BaseOpHints.Simplification;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyIOTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyIOTest.java
index 896a908fb..840619091 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyIOTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyIOTest.java
@@ -9,7 +9,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyTest.java
index 2c0515c4b..0bd983dbd 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyTest.java
@@ -7,7 +7,8 @@
 
 import org.junit.Test;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
index aa1c83816..cc93790e4 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
@@ -9,7 +9,8 @@
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.api.Op;
 import org.scijava.ops.OpBuilder;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.vm
index eb7c0b972..5b80a9f5c 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.vm
@@ -42,7 +42,8 @@ import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.OpDependency;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
 #set($classArity = $maxArity + 1)
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.vm
index b20e6bc33..b65ba53b6 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.vm
@@ -38,7 +38,8 @@ import java.util.function.Function;
 
 import org.scijava.function.Computers;
 import org.scijava.ops.OpField;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm
index 2b8f4d813..35d28d3cd 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm
@@ -39,7 +39,8 @@ import java.util.function.Function;
 
 import org.scijava.function.Computers;
 import org.scijava.ops.OpField;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.vm
index f98763699..4e7101229 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.vm
@@ -40,7 +40,8 @@ import java.util.function.Function;
 
 import org.scijava.function.Functions;
 import org.scijava.ops.OpField;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.vm
index f8bf9c9a3..bfe8931ac 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.vm
@@ -40,7 +40,8 @@ import java.util.function.Function;
 
 import org.scijava.function.Functions;
 import org.scijava.ops.OpField;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.vm
index a90ec37f6..174df13ee 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.vm
@@ -38,7 +38,8 @@ import java.util.function.Function;
 
 import org.scijava.function.Inplaces;
 import org.scijava.ops.OpField;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTestOps.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTestOps.vm
index e10b8b0c3..0b8608c07 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTestOps.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTestOps.vm
@@ -37,7 +37,8 @@ import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
 import org.scijava.ops.OpField;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTest.vm
index 2e06fa1f2..0053bf02e 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTest.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTest.vm
@@ -42,7 +42,8 @@ import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTestOps.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTestOps.vm
index 4361862ac..b8465805f 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTestOps.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTestOps.vm
@@ -37,7 +37,8 @@ import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm
index 1e3de0e7f..700df53ec 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm
@@ -36,7 +36,8 @@ package org.scijava.ops.adapt.functional;
 
 import org.scijava.function.Computers;
 import org.scijava.ops.OpField;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.vm
index 42676adbe..cc33dea3a 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.vm
@@ -39,7 +39,8 @@ import java.util.function.Function;
 
 import org.scijava.function.Functions;
 import org.scijava.ops.OpField;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.vm
index 202abac4d..606d1e185 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.vm
@@ -39,7 +39,8 @@ import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Computers;
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.OpField;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.vm
index 3730150da..f02f819a5 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.vm
@@ -42,7 +42,8 @@ import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Functions;
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.OpField;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.vm
index 61a50a6a3..91b13a2e1 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.vm
@@ -39,7 +39,8 @@ import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.OpField;
-import org.scijava.ops.OpCollection;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**

From b84353a63052b94dd09197c802255405bcfbcc1d Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Wed, 21 Jul 2021 11:13:01 -0500
Subject: [PATCH 77/91] Use org.scijava.ops.api.OpDependency

---
 .../java/net/imagej/ops2/coloc/icq/LiICQ.java |  3 ++-
 .../ops2/coloc/maxTKendallTau/MTKT.java       |  3 ++-
 .../ops2/coloc/pValue/DefaultPValue.java      |  3 ++-
 .../net/imagej/ops2/copy/CopyArrayImg.java    |  3 ++-
 .../java/net/imagej/ops2/copy/CopyII.java     |  3 ++-
 .../java/net/imagej/ops2/copy/CopyImg.java    |  3 ++-
 .../net/imagej/ops2/copy/CopyImgLabeling.java |  3 ++-
 .../java/net/imagej/ops2/copy/CopyRAI.java    |  3 ++-
 .../deconvolve/NonCirculantFirstGuess.java    |  3 ++-
 .../NonCirculantNormalizationFactor.java      |  3 ++-
 .../ops2/deconvolve/RichardsonLucyC.java      |  3 ++-
 .../deconvolve/RichardsonLucyCorrection.java  |  3 ++-
 .../ops2/deconvolve/RichardsonLucyF.java      |  3 ++-
 .../ops2/deconvolve/RichardsonLucyTVF.java    |  3 ++-
 .../deconvolve/RichardsonLucyTVUpdate.java    |  3 ++-
 .../ops2/deconvolve/RichardsonLucyUpdate.java |  3 ++-
 .../accelerate/VectorAccelerator.java         |  3 ++-
 .../haralick/AbstractHaralickFeature.java     |  3 ++-
 .../haralick/DefaultClusterPromenence.java    |  3 ++-
 .../haralick/DefaultClusterShade.java         |  3 ++-
 .../features/haralick/DefaultContrast.java    |  3 ++-
 .../features/haralick/DefaultCorrelation.java |  3 ++-
 .../haralick/DefaultDifferenceEntropy.java    |  3 ++-
 .../haralick/DefaultDifferenceVariance.java   |  3 ++-
 .../ops2/features/haralick/DefaultICM1.java   |  3 ++-
 .../ops2/features/haralick/DefaultICM2.java   |  3 ++-
 .../features/haralick/DefaultSumAverage.java  |  3 ++-
 .../features/haralick/DefaultSumEntropy.java  |  3 ++-
 .../features/haralick/DefaultSumVariance.java |  3 ++-
 .../features/haralick/helper/CoocHXY.java     |  3 ++-
 .../features/haralick/helper/CoocMeanX.java   |  3 ++-
 .../features/haralick/helper/CoocMeanY.java   |  3 ++-
 .../features/haralick/helper/CoocStdX.java    |  3 ++-
 .../features/haralick/helper/CoocStdY.java    |  3 ++-
 .../hog/HistogramOfOrientedGradients2D.java   |  3 ++-
 .../ops2/features/lbp2d/DefaultLBP2D.java     |  3 ++-
 .../tamura2d/DefaultCoarsenessFeature.java    |  3 ++-
 .../tamura2d/DefaultContrastFeature.java      |  3 ++-
 .../DefaultDirectionalityFeature.java         |  3 ++-
 .../zernike/DefaultMagnitudeFeature.java      |  3 ++-
 .../features/zernike/DefaultPhaseFeature.java |  3 ++-
 .../filter/FFTMethodsLinearFFTFilterC.java    |  3 ++-
 .../ops2/filter/convolve/ConvolveFFTC.java    |  3 ++-
 .../ops2/filter/convolve/ConvolveFFTF.java    |  3 ++-
 .../ops2/filter/convolve/ConvolveNaiveF.java  |  3 ++-
 .../ops2/filter/correlate/CorrelateFFTC.java  |  3 ++-
 .../ops2/filter/correlate/CorrelateFFTF.java  |  3 ++-
 .../derivative/PartialDerivativeRAI.java      |  3 ++-
 .../derivative/PartialDerivativesRAI.java     |  3 ++-
 .../DefaultDerivativeGauss.java               |  3 ++-
 .../imagej/ops2/filter/dog/DefaultDoG.java    |  3 ++-
 .../ops2/filter/dog/DoGVaryingSigmas.java     |  3 ++-
 .../filter/fft/CreateOutputFFTMethods.java    |  3 ++-
 .../imagej/ops2/filter/fft/FFTMethodsOpF.java |  3 ++-
 .../ops2/filter/hessian/HessianRAI.java       |  3 ++-
 .../ops2/filter/ifft/IFFTMethodsOpC.java      |  3 ++-
 .../ops2/filter/max/DefaultMaxFilter.java     |  3 ++-
 .../ops2/filter/mean/DefaultMeanFilter.java   |  3 ++-
 .../filter/median/DefaultMedianFilter.java    |  3 ++-
 .../ops2/filter/min/DefaultMinFilter.java     |  3 ++-
 .../ops2/filter/pad/DefaultPadInputFFT.java   |  3 ++-
 .../filter/pad/DefaultPadShiftKernelFFT.java  |  3 ++-
 .../net/imagej/ops2/filter/pad/PadInput.java  |  3 ++-
 .../imagej/ops2/filter/pad/PadInputFFT.java   |  3 ++-
 .../ops2/filter/pad/PadInputFFTMethods.java   |  3 ++-
 .../ops2/filter/pad/PadShiftKernel.java       |  3 ++-
 .../filter/pad/PadShiftKernelFFTMethods.java  |  3 ++-
 .../ops2/filter/sigma/DefaultSigmaFilter.java |  3 ++-
 .../imagej/ops2/filter/sobel/SobelRAI.java    |  3 ++-
 .../ops2/filter/tubeness/DefaultTubeness.java |  3 ++-
 .../variance/DefaultVarianceFilter.java       |  3 ++-
 .../geom/AbstractBoundarySizeConvexHull.java  |  3 ++-
 .../imagej/ops2/geom/AbstractBoxivity.java    |  3 ++-
 .../imagej/ops2/geom/AbstractConvexity.java   |  3 ++-
 .../ops2/geom/AbstractSizeConvexHull.java     |  3 ++-
 .../imagej/ops2/geom/AbstractSolidity.java    |  3 ++-
 .../net/imagej/ops2/geom/CentroidMesh.java    |  3 ++-
 .../net/imagej/ops2/geom/CentroidPolygon.java |  3 ++-
 .../ops2/geom/geom2d/DefaultCircularity.java  |  3 ++-
 .../ops2/geom/geom2d/DefaultEccentricity.java |  3 ++-
 .../ops2/geom/geom2d/DefaultElongation.java   |  3 ++-
 .../geom2d/DefaultFeretsDiameterForAngle.java |  3 ++-
 .../ops2/geom/geom2d/DefaultMajorAxis.java    |  3 ++-
 .../ops2/geom/geom2d/DefaultMaximumFeret.java |  3 ++-
 .../geom/geom2d/DefaultMaximumFeretAngle.java |  3 ++-
 .../geom2d/DefaultMaximumFeretDiameter.java   |  3 ++-
 .../ops2/geom/geom2d/DefaultMinimumFeret.java |  3 ++-
 .../geom/geom2d/DefaultMinimumFeretAngle.java |  3 ++-
 .../geom2d/DefaultMinimumFeretDiameter.java   |  3 ++-
 .../ops2/geom/geom2d/DefaultMinorAxis.java    |  3 ++-
 .../ops2/geom/geom2d/DefaultRoundness.java    |  3 ++-
 .../DefaultSmallestEnclosingRectangle.java    |  3 ++-
 ...DefaultVerticesCountConvexHullPolygon.java |  3 ++-
 .../ops2/geom/geom3d/DefaultCompactness.java  |  3 ++-
 .../geom/geom3d/DefaultInertiaTensor3D.java   |  3 ++-
 .../geom3d/DefaultInertiaTensor3DMesh.java    |  3 ++-
 .../geom/geom3d/DefaultMainElongation.java    |  3 ++-
 .../geom/geom3d/DefaultMarchingCubes.java     |  3 ++-
 .../geom/geom3d/DefaultMedianElongation.java  |  3 ++-
 .../geom/geom3d/DefaultSparenessMesh.java     |  3 ++-
 .../ops2/geom/geom3d/DefaultSphericity.java   |  3 ++-
 .../DefaultVerticesCountConvexHullMesh.java   |  3 ++-
 .../geom/geom3d/DefaultVoxelization3D.java    |  3 ++-
 .../imagej/ops2/image/ascii/DefaultASCII.java |  3 ++-
 .../CooccurrenceMatrix.java                   |  3 ++-
 .../ops2/image/histogram/HistogramCreate.java |  3 ++-
 .../imagej/ops2/image/invert/InvertII.java    |  3 ++-
 .../ops2/image/invert/InvertIIInteger.java    |  3 ++-
 .../image/normalize/NormalizeIIComputer.java  |  3 ++-
 .../image/normalize/NormalizeIIFunction.java  |  3 ++-
 .../ops2/image/normalize/NormalizeIILazy.java |  3 ++-
 .../normalize/NormalizeIILazyFunction.java    |  3 ++-
 .../ops2/image/watershed/Watershed.java       |  3 ++-
 .../ops2/image/watershed/WatershedBinary.java |  3 ++-
 .../watershed/WatershedBinarySingleSigma.java |  3 ++-
 .../ops2/image/watershed/WatershedSeeded.java |  3 ++-
 .../DefaultCentralMoment00.java               |  3 ++-
 .../DefaultCentralMoment02.java               |  3 ++-
 .../DefaultCentralMoment03.java               |  3 ++-
 .../DefaultCentralMoment11.java               |  3 ++-
 .../DefaultCentralMoment12.java               |  3 ++-
 .../DefaultCentralMoment20.java               |  3 ++-
 .../DefaultCentralMoment21.java               |  3 ++-
 .../DefaultCentralMoment30.java               |  3 ++-
 .../imagemoments/hu/DefaultHuMoment1.java     |  3 ++-
 .../imagemoments/hu/DefaultHuMoment2.java     |  3 ++-
 .../imagemoments/hu/DefaultHuMoment3.java     |  3 ++-
 .../imagemoments/hu/DefaultHuMoment4.java     |  3 ++-
 .../imagemoments/hu/DefaultHuMoment5.java     |  3 ++-
 .../imagemoments/hu/DefaultHuMoment6.java     |  3 ++-
 .../imagemoments/hu/DefaultHuMoment7.java     |  3 ++-
 .../DefaultNormalizedCentralMoment02.java     |  3 ++-
 .../DefaultNormalizedCentralMoment03.java     |  3 ++-
 .../DefaultNormalizedCentralMoment11.java     |  3 ++-
 .../DefaultNormalizedCentralMoment12.java     |  3 ++-
 .../DefaultNormalizedCentralMoment20.java     |  3 ++-
 .../DefaultNormalizedCentralMoment21.java     |  3 ++-
 .../DefaultNormalizedCentralMoment30.java     |  3 ++-
 .../imagej/ops2/labeling/MergeLabeling.java   |  3 ++-
 .../imagej/ops2/labeling/cca/DefaultCCA.java  |  3 ++-
 .../imagej/ops2/morphology/ExtractHoles.java  |  3 ++-
 .../net/imagej/ops2/morphology/FillHoles.java |  3 ++-
 .../ops2/morphology/thin/AbstractThin.java    |  3 ++-
 .../DefaultDetectJunctions.java               |  3 ++-
 .../detectRidges/DefaultDetectRidges.java     |  3 ++-
 .../ops2/stats/DefaultGeometricMean.java      |  3 ++-
 .../ops2/stats/DefaultHarmonicMean.java       |  3 ++-
 .../imagej/ops2/stats/DefaultKurtosis.java    |  3 ++-
 .../net/imagej/ops2/stats/DefaultMax.java     |  3 ++-
 .../net/imagej/ops2/stats/DefaultMean.java    |  3 ++-
 .../net/imagej/ops2/stats/DefaultMedian.java  |  3 ++-
 .../net/imagej/ops2/stats/DefaultMin.java     |  3 ++-
 .../ops2/stats/DefaultMoment1AboutMean.java   |  3 ++-
 .../ops2/stats/DefaultMoment2AboutMean.java   |  3 ++-
 .../ops2/stats/DefaultMoment3AboutMean.java   |  3 ++-
 .../ops2/stats/DefaultMoment4AboutMean.java   |  3 ++-
 .../ops2/stats/DefaultMomentNAboutMean.java   |  3 ++-
 .../imagej/ops2/stats/DefaultPercentile.java  |  3 ++-
 .../imagej/ops2/stats/DefaultSkewness.java    |  3 ++-
 .../ops2/stats/DefaultStandardDeviation.java  |  3 ++-
 .../ops2/stats/DefaultSumOfInverses.java      |  3 ++-
 .../imagej/ops2/stats/DefaultSumOfLogs.java   |  3 ++-
 .../ops2/stats/DefaultSumOfSquares.java       |  3 ++-
 .../imagej/ops2/stats/DefaultVariance.java    |  3 ++-
 .../ops2/stats/IterableMoment3AboutMean.java  |  3 ++-
 .../ops2/stats/IterableMoment4AboutMean.java  |  3 ++-
 .../threshold/AbstractApplyThresholdImg.java  |  3 ++-
 .../AbstractApplyThresholdIterable.java       |  3 ++-
 .../ApplyLocalThresholdIntegral.java          |  3 ++-
 .../ops2/threshold/ApplyThresholdMethod.java  |  3 ++-
 .../threshold/ApplyThresholdMethodLocal.java  |  3 ++-
 .../apply/ApplyConstantThreshold.java         |  3 ++-
 .../ComputeLocalBernsenThreshold.java         |  3 ++-
 .../localBernsen/LocalBernsenThreshold.java   |  3 ++-
 .../ComputeLocalContrastThreshold.java        |  3 ++-
 .../localContrast/LocalContrastThreshold.java |  3 ++-
 .../localMean/ComputeLocalMeanThreshold.java  |  3 ++-
 .../ComputeLocalMeanThresholdIntegral.java    |  3 ++-
 .../localMean/LocalMeanThreshold.java         |  3 ++-
 .../ComputeLocalMedianThreshold.java          |  3 ++-
 .../localMedian/LocalMedianThreshold.java     |  3 ++-
 .../ComputeLocalMidGreyThreshold.java         |  3 ++-
 .../localMidGrey/LocalMidGreyThreshold.java   |  3 ++-
 .../ComputeLocalNiblackThreshold.java         |  3 ++-
 .../ComputeLocalNiblackThresholdIntegral.java |  3 ++-
 .../localNiblack/LocalNiblackThreshold.java   |  3 ++-
 .../ComputeLocalPhansalkarThreshold.java      |  3 ++-
 ...mputeLocalPhansalkarThresholdIntegral.java |  3 ++-
 .../LocalPhansalkarThreshold.java             |  3 ++-
 .../ComputeLocalSauvolaThreshold.java         |  3 ++-
 .../ComputeLocalSauvolaThresholdIntegral.java |  3 ++-
 .../localSauvola/LocalSauvolaThreshold.java   |  3 ++-
 .../ops/AnnotatedOpDependencyMember.java      |  2 ++
 .../scijava/ops/FieldOpDependencyMember.java  |  1 +
 .../MethodParameterOpDependencyMember.java    |  2 ++
 .../java/org/scijava/ops/OpDependencies.java  |  2 ++
 .../java/org/scijava/ops/OpDependency.java    | 19 -------------------
 .../ComputersToFunctionsAndLift.java          |  3 ++-
 .../FunctionsToComputersAndLift.java          |  3 ++-
 .../ComputersToFunctionsViaFunction.java      |  3 ++-
 .../ComputersToFunctionsViaSource.java        |  3 ++-
 .../functional/FunctionsToComputers.java      |  3 ++-
 .../adapt/functional/InplacesToFunctions.java |  3 ++-
 .../ops/impl/DefaultOpEnvironment.java        |  2 +-
 .../scijava/ops/impl/DefaultOpHistory.java    |  2 +-
 .../ops/matcher/impl/OpMethodInfo.java        |  3 ++-
 .../main/java/org/scijava/ops/stats/Mean.java |  3 ++-
 .../struct/ClassOpDependencyMemberParser.java |  3 ++-
 .../ops/struct/JavadocParameterData.java      |  3 ++-
 .../MethodOpDependencyMemberParser.java       |  2 +-
 .../org/scijava/ops/util/OpMethodUtils.java   |  3 ++-
 .../org/scijava/ops/JavadocParameterTest.java |  1 +
 .../ops/OpMethodDependencyPositionTest.java   |  3 ++-
 .../java/org/scijava/ops/OpMethodTestOps.java |  2 +-
 .../org/scijava/ops/impl/OpCachingTest.java   |  3 ++-
 .../ops/matcher/DefaultMatchingErrorTest.java |  3 ++-
 .../ops/provenance/ProvenanceTest.java        |  2 +-
 .../ComputersToFunctionsAndLift.vm            |  3 ++-
 .../FunctionsToComputersAndLift.vm            |  3 ++-
 .../ComputersToFunctionsViaFunction.vm        |  3 ++-
 .../ComputersToFunctionsViaSource.vm          |  3 ++-
 .../adapt/functional/FunctionsToComputers.vm  |  3 ++-
 .../adapt/functional/InplacesToFunctions.vm   |  3 ++-
 223 files changed, 437 insertions(+), 236 deletions(-)
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/OpDependency.java

diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java
index df5836b69..375a72498 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java
@@ -39,7 +39,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java
index bfc67d420..484b0b05a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java
@@ -50,7 +50,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 import org.scijava.util.IntArray;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java
index 8df887b18..07c74f9d1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java
@@ -49,7 +49,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java
index ae952809c..4c924df4c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java
@@ -40,7 +40,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java
index d0458c9a6..db72e70f5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java
@@ -37,7 +37,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.util.Maps;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java
index 75a8c9219..4435a680d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java
@@ -36,7 +36,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java
index ee465b296..51a453247 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java
@@ -39,7 +39,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java
index ad11c1477..1a05fb37c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java
@@ -36,7 +36,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java
index 6c3279e68..2a3acb14b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java
@@ -43,7 +43,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java
index 24a3f744c..998b5365e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java
@@ -51,7 +51,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java
index b3e9e3afd..ae8575909 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java
@@ -46,7 +46,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java
index 67de61ea6..624414fe8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java
@@ -45,7 +45,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java
index 28c3360f0..91a3e170e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java
@@ -48,7 +48,8 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java
index cf1fa45fd..84deddd49 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java
@@ -49,7 +49,8 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java
index 0185e433e..6064adee7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java
@@ -46,7 +46,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java
index d702ce771..320466b7e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java
@@ -35,7 +35,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java
index 6c4045443..fa79cf9de 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java
@@ -47,7 +47,8 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.util.Adapt;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/AbstractHaralickFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/AbstractHaralickFeature.java
index 84ec9aa9c..bc9466597 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/AbstractHaralickFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/AbstractHaralickFeature.java
@@ -36,7 +36,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 
 /**
  * Abstract class for HaralickFeatures.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java
index 6b3389a83..752d69563 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java
@@ -36,7 +36,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java
index acaa22f87..8fd64f3f4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java
@@ -36,7 +36,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java
index 1a6920555..ae40dd4d3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java
@@ -36,7 +36,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java
index 15513b7a3..a9a61c679 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java
@@ -36,7 +36,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java
index da7353f73..dd67160f0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java
@@ -36,7 +36,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java
index 26664dbfb..6cac3860e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java
@@ -36,7 +36,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java
index 4cd16aee4..3323e91d3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java
@@ -38,7 +38,8 @@
 
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java
index ff92c873b..195fab579 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java
@@ -38,7 +38,8 @@
 
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java
index 377e0ae21..bdbea044d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java
@@ -37,7 +37,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java
index 90c242b19..30e029911 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java
@@ -36,7 +36,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java
index 901b5a265..b0e5bd0b1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java
@@ -38,7 +38,8 @@
 
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java
index 162545f53..31033ff5b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java
@@ -32,7 +32,8 @@
 import java.util.function.Function;
 
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java
index b3b274679..9c8c3a83b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java
@@ -33,7 +33,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java
index 7f5a03ddb..e73da2b1b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java
@@ -34,7 +34,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java
index 55a426832..c722fea64 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java
@@ -33,7 +33,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java
index 75220e926..ff54c4ec2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java
@@ -34,7 +34,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java
index a1b3f6e13..11683da13 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java
@@ -60,7 +60,8 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java
index acf65d632..19f632a4b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java
@@ -44,7 +44,8 @@
 
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java
index 22b9cafdd..bec3d0b07 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java
@@ -49,7 +49,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java
index 87c33a3e8..3569747a2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java
@@ -35,7 +35,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java
index 563073676..76591884b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java
@@ -46,7 +46,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java
index 847343b64..aa188be3b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java
@@ -35,7 +35,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java
index 18eb2053d..05b18c8a5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java
@@ -35,7 +35,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java
index fb31115ab..af85a9309 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java
@@ -41,7 +41,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java
index 6834b5eaf..5afeedf8a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java
@@ -38,7 +38,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java
index a706adcdb..172efc196 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java
@@ -48,7 +48,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java
index 056c304f9..d74eef54b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java
@@ -46,7 +46,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java
index 3454cd063..c35f4579c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java
@@ -37,7 +37,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java
index 1ff727d3a..fd839404e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java
@@ -45,7 +45,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java
index eaeba696d..e3730226d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java
@@ -42,7 +42,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java
index 1bcdf70b7..384d62d69 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java
@@ -40,7 +40,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java
index 5d52a34a0..37936f77c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java
@@ -43,7 +43,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java
index 72900c6b4..9328ce2e6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java
@@ -40,7 +40,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java
index 8c9a86338..adad42320 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java
@@ -38,7 +38,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java
index 30f77e548..57acf6634 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java
@@ -36,7 +36,8 @@
 
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java
index 4a2ee750f..7255913fb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java
@@ -42,7 +42,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java
index c47f9ab26..200333e1e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java
@@ -40,7 +40,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java
index 130700c9a..2e2fc966e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java
@@ -39,7 +39,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java
index 07780357d..b5ca96592 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java
@@ -37,7 +37,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java
index 47cc85b8b..bc543cc75 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java
@@ -37,7 +37,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java
index af15c3132..baaa327b6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java
@@ -36,7 +36,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java
index b9ed9a277..bdc194468 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java
@@ -36,7 +36,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java
index 7639b7f0b..93aaeb8ec 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java
@@ -38,7 +38,8 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.util.Adapt;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java
index f9e7cd6df..67014c327 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java
@@ -38,7 +38,8 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.util.Adapt;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java
index ae9e706db..96e70ae49 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java
@@ -43,7 +43,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFT.java
index 065e91c18..797807f62 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFT.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFT.java
@@ -43,7 +43,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 
 /**
  * Abstract Op used to pad the image by extending the borders optionally using
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java
index 8e5ab50d5..949e4e378 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java
@@ -38,7 +38,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.util.Adapt;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java
index 61988fcda..4ca93ccca 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java
@@ -41,7 +41,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java
index c0556b249..e59b07074 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java
@@ -38,7 +38,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.util.Adapt;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java
index cdef07def..61ad04a7e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java
@@ -39,7 +39,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java
index 9d480b53a..3048edb38 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java
@@ -35,7 +35,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java
index e7b027236..b6b6cf120 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java
@@ -51,7 +51,8 @@
 import org.scijava.Cancelable;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java
index d4b29c523..4b5e6811f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java
@@ -37,7 +37,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractBoundarySizeConvexHull.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractBoundarySizeConvexHull.java
index 4aca0d9b6..6bbf8e88f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractBoundarySizeConvexHull.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractBoundarySizeConvexHull.java
@@ -34,7 +34,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 
 /**
  * Generic implementation of
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractBoxivity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractBoxivity.java
index 27e149371..eb19e4c69 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractBoxivity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractBoxivity.java
@@ -34,7 +34,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 
 /**
  * Generic implementation of {@link net.imagej.ops2.Ops.Geometric.Boxivity}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractConvexity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractConvexity.java
index 9beeb0bc3..f726fb14a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractConvexity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractConvexity.java
@@ -34,7 +34,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 
 /**
  * Generic implementation of {@link net.imagej.ops2.Ops.Geometric.Convexity}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractSizeConvexHull.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractSizeConvexHull.java
index 4eef74f0d..65bbc7777 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractSizeConvexHull.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractSizeConvexHull.java
@@ -34,7 +34,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 
 /**
  * Generic implementation of {@link net.imagej.ops2.Ops.Geometric.SizeConvexHull}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractSolidity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractSolidity.java
index 9eb2de413..63085e230 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractSolidity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractSolidity.java
@@ -34,7 +34,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 
 /**
  * Generic implementation of {@link net.imagej.ops2.Ops.Geometric.Solidity}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java
index 878daafc3..186f92a88 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java
@@ -37,7 +37,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java
index 344be0aa1..4c71e51ce 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java
@@ -37,7 +37,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java
index 3527317e5..ede783b2d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java
@@ -36,7 +36,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java
index 0e922df96..2432a139e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java
@@ -36,7 +36,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java
index ec67e41cb..51c9106c4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java
@@ -39,7 +39,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java
index 5015d7a2d..5e8adc487 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java
@@ -39,7 +39,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java
index dd78d18d0..b8951a2b0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java
@@ -37,7 +37,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java
index b09a4de31..caf252a33 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java
@@ -39,7 +39,8 @@
 import net.imglib2.util.ValuePair;
 
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java
index 0fa0ee394..57670f877 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java
@@ -37,7 +37,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "geom.maximumFeretsAngle")
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java
index e0af8b7c6..fb909ec6c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java
@@ -37,7 +37,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "geom.maximumFeretsDiameter")
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java
index 9046a493f..4047042e9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java
@@ -42,7 +42,8 @@
 import org.apache.commons.math3.geometry.euclidean.twod.Line;
 import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java
index d02ac039f..63fa18c3a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java
@@ -37,7 +37,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "geom.minimumFeretsAngle")
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java
index 79ace0ac5..fd267b2ae 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java
@@ -37,7 +37,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "geom.minimumFeretsDiameter")
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java
index d0cbc4c08..ace34706e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java
@@ -37,7 +37,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java
index fc7d7bcd7..64fcebd17 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java
@@ -36,7 +36,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java
index fe02b5646..5fcab8b1c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java
@@ -41,7 +41,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java
index e2cdad3c2..4c59a807c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java
@@ -37,7 +37,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java
index 67356552b..4b959cea7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java
@@ -37,7 +37,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java
index aedbcbd2c..d97daa276 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java
@@ -39,7 +39,8 @@
 import org.apache.commons.math3.linear.BlockRealMatrix;
 import org.apache.commons.math3.linear.RealMatrix;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java
index c004c7f0b..492ed25f4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java
@@ -39,7 +39,8 @@
 import org.apache.commons.math3.linear.BlockRealMatrix;
 import org.apache.commons.math3.linear.RealMatrix;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java
index cf91544b9..4c2110b65 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java
@@ -39,7 +39,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java
index 7671c4d37..e20055b6d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java
@@ -44,7 +44,8 @@
 import org.apache.commons.math3.util.MathArrays;
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java
index b54d600b9..6d560a266 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java
@@ -39,7 +39,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java
index 2f9876e9e..c900348d8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java
@@ -39,7 +39,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java
index 029929cf4..edb832f4b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java
@@ -37,7 +37,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java
index 51239c3fa..d307543f8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java
@@ -37,7 +37,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java
index 28604e216..a29fda656 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java
@@ -45,7 +45,8 @@
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java
index 30b338607..af4b6d06f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java
@@ -38,7 +38,8 @@
 
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java
index afc86df71..c72f7b6b4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java
@@ -8,7 +8,8 @@
 
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java
index 994376470..f9a4f8ddc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java
@@ -38,7 +38,8 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertII.java
index 21dfd5767..a4dc24a6b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertII.java
@@ -36,7 +36,8 @@
 //import net.imglib2.type.numeric.RealType;
 //import net.imglib2.type.numeric.integer.UnsignedVariableBitLengthType;
 //
-//import org.scijava.ops.OpDependency;
+//import org.scijava.ops.api.OpDependency;
+//import org.scijava.ops.api.OpDependency;
 //import org.scijava.ops.core.Op;
 //import org.scijava.functions.Computers;
 //import org.scijava.functions.Computers;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertIIInteger.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertIIInteger.java
index d2b60fb65..585429045 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertIIInteger.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertIIInteger.java
@@ -39,7 +39,8 @@
 //import net.imglib2.type.numeric.integer.UnsignedLongType;
 //
 //import org.scijava.Priority;
-//import org.scijava.ops.OpDependency;
+//import org.scijava.ops.api.OpDependency;
+//import org.scijava.ops.api.OpDependency;
 //import org.scijava.ops.core.Op;
 //import org.scijava.functions.Computers;
 //import org.scijava.functions.Computers;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java
index de2a1f0de..5956d47ee 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java
@@ -40,7 +40,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java
index 49595de1e..dfec740a9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java
@@ -38,7 +38,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java
index 7ede98158..d380236d0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java
@@ -38,7 +38,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java
index c3c3f0066..b344f6f43 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java
@@ -36,7 +36,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java
index 70a3eadc6..9d3a7f57d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java
@@ -57,7 +57,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java
index ffc075466..05682eaa5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java
@@ -44,7 +44,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java
index ce0a033c3..42a6399ed 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java
@@ -45,7 +45,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java
index 4f24ad3b1..8f8af7581 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java
@@ -67,7 +67,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java
index 3518fc11f..4dabcf711 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java
@@ -35,7 +35,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java
index afc590e39..25b4f6d80 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java
@@ -40,7 +40,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java
index c397ecc8e..96c796f63 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java
@@ -40,7 +40,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java
index 152e79b86..8cc1eece1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java
@@ -36,7 +36,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java
index 895c6f5e6..3e342d433 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java
@@ -40,7 +40,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java
index 9c82050d4..3ba0a7055 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java
@@ -39,7 +39,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java
index eb47849b6..5e7052fc3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java
@@ -40,7 +40,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java
index 7497105b7..80950a972 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java
@@ -40,7 +40,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java
index 2d34aa2d9..345e5118f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java
@@ -35,7 +35,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java
index 53b96b88b..aa0129147 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java
@@ -35,7 +35,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java
index df125bb8b..ed3b2c180 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java
@@ -35,7 +35,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java
index ca68bb401..f089a4877 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java
@@ -35,7 +35,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java
index 834a92d4a..007915075 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java
@@ -35,7 +35,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java
index 295780c27..17beb1d70 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java
@@ -35,7 +35,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java
index 0910b31ad..411eff74d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java
@@ -35,7 +35,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java
index 0e3249b45..2874f952e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java
@@ -35,7 +35,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java
index ad95b0261..892d90b48 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java
@@ -35,7 +35,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java
index f74703e55..14956f0d0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java
@@ -35,7 +35,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java
index 5a13b2322..7241a1028 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java
@@ -35,7 +35,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java
index da925084b..d935f09ed 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java
@@ -35,7 +35,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java
index e1390e9ca..0b3d0eec7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java
@@ -35,7 +35,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java
index 08c82aa54..5453992e9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java
@@ -35,7 +35,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java
index 18b9e3a33..209d2c0d8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java
@@ -48,7 +48,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java
index 58cea4a11..edf3cb581 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java
@@ -43,7 +43,8 @@
 
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java
index c883d96c6..5de813cde 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java
@@ -39,7 +39,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java
index 62bc52417..67e785a4a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java
@@ -39,7 +39,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/AbstractThin.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/AbstractThin.java
index e35cebb07..65877ad46 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/AbstractThin.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/AbstractThin.java
@@ -43,7 +43,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 
 /**
  * Thinning Operation
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java
index eb4ea7ccc..cc4dda2fd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java
@@ -45,7 +45,8 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java
index 2fdc0c42b..42b0a9d62 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java
@@ -49,7 +49,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java
index c474a09f7..c902f45e3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java
@@ -34,7 +34,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java
index 3c41f7fa5..01b59edd2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java
@@ -34,7 +34,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java
index f12342d38..501949ede 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java
@@ -34,7 +34,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java
index dc2b74a60..b9c7cb2b3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java
@@ -38,7 +38,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java
index c6744b3fc..1880216ce 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java
@@ -35,7 +35,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java
index c4796911b..d4ed3370b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java
@@ -35,7 +35,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java
index 5e3b38978..8ccf5afe4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java
@@ -38,7 +38,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java
index 80a4713a1..a538bf3d2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java
@@ -35,7 +35,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java
index 42d656617..e6a30a91a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java
@@ -35,7 +35,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java
index a09cf4fcb..36238bbbd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java
@@ -35,7 +35,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java
index fa3fd3b1e..f76c2d7fc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java
@@ -35,7 +35,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java
index c6593b1c9..aa1f768b5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java
@@ -39,7 +39,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java
index d7514acbf..eebcc4675 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java
@@ -33,7 +33,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java
index 021b15378..88229a4e6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java
@@ -34,7 +34,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java
index 0c28f58ff..e21e4fa5b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java
@@ -35,7 +35,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java
index 934860110..3cc8b420c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java
@@ -39,7 +39,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java
index 63518b707..8ad309257 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java
@@ -40,7 +40,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java
index 2d5f5a53e..1d9df75d7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java
@@ -38,7 +38,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java
index c76598bc7..b549d3e38 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java
@@ -41,7 +41,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java
index 916de0dba..39cfac291 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java
@@ -33,7 +33,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java
index e133b0ea6..41373db64 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java
@@ -33,7 +33,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/AbstractApplyThresholdImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/AbstractApplyThresholdImg.java
index ca1492a96..ffb637e7f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/AbstractApplyThresholdImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/AbstractApplyThresholdImg.java
@@ -36,7 +36,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 
 /**
  * @author Curtis Rueden
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/AbstractApplyThresholdIterable.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/AbstractApplyThresholdIterable.java
index 8e0a5ea05..e04d12c64 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/AbstractApplyThresholdIterable.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/AbstractApplyThresholdIterable.java
@@ -32,7 +32,8 @@
 import net.imglib2.type.logic.BitType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 
 /**
  * @author Curtis Rueden
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyLocalThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyLocalThresholdIntegral.java
index f5b1654b2..b2a809301 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyLocalThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyLocalThresholdIntegral.java
@@ -53,7 +53,8 @@
 import net.imglib2.view.composite.GenericComposite;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.OpExecutionException;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethod.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethod.java
index 15cb62e23..9239ca464 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethod.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethod.java
@@ -35,7 +35,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java
index 649aa64a5..7e8844582 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java
@@ -43,7 +43,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java
index 9194d2802..4f3351434 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java
@@ -36,7 +36,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.util.Adapt;
 import org.scijava.ops.util.Maps;
 import org.scijava.plugin.Plugin;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java
index 30713f232..4edf2f2cc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java
@@ -38,7 +38,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java
index 2e16445e7..69348f6fc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java
@@ -39,7 +39,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java
index 098ec52e7..c511bab8a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java
@@ -37,7 +37,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java
index da9915a13..d94f3bf5a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java
@@ -39,7 +39,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java
index 7c4e2d689..a80863f8d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java
@@ -36,7 +36,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java
index 224371bad..5e73012e0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java
@@ -40,7 +40,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java
index 91224e25c..b9104b9aa 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java
@@ -49,7 +49,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java
index b3b2f7ff9..1191335fd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java
@@ -35,7 +35,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java
index 44b6fb8ea..261856689 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java
@@ -39,7 +39,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java
index bbc42be36..bb0035e34 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java
@@ -38,7 +38,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java
index 0bdf65a58..a940a40e5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java
@@ -40,7 +40,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java
index 4d7161b0b..337726619 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java
@@ -36,7 +36,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java
index 42b2f80a0..b7b428315 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java
@@ -41,7 +41,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java
index af451977a..5463413c9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java
@@ -48,7 +48,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "threshold.localNiblack",
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java
index a4a457cf8..92b827019 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java
@@ -36,7 +36,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java
index 210919565..5d3a23962 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java
@@ -41,7 +41,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java
index d1c714285..55921eabc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java
@@ -48,7 +48,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "threshold.localPhansalkar",
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java
index bed97ba63..b5e87e053 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java
@@ -36,7 +36,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java
index 1d5ee05a0..d4b87bb89 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java
@@ -41,7 +41,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java
index b7617b0ec..abeadd05d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java
@@ -48,7 +48,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "threshold.localSauvola",
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/AnnotatedOpDependencyMember.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/AnnotatedOpDependencyMember.java
index 52fa934b2..43f4303a2 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/AnnotatedOpDependencyMember.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/AnnotatedOpDependencyMember.java
@@ -32,6 +32,8 @@
 
 import java.lang.reflect.Type;
 
+import org.scijava.ops.api.OpDependency;
+
 /**
  * @author Marcel Wiedenmann
  */
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/FieldOpDependencyMember.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/FieldOpDependencyMember.java
index 75a6fb905..bc5002091 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/FieldOpDependencyMember.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/FieldOpDependencyMember.java
@@ -32,6 +32,7 @@
 
 import java.lang.reflect.Field;
 
+import org.scijava.ops.api.OpDependency;
 import org.scijava.struct.MemberInstance;
 import org.scijava.struct.ValueAccessible;
 import org.scijava.struct.ValueAccessibleMemberInstance;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/MethodParameterOpDependencyMember.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/MethodParameterOpDependencyMember.java
index 9cc75f5c0..578aecab7 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/MethodParameterOpDependencyMember.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/MethodParameterOpDependencyMember.java
@@ -33,6 +33,8 @@
 import java.lang.reflect.Parameter;
 import java.lang.reflect.Type;
 
+import org.scijava.ops.api.OpDependency;
+
 /**
  * @author Marcel Wiedenmann
  */
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpDependencies.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpDependencies.java
index fc2fb880e..cb392acc5 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpDependencies.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpDependencies.java
@@ -35,6 +35,8 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.scijava.ops.api.OpDependency;
+
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface OpDependencies {
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpDependency.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpDependency.java
deleted file mode 100644
index 0a20fb24a..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpDependency.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.scijava.ops;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Repeatable;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/** Annotates a helper op as a field that should be auto injected.*/
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.FIELD, ElementType.PARAMETER})
-public @interface OpDependency {
-	
-	/** The name of the Op to inject. */
-	String name();
-	
-	/** Set to false if the dependency should not be adapted */
-	boolean adaptable() default true;
-}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java
index 1a540774b..c9a30b3ae 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java
@@ -74,7 +74,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java
index 3149a3362..7a09dc856 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java
@@ -40,7 +40,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java
index 22c51dc03..2925392f0 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java
@@ -39,7 +39,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java
index 89a46d74b..6cda7adb9 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java
@@ -41,7 +41,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Producer;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java
index 2473a9b4c..ad8a4cdf2 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java
@@ -40,7 +40,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Producer;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java
index f4b9c1a60..483a90e2a 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java
@@ -40,7 +40,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.api.Op;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
index 8a36e58ea..5a34744c6 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
@@ -59,7 +59,6 @@
 import org.scijava.ops.Hints;
 import org.scijava.ops.OpCandidate;
 import org.scijava.ops.OpCandidate.StatusCode;
-import org.scijava.ops.OpDependency;
 import org.scijava.ops.OpDependencyMember;
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.OpField;
@@ -72,6 +71,7 @@
 import org.scijava.ops.OpWrapper;
 import org.scijava.ops.api.Op;
 import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.hint.AdaptationHints;
 import org.scijava.ops.hint.DefaultHints;
 import org.scijava.ops.hint.SimplificationHints;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpHistory.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpHistory.java
index f624e61bf..707f36d69 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpHistory.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpHistory.java
@@ -13,10 +13,10 @@
 import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.stream.Collectors;
 
-import org.scijava.ops.OpDependency;
 import org.scijava.ops.OpExecutionSummary;
 import org.scijava.ops.OpHistory;
 import org.scijava.ops.OpInfo;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 import org.scijava.service.AbstractService;
 import org.scijava.service.Service;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java
index fa0a30b75..891cb9515 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java
@@ -45,7 +45,8 @@
 import org.scijava.Priority;
 import org.scijava.ValidityProblem;
 import org.scijava.ops.Hints;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.OpDependencyMember;
 import org.scijava.ops.OpHints;
 import org.scijava.ops.OpInfo;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java
index 56decb354..f29d5531e 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java
@@ -4,7 +4,8 @@
 import java.util.function.Function;
 
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 public class Mean {
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassOpDependencyMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassOpDependencyMemberParser.java
index 5301c8f29..c34f68e45 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassOpDependencyMemberParser.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassOpDependencyMemberParser.java
@@ -8,7 +8,8 @@
 
 import org.scijava.ValidityProblem;
 import org.scijava.ops.FieldOpDependencyMember;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.struct.MemberParser;
 import org.scijava.struct.ValidityException;
 import org.scijava.util.ClassUtils;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/JavadocParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/JavadocParameterData.java
index 91653983a..3678be177 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/JavadocParameterData.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/JavadocParameterData.java
@@ -17,7 +17,8 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpUtils;
 import org.scijava.struct.FunctionalMethodType;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodOpDependencyMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodOpDependencyMemberParser.java
index d1bf90435..e34240374 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodOpDependencyMemberParser.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodOpDependencyMemberParser.java
@@ -9,7 +9,7 @@
 
 import org.scijava.ValidityProblem;
 import org.scijava.ops.MethodParameterOpDependencyMember;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.struct.MemberParser;
 import org.scijava.struct.ValidityException;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpMethodUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpMethodUtils.java
index 339f67181..c8e33bd90 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpMethodUtils.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpMethodUtils.java
@@ -7,7 +7,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.types.Types;
 import org.scijava.types.inference.GenericAssignability;
 import org.scijava.types.inference.InterfaceInference;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java
index 1aa26bb58..47296cf39 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java
@@ -17,6 +17,7 @@
 import org.scijava.function.Inplaces;
 import org.scijava.ops.api.Op;
 import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodDependencyPositionTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodDependencyPositionTest.java
index 5fd9de8bc..a69756249 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodDependencyPositionTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodDependencyPositionTest.java
@@ -8,8 +8,9 @@
 
 import org.junit.Test;
 import org.scijava.function.Computers;
-import org.scijava.plugin.Plugin;
 import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
 public class OpMethodDependencyPositionTest extends AbstractTestEnvironment {
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
index 44af0da5d..6fb874160 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
@@ -38,7 +38,7 @@
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java
index 9034e81f7..2d329f97c 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java
@@ -44,7 +44,8 @@
 import org.scijava.ops.api.Op;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.OpField;
 import org.scijava.ops.OpHistoryService;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java
index 55e80ca7d..bbb5c8361 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java
@@ -10,7 +10,8 @@
 import org.scijava.ops.api.Op;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.OpField;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java
index d71dfa5e3..437c29791 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java
@@ -14,13 +14,13 @@
 import org.scijava.function.Producer;
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.Hints;
-import org.scijava.ops.OpDependency;
 import org.scijava.ops.OpExecutionSummary;
 import org.scijava.ops.OpField;
 import org.scijava.ops.OpHistoryService;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpMethod;
 import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.hint.DefaultHints;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.vm
index c05b32cc7..0cab6cabc 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.vm
@@ -74,7 +74,8 @@ import java.util.function.Function;
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.vm
index 7d75008fc..ccf97a2b7 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.vm
@@ -40,7 +40,8 @@ import java.util.function.Function;
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.vm
index f5933122b..3e89eb70e 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.vm
@@ -39,7 +39,8 @@ import java.util.function.Function;
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.vm
index 6057f045f..b6ca9501c 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.vm
@@ -41,7 +41,8 @@ import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Producer;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.vm
index 7f3b89f3b..cc9b29c46 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.vm
@@ -40,7 +40,8 @@ import java.util.function.Function;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Producer;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.api.Op;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.vm
index 5b80a9f5c..257c76256 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.vm
@@ -40,7 +40,8 @@ import java.util.function.Function;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.OpDependency;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.api.Op;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;

From 158ab8e46866ef4ce08e64b3e5e9ea6f4efa98d1 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Wed, 21 Jul 2021 11:21:40 -0500
Subject: [PATCH 78/91] Use org.scijava.ops.api.OpMethod

---
 .../main/java/org/scijava/ops/OpMethod.java   | 53 -------------------
 .../ops/impl/DefaultOpEnvironment.java        |  2 +-
 .../ops/matcher/impl/OpMethodInfo.java        |  3 +-
 .../struct/MethodParameterMemberParser.java   |  3 +-
 .../org/scijava/ops/JavadocParameterTest.java |  1 +
 .../ops/OpMethodDependencyPositionTest.java   |  1 +
 .../java/org/scijava/ops/OpMethodTestOps.java |  1 +
 .../ops/provenance/ProvenanceTest.java        |  2 +-
 8 files changed, 9 insertions(+), 57 deletions(-)
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/OpMethod.java

diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpMethod.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpMethod.java
deleted file mode 100644
index 75fc7eb86..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpMethod.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * #%L
- * ImageJ software for multidimensional image processing and analysis.
- * %%
- * Copyright (C) 2014 - 2016 Board of Regents of the University of
- * Wisconsin-Madison and University of Konstanz.
- * %%
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * #L%
- */
-
-package org.scijava.ops;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.scijava.Priority;
-
-/**
- * @author Marcel Wiedenmann
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface OpMethod {
-
-	String names();
-
-	Class<?> type();
-
-	double priority() default Priority.NORMAL;
-
-}
\ No newline at end of file
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
index 5a34744c6..5f28e937b 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
@@ -65,13 +65,13 @@
 import org.scijava.ops.OpHistoryService;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpInstance;
-import org.scijava.ops.OpMethod;
 import org.scijava.ops.OpRef;
 import org.scijava.ops.OpUtils;
 import org.scijava.ops.OpWrapper;
 import org.scijava.ops.api.Op;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpMethod;
 import org.scijava.ops.hint.AdaptationHints;
 import org.scijava.ops.hint.DefaultHints;
 import org.scijava.ops.hint.SimplificationHints;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java
index 891cb9515..38cacbd30 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java
@@ -50,7 +50,8 @@
 import org.scijava.ops.OpDependencyMember;
 import org.scijava.ops.OpHints;
 import org.scijava.ops.OpInfo;
-import org.scijava.ops.OpMethod;
+import org.scijava.ops.api.OpMethod;
+import org.scijava.ops.api.OpMethod;
 import org.scijava.ops.OpUtils;
 import org.scijava.ops.hint.ImmutableHints;
 import org.scijava.ops.struct.MethodOpDependencyMemberParser;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodParameterMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodParameterMemberParser.java
index d35468537..3a84caa73 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodParameterMemberParser.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodParameterMemberParser.java
@@ -9,7 +9,8 @@
 import java.util.Set;
 
 import org.scijava.ValidityProblem;
-import org.scijava.ops.OpMethod;
+import org.scijava.ops.api.OpMethod;
+import org.scijava.ops.api.OpMethod;
 import org.scijava.ops.util.OpMethodUtils;
 import org.scijava.struct.MemberParser;
 import org.scijava.struct.ValidityException;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java
index 47296cf39..9bc079a22 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java
@@ -18,6 +18,7 @@
 import org.scijava.ops.api.Op;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpMethod;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodDependencyPositionTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodDependencyPositionTest.java
index a69756249..b96b9eb2b 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodDependencyPositionTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodDependencyPositionTest.java
@@ -10,6 +10,7 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpMethod;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
index 6fb874160..daee260d7 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
@@ -39,6 +39,7 @@
 import org.scijava.function.Producer;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpMethod;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java
index 437c29791..d1dbe48ca 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java
@@ -18,9 +18,9 @@
 import org.scijava.ops.OpField;
 import org.scijava.ops.OpHistoryService;
 import org.scijava.ops.OpInfo;
-import org.scijava.ops.OpMethod;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpMethod;
 import org.scijava.ops.hint.DefaultHints;
 import org.scijava.plugin.Plugin;
 

From 6cbf5b670d3fee848a4bf8e651c8ffa19a003813 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Wed, 21 Jul 2021 11:36:57 -0500
Subject: [PATCH 79/91] Use org.scijava.ops.api.OpField

---
 .../net/imagej/ops2/convert/ConvertTypes.java |  3 ++-
 .../net/imagej/ops2/convert/Converters.java   |  3 ++-
 .../net/imagej/ops2/create/CreateTypes.java   |  3 ++-
 .../java/net/imagej/ops2/create/Creators.java |  3 ++-
 .../ops2/filter/addNoise/NoiseAdders.java     |  3 ++-
 .../imagej/ops2/filter/gauss/Gaussians.java   |  3 ++-
 .../imagej/ops2/image/invert/Inverters.java   |  3 ++-
 .../imagej/ops2/linalg/rotate/Rotations.java  |  3 ++-
 .../imagej/ops2/logic/BooleanTypeLogic.java   |  3 ++-
 .../ops2/math/BinaryNumericTypeMath.java      |  3 ++-
 .../imagej/ops2/math/BinaryRealTypeMath.java  |  3 ++-
 .../ops2/math/NullaryNumericTypeMath.java     |  3 ++-
 .../imagej/ops2/math/UnaryRealTypeMath.java   |  3 ++-
 .../imagej/ops2/morphology/BlackTopHats.java  |  3 ++-
 .../net/imagej/ops2/morphology/Closes.java    |  3 ++-
 .../net/imagej/ops2/morphology/Dilations.java |  3 ++-
 .../ops2/morphology/DistanceTransforms.java   |  3 ++-
 .../net/imagej/ops2/morphology/Erosions.java  |  3 ++-
 .../imagej/ops2/morphology/FloodFills.java    |  3 ++-
 .../net/imagej/ops2/morphology/Opens.java     |  3 ++-
 .../net/imagej/ops2/morphology/Table2Ds.java  |  3 ++-
 .../imagej/ops2/morphology/WhiteTopHats.java  |  3 ++-
 .../net/imagej/ops2/transform/Transforms.java |  3 ++-
 .../ops2/types/adapt/LiftComputersToRAI.java  |  3 ++-
 .../ops2/types/adapt/LiftFunctionsToRAI.java  |  3 ++-
 .../imagej/ops2/types/adapt/RAIToIIOps.java   |  3 ++-
 .../types/maxValue/MaxValueRealTypes.java     |  3 ++-
 .../types/minValue/MinValueRealTypes.java     |  3 ++-
 .../imagej/ops2/types/TypeExtractorTests.java |  3 ++-
 .../types/adapt/LiftComputersToRAITest.java   |  3 ++-
 .../types/adapt/LiftFunctionsToRAITest.java   |  3 ++-
 .../main/java/org/scijava/ops/OpField.java    | 24 -------------------
 .../ops/adapt/lift/ComputerToArrays.java      |  3 ++-
 .../ops/adapt/lift/ComputerToIterables.java   |  3 ++-
 .../ops/adapt/lift/FunctionToArrays.java      |  3 ++-
 .../ops/adapt/lift/FunctionToIterables.java   |  3 ++-
 .../ops/adapt/lift/InplaceToArrays.java       |  3 ++-
 .../PrimitiveArrayLossReporters.java          |  3 ++-
 .../PrimitiveLossReporters.java               |  3 ++-
 .../scijava/ops/copy/CopyOpCollection.java    |  3 ++-
 .../ops/create/CreateOpCollection.java        |  3 ++-
 .../ops/impl/DefaultOpEnvironment.java        |  2 +-
 .../scijava/ops/matcher/impl/OpFieldInfo.java |  3 ++-
 .../main/java/org/scijava/ops/math/Add.java   |  3 ++-
 .../scijava/ops/math/MathOpCollection.java    |  3 ++-
 .../main/java/org/scijava/ops/math/Power.java |  3 ++-
 .../main/java/org/scijava/ops/math/Sqrt.java  |  3 ++-
 .../main/java/org/scijava/ops/math/Zero.java  |  3 ++-
 .../simplify/PrimitiveArraySimplifiers.java   |  3 ++-
 .../ops/simplify/PrimitiveSimplifiers.java    |  3 ++-
 .../org/scijava/ops/JavadocParameterTest.java |  1 +
 .../scijava/ops/OpBuilderNoOutputTest.java    |  3 ++-
 .../org/scijava/ops/OpBuilderTestOps.java     |  3 ++-
 .../ops/OpMethodDependencyPositionTest.java   |  1 +
 .../java/org/scijava/ops/OpMethodTestOps.java |  1 +
 .../ops/adapt/OpAdaptationPriorityTest.java   |  3 ++-
 .../ComputerToFunctionAdaptTestOps.java       |  3 ++-
 .../FunctionToComputerAdaptTestOps.java       |  3 ++-
 .../ops/adapt/lift/ComputerToArraysTest.java  |  3 ++-
 .../ops/adapt/lift/FunctionToArraysTest.java  |  3 ++-
 .../ops/adapt/lift/InplaceToArraysTest.java   |  3 ++-
 .../scijava/ops/hints/AdaptationHintTest.java |  3 ++-
 .../ops/hints/SimplificationHintTest.java     |  3 ++-
 .../org/scijava/ops/impl/OpCachingTest.java   | 10 ++++----
 .../ops/matcher/DefaultMatchingErrorTest.java |  3 ++-
 .../ops/matcher/MatchingWithGCSTTest.java     |  3 ++-
 .../ops/provenance/ProvenanceTest.java        |  2 +-
 .../SimplificationAdaptationTest.java         |  3 ++-
 .../simplify/SimplificationPriorityTest.java  |  3 ++-
 .../scijava/ops/simplify/SimplifyIOTest.java  |  3 ++-
 .../scijava/ops/simplify/SimplifyTest.java    |  3 ++-
 .../scijava/ops/util/OpsAsParametersTest.java |  3 ++-
 .../ops/adapt/lift/ComputerToArrays.vm        |  3 ++-
 .../ops/adapt/lift/ComputerToIterables.vm     |  3 ++-
 .../ops/adapt/lift/FunctionToArrays.vm        |  3 ++-
 .../ops/adapt/lift/FunctionToIterables.vm     |  3 ++-
 .../scijava/ops/adapt/lift/InplaceToArrays.vm |  3 ++-
 .../java/org/scijava/ops/OpBuilderTestOps.vm  |  3 ++-
 .../ComputerToFunctionAdaptTestOps.vm         |  3 ++-
 .../FunctionToComputerAdaptTestOps.vm         |  3 ++-
 .../ops/adapt/lift/ComputerToArraysTest.vm    |  3 ++-
 .../ops/adapt/lift/FunctionToArraysTest.vm    |  3 ++-
 .../ops/adapt/lift/InplaceToArraysTest.vm     |  3 ++-
 83 files changed, 161 insertions(+), 108 deletions(-)
 delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/OpField.java

diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java
index 5a96df358..2c8e07b44 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java
@@ -54,7 +54,8 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java
index 5ca4aaf36..f6539e34f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java
@@ -8,7 +8,8 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java
index 3cf48b911..164ef6d94 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java
@@ -21,7 +21,8 @@
 import org.scijava.function.Producer;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java
index 788bcf494..2db685f4c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java
@@ -44,7 +44,8 @@
 import org.scijava.function.Producer;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java
index 7b0958779..13ba51311 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java
@@ -39,7 +39,8 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java
index b174ff171..b0eee806b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java
@@ -49,7 +49,8 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/Inverters.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/Inverters.java
index a246fa3bd..60ea60569 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/Inverters.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/Inverters.java
@@ -15,7 +15,8 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java
index 8bc573de7..815a544ae 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java
@@ -39,7 +39,8 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java
index e10fc0136..7eed6be46 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java
@@ -34,7 +34,8 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java
index e24b8aad9..b8f21462d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java
@@ -36,7 +36,8 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java
index 419bd1610..b60d68b31 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java
@@ -34,7 +34,8 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java
index b8e61dcd0..c03d5724c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java
@@ -35,7 +35,8 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/UnaryRealTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/UnaryRealTypeMath.java
index fc870c23b..7ad05b16a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/UnaryRealTypeMath.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/UnaryRealTypeMath.java
@@ -38,7 +38,8 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/BlackTopHats.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/BlackTopHats.java
index 48146f12f..0db474517 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/BlackTopHats.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/BlackTopHats.java
@@ -16,7 +16,8 @@
 import org.scijava.function.Inplaces;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Closes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Closes.java
index 02676588f..4d8075d1e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Closes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Closes.java
@@ -16,7 +16,8 @@
 import org.scijava.function.Inplaces;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Dilations.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Dilations.java
index 3fcbe6f0c..e259435c8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Dilations.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Dilations.java
@@ -16,7 +16,8 @@
 import org.scijava.function.Inplaces;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java
index 60e7881d1..aeabeb323 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java
@@ -13,7 +13,8 @@
 import org.scijava.ops.ExceptionUtils;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Erosions.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Erosions.java
index 98b6fa78d..0bc9340cb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Erosions.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Erosions.java
@@ -16,7 +16,8 @@
 import org.scijava.function.Inplaces;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java
index 12ce4e777..c1ea6ead8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java
@@ -16,7 +16,8 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Opens.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Opens.java
index 995e334c6..8bb60ff1f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Opens.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Opens.java
@@ -16,7 +16,8 @@
 import org.scijava.function.Inplaces;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java
index dc0c9c16a..4c6d6ee74 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java
@@ -23,7 +23,8 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/WhiteTopHats.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/WhiteTopHats.java
index 6ef6a6555..d770df04d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/WhiteTopHats.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/WhiteTopHats.java
@@ -16,7 +16,8 @@
 import org.scijava.function.Inplaces;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java
index d96851b76..37047b504 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java
@@ -37,7 +37,8 @@
 import org.scijava.ops.api.Op;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java
index 95029075d..1228068f9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java
@@ -10,7 +10,8 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java
index dbb588441..c5eb23099 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java
@@ -16,7 +16,8 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/RAIToIIOps.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/RAIToIIOps.java
index 0a80c0389..4d7d7885c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/RAIToIIOps.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/RAIToIIOps.java
@@ -8,7 +8,8 @@
 
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/maxValue/MaxValueRealTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/maxValue/MaxValueRealTypes.java
index 3e8c340f1..d50ed11a5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/maxValue/MaxValueRealTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/maxValue/MaxValueRealTypes.java
@@ -26,7 +26,8 @@
 
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/minValue/MinValueRealTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/minValue/MinValueRealTypes.java
index 6f91dab1f..6f83e7da9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/minValue/MinValueRealTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/minValue/MinValueRealTypes.java
@@ -26,7 +26,8 @@
 
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/TypeExtractorTests.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/TypeExtractorTests.java
index 9cd8f0092..82219abf6 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/TypeExtractorTests.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/TypeExtractorTests.java
@@ -15,7 +15,8 @@
 import org.junit.jupiter.api.Test;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.TypeExtractor;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftComputersToRAITest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftComputersToRAITest.java
index 9feac0f50..d4cf60043 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftComputersToRAITest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftComputersToRAITest.java
@@ -13,7 +13,8 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.types.Nil;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAITest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAITest.java
index 14b942d0d..21caabd2e 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAITest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAITest.java
@@ -17,7 +17,8 @@
 import org.scijava.function.Functions;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpField.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpField.java
deleted file mode 100644
index eecb7c70f..000000000
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpField.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.scijava.ops;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.scijava.Priority;
-
-/** Annotates an op declared as a field in an {@link OpCollection}. */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-public @interface OpField {
-
-	String names();
-
-	// the names of the parameters (inputs and outputs) that will appear in a call
-	// to help().
-	//TODO: add default names support in OpFieldInfo
-	String[] params() default "";
-
-	double priority() default Priority.NORMAL;
-
-}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java
index 11208ff40..a81d17afd 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java
@@ -37,7 +37,8 @@
 import java.util.function.Function;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java
index e0eab5392..7100556ad 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java
@@ -38,7 +38,8 @@
 import java.util.function.Function;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java
index fa22856a1..33ba13626 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java
@@ -39,7 +39,8 @@
 import java.util.function.Function;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java
index 892121704..17bc61bad 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java
@@ -39,7 +39,8 @@
 import java.util.function.Function;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java
index cd3d7e3ff..bc92d3e42 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java
@@ -37,7 +37,8 @@
 import java.util.function.Function;
 
 import org.scijava.function.Inplaces;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java
index d84ec3c9e..438e70fc2 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java
@@ -2,7 +2,8 @@
 
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.OpHints;
 import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveLossReporters.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveLossReporters.java
index 13a4997bf..219e5909f 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveLossReporters.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveLossReporters.java
@@ -3,7 +3,8 @@
 
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.OpHints;
 import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/copy/CopyOpCollection.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/copy/CopyOpCollection.java
index 95692d7cc..a2bf906a0 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/copy/CopyOpCollection.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/copy/CopyOpCollection.java
@@ -4,7 +4,8 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java
index c9a7678a0..5a066c1d0 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java
@@ -7,7 +7,8 @@
 import org.scijava.function.Producer;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
index 5f28e937b..6906cfbc4 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
@@ -61,8 +61,8 @@
 import org.scijava.ops.OpCandidate.StatusCode;
 import org.scijava.ops.OpDependencyMember;
 import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.OpField;
 import org.scijava.ops.OpHistoryService;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpInstance;
 import org.scijava.ops.OpRef;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpFieldInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpFieldInfo.java
index 7f172e28e..322575635 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpFieldInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpFieldInfo.java
@@ -39,7 +39,8 @@
 import org.scijava.Priority;
 import org.scijava.ValidityProblem;
 import org.scijava.ops.Hints;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.OpHints;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpUtils;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Add.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Add.java
index 84d321d04..feaad0f2f 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Add.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Add.java
@@ -13,7 +13,8 @@
 import org.scijava.function.Inplaces;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOpCollection.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOpCollection.java
index 876d23cdf..aed06fd88 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOpCollection.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOpCollection.java
@@ -6,7 +6,8 @@
 import org.scijava.Priority;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Power.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Power.java
index c7c0e183e..d07db866b 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Power.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Power.java
@@ -5,7 +5,8 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Sqrt.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Sqrt.java
index 8b820618a..8481e1165 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Sqrt.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Sqrt.java
@@ -6,7 +6,8 @@
 import org.scijava.function.Inplaces;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java
index 3cf76cff3..be8e16dc9 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java
@@ -5,7 +5,8 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveArraySimplifiers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveArraySimplifiers.java
index dbc5420b6..17a1a3108 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveArraySimplifiers.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveArraySimplifiers.java
@@ -5,7 +5,8 @@
 
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.OpHints;
 import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveSimplifiers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveSimplifiers.java
index f58a50696..4311a3377 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveSimplifiers.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveSimplifiers.java
@@ -5,7 +5,8 @@
 
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.OpHints;
 import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java
index 9bc079a22..6de7f5d16 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java
@@ -18,6 +18,7 @@
 import org.scijava.ops.api.Op;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpMethod;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderNoOutputTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderNoOutputTest.java
index 3e89dcc95..5e5e1f600 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderNoOutputTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderNoOutputTest.java
@@ -10,7 +10,8 @@
 import org.scijava.ops.OpBuilder;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 import org.scijava.types.Nil;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderTestOps.java
index 4584a92b0..f9f70b3d6 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderTestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderTestOps.java
@@ -36,7 +36,8 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodDependencyPositionTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodDependencyPositionTest.java
index b96b9eb2b..419281fa3 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodDependencyPositionTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodDependencyPositionTest.java
@@ -10,6 +10,7 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpMethod;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
index daee260d7..1ecfe9335 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
@@ -39,6 +39,7 @@
 import org.scijava.function.Producer;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpMethod;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java
index 557b02a03..73913adc6 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java
@@ -41,7 +41,8 @@
 import org.scijava.ops.OpBuilder;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.adapt.functional.ComputersToFunctionsViaFunction;
 import org.scijava.ops.adapt.functional.ComputersToFunctionsViaSource;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java
index aa5f0fe88..9439483ca 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java
@@ -35,7 +35,8 @@
 package org.scijava.ops.adapt.functional;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java
index 392f2a957..34fb3da62 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java
@@ -38,7 +38,8 @@
 import java.util.function.Function;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java
index 3d84fef97..af5e213c1 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java
@@ -38,7 +38,8 @@
 import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Computers;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java
index 71e6fb476..d768f2342 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java
@@ -41,7 +41,8 @@
 import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Functions;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java
index b33ebf773..8d431abd7 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java
@@ -38,7 +38,8 @@
 import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/AdaptationHintTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/AdaptationHintTest.java
index cc45dd851..43232cc90 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/AdaptationHintTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/AdaptationHintTest.java
@@ -9,7 +9,8 @@
 import org.scijava.ops.Hints;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.OpHints;
 import org.scijava.ops.BaseOpHints.Adaptation;
 import org.scijava.ops.hint.DefaultHints;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/SimplificationHintTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/SimplificationHintTest.java
index 6a8578b6c..3e157504f 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/SimplificationHintTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/SimplificationHintTest.java
@@ -10,7 +10,8 @@
 import org.scijava.ops.Hints;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.OpHints;
 import org.scijava.ops.BaseOpHints.Adaptation;
 import org.scijava.ops.BaseOpHints.Simplification;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java
index 2d329f97c..2ede99d73 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java
@@ -41,16 +41,14 @@
 import org.scijava.Context;
 import org.scijava.function.Producer;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.OpField;
 import org.scijava.ops.OpHistoryService;
 import org.scijava.ops.OpInstance;
 import org.scijava.ops.OpService;
+import org.scijava.ops.api.Op;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 import org.scijava.plugin.PluginService;
 import org.scijava.types.TypeService;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java
index bbb5c8361..f98e90aff 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java
@@ -12,7 +12,8 @@
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java
index 22dc4b212..0e10ba56b 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java
@@ -11,7 +11,8 @@
 import org.scijava.ops.OpBuilder;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java
index d1dbe48ca..72df31ba7 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java
@@ -15,11 +15,11 @@
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.Hints;
 import org.scijava.ops.OpExecutionSummary;
-import org.scijava.ops.OpField;
 import org.scijava.ops.OpHistoryService;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpMethod;
 import org.scijava.ops.hint.DefaultHints;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationAdaptationTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationAdaptationTest.java
index 677debf73..a202d63fe 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationAdaptationTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationAdaptationTest.java
@@ -6,7 +6,8 @@
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationPriorityTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationPriorityTest.java
index 9798c17df..feca6306b 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationPriorityTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationPriorityTest.java
@@ -10,7 +10,8 @@
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.OpHints;
 import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.ops.conversionLoss.LossReporter;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyIOTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyIOTest.java
index 840619091..6c7a08e48 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyIOTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyIOTest.java
@@ -11,7 +11,8 @@
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyTest.java
index 0bd983dbd..65296f17f 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyTest.java
@@ -9,7 +9,8 @@
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
index cc93790e4..fb10209a3 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
@@ -11,7 +11,8 @@
 import org.scijava.ops.OpBuilder;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.vm
index b65ba53b6..262c6d05a 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.vm
@@ -37,7 +37,8 @@ package org.scijava.ops.adapt.lift;
 import java.util.function.Function;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm
index 35d28d3cd..919be7fe8 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm
@@ -38,7 +38,8 @@ import java.util.Iterator;
 import java.util.function.Function;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.vm
index 4e7101229..0ac9af228 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.vm
@@ -39,7 +39,8 @@ import java.util.function.BiFunction;
 import java.util.function.Function;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.vm
index bfe8931ac..b053b531c 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.vm
@@ -39,7 +39,8 @@ import java.util.function.BiFunction;
 import java.util.function.Function;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.vm
index 174df13ee..68192957a 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.vm
+++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.vm
@@ -37,7 +37,8 @@ package org.scijava.ops.adapt.lift;
 import java.util.function.Function;
 
 import org.scijava.function.Inplaces;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTestOps.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTestOps.vm
index 0b8608c07..36b61877e 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTestOps.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTestOps.vm
@@ -36,7 +36,8 @@ import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm
index 700df53ec..d668f9d2e 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm
@@ -35,7 +35,8 @@
 package org.scijava.ops.adapt.functional;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.vm
index cc33dea3a..a9574cde6 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.vm
@@ -38,7 +38,8 @@ import java.util.function.BiFunction;
 import java.util.function.Function;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.vm
index 606d1e185..51ae3d2d2 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.vm
@@ -38,7 +38,8 @@ import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Computers;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.vm
index f02f819a5..1441671a3 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.vm
@@ -41,7 +41,8 @@ import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Functions;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.vm
index 91b13a2e1..a1a885eb6 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.vm
+++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.vm
@@ -38,7 +38,8 @@ import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpField;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;

From 336638967f72958c89b3af50c1fccf834661b599 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Thu, 22 Jul 2021 15:04:53 -0500
Subject: [PATCH 80/91] Switch to OpInfoGenerator paradigm

This approach has two benefits:
1) Removes the dependency on scijava-common within DefaultOpEnvironment
2) Enables IoC

(Of course we are then just shifting the scijava-common dependency to
 the relevant OpInfoGenerators/DefaultOpService, but this is easier to
 reconcile than a dependency deeper within the OpEnvironment/OpMatcher)
---
 pom.xml                                       |   1 +
 scijava/scijava-ops-discovery/.gitignore      |   2 +
 scijava/scijava-ops-discovery/LICENSE.txt     |  24 ++
 scijava/scijava-ops-discovery/README.md       |  12 +
 .../scijava-ops-discovery/bin/generate.groovy | 238 ++++++++++++++++++
 scijava/scijava-ops-discovery/pom.xml         | 112 +++++++++
 .../src/main/java/module-info.java            |   5 +
 .../org/scijava/ops/discovery/Discoverer.java |  14 ++
 .../scijava/ops/discovery/Implementation.java |  35 +++
 .../ops/discovery/StaticDiscoverer.java       |  58 +++++
 scijava/scijava-ops-engine/.gitignore         |   1 +
 scijava/scijava-ops/pom.xml                   |   7 +
 .../src/main/java/module-info.java            |   1 +
 .../java/org/scijava/ops/OpCandidate.java     |   5 +-
 .../java/org/scijava/ops/OpEnvironment.java   |  10 +-
 .../src/main/java/org/scijava/ops/OpInfo.java |   8 +-
 .../java/org/scijava/ops/OpInfoGenerator.java |   9 +
 .../ops/impl/DefaultOpEnvironment.java        | 103 +++-----
 .../scijava/ops/impl/DefaultOpService.java    |  98 +++++++-
 .../impl/PluginBasedClassOpInfoGenerator.java |  42 ++++
 .../PluginBasedOpCollectionInfoGenerator.java |  63 +++++
 .../ops/matcher/impl/DefaultOpMatcher.java    |  13 +-
 .../ops/matcher/impl/OpAdaptationInfo.java    |   5 +
 .../scijava/ops/matcher/impl/OpClassInfo.java |  14 +-
 .../scijava/ops/matcher/impl/OpFieldInfo.java |  10 +-
 .../ops/matcher/impl/OpMethodInfo.java        |  10 +-
 .../ops/simplify/SimplifiedOpInfo.java        |   5 +
 .../scijava/ops/AbstractTestEnvironment.java  |   1 +
 .../org/scijava/ops/OpEnvironmentTest.java    |   4 +-
 .../templates/main/java/module-info.vm        |   1 +
 30 files changed, 811 insertions(+), 100 deletions(-)
 create mode 100644 scijava/scijava-ops-discovery/.gitignore
 create mode 100644 scijava/scijava-ops-discovery/LICENSE.txt
 create mode 100644 scijava/scijava-ops-discovery/README.md
 create mode 100644 scijava/scijava-ops-discovery/bin/generate.groovy
 create mode 100644 scijava/scijava-ops-discovery/pom.xml
 create mode 100644 scijava/scijava-ops-discovery/src/main/java/module-info.java
 create mode 100644 scijava/scijava-ops-discovery/src/main/java/org/scijava/ops/discovery/Discoverer.java
 create mode 100644 scijava/scijava-ops-discovery/src/main/java/org/scijava/ops/discovery/Implementation.java
 create mode 100644 scijava/scijava-ops-discovery/src/main/java/org/scijava/ops/discovery/StaticDiscoverer.java
 create mode 100644 scijava/scijava-ops-engine/.gitignore
 create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfoGenerator.java
 create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/impl/PluginBasedClassOpInfoGenerator.java
 create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/impl/PluginBasedOpCollectionInfoGenerator.java

diff --git a/pom.xml b/pom.xml
index b9ffa7553..64cf6a2f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,7 @@
 		<module>scijava/scijava-ops</module>
 		<module>scijava/scijava-struct</module>
 		<module>scijava/scijava-ops-api</module>
+		<module>scijava/scijava-ops-discovery</module>
 		<module>scijava/scijava-taglets</module>
 		<module>scijava/scijava-testutil</module>
 		<module>scijava/scijava-types</module>
diff --git a/scijava/scijava-ops-discovery/.gitignore b/scijava/scijava-ops-discovery/.gitignore
new file mode 100644
index 000000000..00d2ab71d
--- /dev/null
+++ b/scijava/scijava-ops-discovery/.gitignore
@@ -0,0 +1,2 @@
+/.apt_generated/
+/.apt_generated_tests/
diff --git a/scijava/scijava-ops-discovery/LICENSE.txt b/scijava/scijava-ops-discovery/LICENSE.txt
new file mode 100644
index 000000000..ef17d5e7a
--- /dev/null
+++ b/scijava/scijava-ops-discovery/LICENSE.txt
@@ -0,0 +1,24 @@
+Copyright (c) 2016 - 2019, SciJava Ops developers.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/scijava/scijava-ops-discovery/README.md b/scijava/scijava-ops-discovery/README.md
new file mode 100644
index 000000000..90608641c
--- /dev/null
+++ b/scijava/scijava-ops-discovery/README.md
@@ -0,0 +1,12 @@
+The SciJava Ops projects offers a framework for typed operations, or Ops.
+
+Each op implements a particular functional interface, possessing typed inputs
+or outputs. The system provides the ability to request ops matching particular
+constraints, including implementing interface, input types and output types. 
+
+It is like Java's method overloading, but more powerful, and more extensible.
+
+More documentation coming later.
+
+See also [ImageJ Ops](https://github.com/imagej/imagej-ops), a collection of
+ops focused on scientific image processing and analysis.
diff --git a/scijava/scijava-ops-discovery/bin/generate.groovy b/scijava/scijava-ops-discovery/bin/generate.groovy
new file mode 100644
index 000000000..3e26050d9
--- /dev/null
+++ b/scijava/scijava-ops-discovery/bin/generate.groovy
@@ -0,0 +1,238 @@
+#!/usr/bin/env groovy
+
+/*
+ * #%L
+ * SciJava Operations: a framework for reusable algorithms.
+ * %%
+ * Copyright (C) 2018 SciJava developers.
+ * %%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+debug = System.getenv('DEBUG')
+def debug(msg) {
+	if (debug) System.err.println("[DEBUG] $msg")
+}
+
+@Grab('org.apache.velocity:velocity:1.7')
+import org.apache.velocity.app.VelocityEngine
+
+// TODO: Get path to Groovy script and make these dirs relative to that.
+templateDirectory = 'templates'
+outputDirectory = 'src'
+
+knownFiles = new java.util.HashSet();
+
+/* Gets the last modified timestamp for the given file. */
+def timestamp(dir, file) {
+	if (file == null) return Long.MAX_VALUE;
+	file = new java.io.File(dir, file);
+	knownFiles.add(file);
+	return file.lastModified();
+}
+
+/* Processes a template using Apache Velocity. */
+def processTemplate(engine, context, templateFile, outFilename) {
+	debug("processTemplate('$engine', '$context', '$templateFile', '$outFilename')")
+
+	if (outFilename == null) return; // nothing to do
+
+	// create output directory if it does not already exist
+	outFile = new java.io.File(outputDirectory, outFilename);
+	knownFiles.add(outFile);
+	if (outFile.getParentFile() != null) outFile.getParentFile().mkdirs();
+
+	// apply the template and write out the result
+	t = engine.getTemplate(templateFile);
+	writer = new StringWriter();
+	t.merge(context, writer);
+	out = new PrintWriter(outFile, "UTF-8");
+	out.print(writer.toString());
+	out.close();
+}
+
+/* Evaluates a string using Groovy. */
+def parseValue(sh, translationsFile, key, expression) {
+	try {
+		result = sh.evaluate(expression)
+		sh.setVariable(key, result)
+		return result
+	}
+	catch (groovy.lang.GroovyRuntimeException e) {
+		print("[WARNING] $translationsFile: " +
+			"key '$key' has unparseable value: " + e.getMessage());
+	}
+}
+
+/* Reads a translations File */
+def readTranslation(engine, globalContext, reader, templateSubdirectory, templateFile, translationsFile, isInclude){
+	sh = new groovy.lang.GroovyShell();
+	for (;;) {
+		// read the line
+		line = reader.readLine();
+
+		if (line == null) break;
+		// check if the line starts a new section
+		if (line.startsWith("[") && line.endsWith("]")) {
+			// if we are parsing a .include file, return when we hit any sections
+			if(isInclude){
+				println("[WARNING] $translationsFile: Section definition in .include file. Ending processing of $translationsFile");
+				return context; 
+			}
+			// write out the previous file
+			processTemplate(engine, context, templateFile, outputFilename);
+
+			// start a new file
+			outputFilename = line.substring(1, line.length() - 1);
+			if (!templateDirectory.equals(templateSubdirectory)) {
+				subPath = templateSubdirectory.substring(templateDirectory.length() + 1);
+				outputFilename = "$subPath/$outputFilename";
+			}
+			context = new org.apache.velocity.VelocityContext(globalContext);
+			continue;
+		}
+
+		// ignore blank lines
+		trimmedLine = line.trim();
+		if (trimmedLine.isEmpty()) continue;
+
+		// ignore comments
+		if (trimmedLine.startsWith("#")) continue;
+
+		// include any global files
+		if (trimmedLine.startsWith(".include")){
+			includeFile = line.substring(9);
+			if(includeFile.startsWith("templates")){
+				includeSubdirectory = includeFile.substring(0, includeFile.lastIndexOf("/"))
+				includeFile = includeFile.substring(includeFile.lastIndexOf("/"))
+			}
+			else{
+			includeSubdirectory = templateSubdirectory
+			}
+			globalReader = new java.io.BufferedReader(new java.io.FileReader("$includeSubdirectory/$includeFile"));
+			encapsulatedContext = new org.apache.velocity.VelocityContext(context)
+			context = readTranslation(engine, encapsulatedContext, globalReader, templateSubdirectory, templateFile, includeFile, true) 
+			continue;
+		}
+		
+		if (!line.contains('=')) {
+			print("[WARNING] $translationsFile: Ignoring spurious line: $line");
+			continue;
+		}
+
+		int idx = line.indexOf('=');
+		key = line.substring(0, idx).trim();
+		value = line.substring(idx + 1);
+
+		if (value.trim().equals('```')) {
+			// multi-line value
+			builder = new StringBuilder();
+			for (;;) {
+				line = reader.readLine();
+				if (line == null) {
+					throw new RuntimeException("Unfinished value: " + builder.toString());
+				}
+				if (line.equals('```')) {
+					break;
+				}
+				if (builder.length() > 0) {
+					builder.append("\n");
+				}
+				builder.append(line);
+			}
+			value = builder.toString();
+		}
+
+		context.put(key, parseValue(sh, translationsFile, key, value));
+	}
+	
+	return context;
+}
+
+/*
+ * Translates a template into many files in the outputDirectory,
+ * given a translations file in INI style; e.g.:
+ *
+ * [filename1]
+ * variable1 = value1
+ * variable2 = value2
+ * ...
+ * [filename2]
+ * variable1 = value3
+ * variable2 = value4
+ * ...
+ */
+def translate(templateSubdirectory, templateFile, translationsFile) {
+	debug("translate('$templateSubdirectory', '$templateFile', '$translationsFile')")
+
+	// initialize the Velocity engine
+	engine = new org.apache.velocity.app.VelocityEngine();
+	p = new java.util.Properties();
+	// fail if template uses an invalid expression; e.g., an undefined variable
+	p.setProperty("runtime.references.strict", "true");
+	// tell Velocity where the templates are located
+	p.setProperty("file.resource.loader.path", "$templateSubdirectory");
+	// tell Velocity to log to stderr rather than to a velocity.log file
+	p.setProperty(org.apache.velocity.runtime.RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS,
+			"org.apache.velocity.runtime.log.SystemLogChute");
+	engine.init(p);
+
+	// read translation lines
+	outputFilename = null;
+	context = globalContext = new org.apache.velocity.VelocityContext();
+	reader = new java.io.BufferedReader(new java.io.FileReader("$templateSubdirectory/$translationsFile"));
+
+	readTranslation(engine, context, reader, templateSubdirectory, templateFile, translationsFile, false);
+
+	reader.close();
+
+	// process the template
+	processTemplate(engine, context, templateFile, outputFilename);
+}
+
+/* Recursively translates all templates in the given directory. */
+def translateDirectory(templateSubdirectory) {
+	debug("translateDirectory('$templateSubdirectory')")
+
+	for (file in new java.io.File(templateSubdirectory).listFiles()) {
+		if (file.isDirectory()) {
+			// process subdirectories recursively
+			translateDirectory(file.getPath());
+		}
+		else {
+			// process Velocity template files only
+			name = file.getName();
+			if (!name.endsWith('.vm')) continue;
+			prefix = name.substring(0, name.lastIndexOf('.'));
+			translate(templateSubdirectory, name, prefix + '.list');
+		}
+	}
+}
+
+try {
+	translateDirectory(templateDirectory);
+}
+catch (Throwable t) {
+	t.printStackTrace(System.err);
+	throw t;
+}
diff --git a/scijava/scijava-ops-discovery/pom.xml b/scijava/scijava-ops-discovery/pom.xml
new file mode 100644
index 000000000..ace275668
--- /dev/null
+++ b/scijava/scijava-ops-discovery/pom.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.scijava</groupId>
+		<artifactId>scijava-incubator</artifactId>
+		<version>0-SNAPSHOT</version>
+		<relativePath>../..</relativePath>
+	</parent>
+
+	<artifactId>scijava-ops-discovery</artifactId>
+
+	<name>SciJava Ops API</name>
+	<description>SciJava Operations Discovery: Discovery mechanisms used by the SciJava Operations framework.</description>
+	<url>https://github.com/scijava/scijava-ops-discovery</url>
+	<inceptionYear>2021</inceptionYear>
+	<organization>
+		<name>SciJava</name>
+		<url>https://scijava.org/</url>
+	</organization>
+	<licenses>
+		<license>
+			<name>Simplified BSD License</name>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+
+	<developers>
+		<developer>
+			<id>ctrueden</id>
+			<name>Curtis Rueden</name>
+			<url>https://imagej.net/User:Rueden</url>
+			<roles>
+				<role>founder</role>
+				<role>lead</role>
+				<role>reviewer</role>
+				<role>support</role>
+				<role>maintainer</role>
+			</roles>
+		</developer>
+		<developer>
+			<id>gselzer</id>
+			<name>Gabriel Selzer</name>
+			<roles>
+				<role>founder</role>
+				<role>developer</role>
+				<role>debugger</role>
+				<role>reviewer</role>
+				<role>support</role>
+			</roles>
+		</developer>
+	</developers>
+	<contributors>
+		<contributor>
+			<name>Christian Dietz</name>
+			<url>https://imagej.net/User:Dietzc</url>
+			<roles>
+				<role>founder</role>
+			</roles>
+			<properties>
+				<id>dietzc</id>
+			</properties>
+		</contributor>
+		<contributor>
+			<name>David Kolb</name>
+			<roles>
+				<role>founder</role>
+			</roles>
+			<properties>
+				<id>Treiblesschorle</id>
+			</properties>
+		</contributor>
+	</contributors>
+
+	<mailingLists>
+		<mailingList>
+			<name>Image.sc Forum</name>
+			<archive>https://forum.image.sc/tags/scijava-ops-discovery</archive>
+		</mailingList>
+	</mailingLists>
+
+	<scm>
+		<connection>scm:git:git://github.com/scijava/incubator</connection>
+		<developerConnection>scm:git:git@github.com:scijava/incubator</developerConnection>
+		<tag>HEAD</tag>
+		<url>https://github.com/scijava/incubator</url>
+	</scm>
+	<issueManagement>
+		<system>GitHub Issues</system>
+		<url>https://github.com/scijava/scijava-ops-discovery/issues</url>
+	</issueManagement>
+	<ciManagement>
+		<system>Travis CI</system>
+		<url>https://travis-ci.com/scijava/incubator</url>
+	</ciManagement>
+
+	<properties>
+		<main-class>org.scijava.ops.discovery.Main</main-class>
+		<package-name>org.scijava.ops.discovery</package-name>
+
+		<license.licenseName>bsd_2</license.licenseName>
+		<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
+		<!--  <enforcer.skip>true</enforcer.skip>-->
+		<scijava-ops-discovery.allowedDuplicateClasses>${scijava.allowedDuplicateClasses},com.github.therapi.runtimejavadoc.repack.com.eclipsesource.json.*</scijava-ops-discovery.allowedDuplicateClasses>
+		<allowedDuplicateClasses>${scijava-ops-discovery.allowedDuplicateClasses}</allowedDuplicateClasses>
+	</properties>
+	<dependencies>
+	</dependencies>
+</project>
diff --git a/scijava/scijava-ops-discovery/src/main/java/module-info.java b/scijava/scijava-ops-discovery/src/main/java/module-info.java
new file mode 100644
index 000000000..e1803e6dd
--- /dev/null
+++ b/scijava/scijava-ops-discovery/src/main/java/module-info.java
@@ -0,0 +1,5 @@
+module org.scijava.ops.discovery {
+
+	exports org.scijava.ops.discovery;
+
+}
diff --git a/scijava/scijava-ops-discovery/src/main/java/org/scijava/ops/discovery/Discoverer.java b/scijava/scijava-ops-discovery/src/main/java/org/scijava/ops/discovery/Discoverer.java
new file mode 100644
index 000000000..52dcdc50c
--- /dev/null
+++ b/scijava/scijava-ops-discovery/src/main/java/org/scijava/ops/discovery/Discoverer.java
@@ -0,0 +1,14 @@
+
+package org.scijava.ops.discovery;
+
+import java.util.List;
+
+public interface Discoverer {
+
+	<T> List<? extends Class<T>> implementingClasses(Class<T> c);
+
+	<T> List<? extends T> implementingInstances(Class<T> c, Class<?>[] constructorClasses, Object[] constructorArgs);
+
+	<T> List<Implementation<T>> implementationsOf(Class<T> c);
+
+}
diff --git a/scijava/scijava-ops-discovery/src/main/java/org/scijava/ops/discovery/Implementation.java b/scijava/scijava-ops-discovery/src/main/java/org/scijava/ops/discovery/Implementation.java
new file mode 100644
index 000000000..ed7b2d434
--- /dev/null
+++ b/scijava/scijava-ops-discovery/src/main/java/org/scijava/ops/discovery/Implementation.java
@@ -0,0 +1,35 @@
+package org.scijava.ops.discovery;
+
+import java.lang.reflect.Type;
+
+/**
+ * An implementation of a particular base {@link Class}
+ * @author Gabriel Selzer
+ *
+ * @param <T> the base class {@link Type}
+ */
+public class Implementation<T> {
+
+	private final Class<T> c;
+	private final Class<T> implOf; 
+	private final String name;
+
+	public Implementation(final Class<T> c, final Class<T> implOf, final String name) {
+		this.c = c;
+		this.implOf = implOf;
+		this.name = name;
+	}
+
+	public Class<T> implementation() {
+		return c;
+	}
+
+	public Class<T> implementingClass() {
+		return implOf;
+	}
+
+	public String name() {
+		return name;
+	}
+
+}
diff --git a/scijava/scijava-ops-discovery/src/main/java/org/scijava/ops/discovery/StaticDiscoverer.java b/scijava/scijava-ops-discovery/src/main/java/org/scijava/ops/discovery/StaticDiscoverer.java
new file mode 100644
index 000000000..d6038f6e9
--- /dev/null
+++ b/scijava/scijava-ops-discovery/src/main/java/org/scijava/ops/discovery/StaticDiscoverer.java
@@ -0,0 +1,58 @@
+
+package org.scijava.ops.discovery;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public class StaticDiscoverer implements Discoverer {
+
+	Map<Class<?>, String> names;
+
+	public StaticDiscoverer() {
+		names = new HashMap<>();
+	}
+
+	public void register(Class<?> c, String name) {
+		names.put(c, name);
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public <T> List<? extends Class<T>> implementingClasses(Class<T> c) {
+		return names.keySet().stream() //
+			.filter(cls -> cls.isAssignableFrom(c)) //
+			.map(cls -> (Class<T>) cls) //
+			.collect(Collectors.toList());
+	}
+
+	@Override
+	public <T> List<? extends T> implementingInstances(Class<T> c,
+		Class<?>[] constructorClasses, Object[] constructorArgs)
+	{
+		return implementingClasses(c).stream() //
+			.map(cls -> classToObjectOrNull(cls, constructorClasses, constructorArgs)) //
+			.filter(o -> o != null) //
+			.collect(Collectors.toList());
+	}
+
+	private <T> T classToObjectOrNull(Class<T> c, Class<?>[] constructorClasses, Object[] constructorArgs) {
+			try {
+				return c.getDeclaredConstructor(constructorClasses).newInstance(
+					constructorArgs);
+			}
+			catch (Throwable t)
+			{
+				return null;
+			}
+	}
+
+	@Override
+	public <T> List<Implementation<T>> implementationsOf(Class<T> c) {
+		return implementingClasses(c).stream() //
+				.map(cls -> new Implementation<>(cls, c, names.get(cls))) //
+				.collect(Collectors.toList());
+	}
+
+}
diff --git a/scijava/scijava-ops-engine/.gitignore b/scijava/scijava-ops-engine/.gitignore
new file mode 100644
index 000000000..ae3c17260
--- /dev/null
+++ b/scijava/scijava-ops-engine/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/scijava/scijava-ops/pom.xml b/scijava/scijava-ops/pom.xml
index 905c4491b..e3988c4bc 100644
--- a/scijava/scijava-ops/pom.xml
+++ b/scijava/scijava-ops/pom.xml
@@ -117,15 +117,22 @@
 	</build>
 	<dependencies>
 		<!-- SciJava dependencies -->
+		<!-- 
 		<dependency>
 			<groupId>org.scijava</groupId>
 			<artifactId>scijava-common</artifactId>
 		</dependency>
+		-->
 		<dependency>
 			<groupId>org.scijava</groupId>
 			<artifactId>scijava-ops-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.scijava</groupId>
+			<artifactId>scijava-ops-discovery</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.scijava</groupId>
 			<artifactId>scijava-struct</artifactId>
diff --git a/scijava/scijava-ops/src/main/java/module-info.java b/scijava/scijava-ops/src/main/java/module-info.java
index 61242154a..63846ed9a 100644
--- a/scijava/scijava-ops/src/main/java/module-info.java
+++ b/scijava/scijava-ops/src/main/java/module-info.java
@@ -42,6 +42,7 @@
 	requires org.scijava.function;
 	requires org.scijava.struct;
 	requires org.scijava.ops.api;
+	requires org.scijava.ops.discovery;
 	requires org.scijava.types;
 	requires javassist;
 	requires java.compiler;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpCandidate.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpCandidate.java
index 4c31c8fa1..8759ee254 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpCandidate.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpCandidate.java
@@ -35,7 +35,6 @@
 import java.util.Map;
 
 import org.scijava.ValidityProblem;
-import org.scijava.log.Logger;
 import org.scijava.ops.matcher.OpMatcher;
 import org.scijava.struct.Member;
 import org.scijava.struct.Struct;
@@ -63,7 +62,6 @@ public static enum StatusCode {
 	}
 
 	private final OpEnvironment env;
-	private final Logger log;
 	private final OpRef ref;
 	private final OpInfo info;
 
@@ -77,11 +75,10 @@ public static enum StatusCode {
 	 * If the op does not, this will be the same as {@link #ref}.getArgs(). */
 	private final Type[] paddedArgs;
 
-	public OpCandidate(final OpEnvironment env, final Logger log, final OpRef ref, final OpInfo info,
+	public OpCandidate(final OpEnvironment env, final OpRef ref, final OpInfo info,
 		final Map<TypeVariable<?>, Type> typeVarAssigns)
 	{
 		this.env = env;
-		this.log = log;
 		this.ref = ref;
 		this.info = info;
 		this.typeVarAssigns = typeVarAssigns;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java
index ae5929c03..cde4dbc2d 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java
@@ -188,16 +188,16 @@ default OpBuilder op(final String opName) {
 	 *
 	 * @param opClass
 	 * @param priority - the assigned priority of the Op.
+	 * @param names - the name(s) of the Op
 	 * @return an {@link OpInfo} which can make instances of {@code opClass}
 	 */
-	OpInfo opify(Class<?> opClass, double priority);
+	OpInfo opify(Class<?> opClass, double priority, String... names);
 
 	/**
-	 * Makes the {@link OpInfo} {@code info} known to this {@link OpEnvironment} under the name {@code name}
-	 * @param info
-	 * @param name
+	 * Makes the {@link OpInfo} {@code info} known to this {@link OpEnvironment}.
+	 * @param info the {@link OpInfo} to be registered
 	 */
-	void register(OpInfo info, String name);
+	void register(OpInfo info);
 
 	/**
 	 * Sets the {@link Hints} for the {@link OpEnvironment}. Every Call to
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java
index 2d98589b4..40874298d 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java
@@ -7,7 +7,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.scijava.log.Logger;
 import org.scijava.struct.Member;
 import org.scijava.struct.Struct;
 import org.scijava.struct.StructInstance;
@@ -22,6 +21,9 @@
  */
 public interface OpInfo extends Comparable<OpInfo> {
 
+	/** name(s) of the op. */
+	List<String> names();
+
 	/** Generic type of the op. This will be the parameterized type of the concrete class */
 	Type opType();
 
@@ -46,8 +48,8 @@ default List<OpDependencyMember<?>> dependencies() {
 		return OpUtils.dependencies(struct());
 	}
 	
-	default OpCandidate createCandidate(OpEnvironment env, Logger log, OpRef ref, Map<TypeVariable<?>, Type> typeVarAssigns) {
-		return new OpCandidate(env, log, ref, this, typeVarAssigns);
+	default OpCandidate createCandidate(OpEnvironment env, OpRef ref, Map<TypeVariable<?>, Type> typeVarAssigns) {
+		return new OpCandidate(env, ref, this, typeVarAssigns);
 	}
 
 	/** The op's priority. */
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfoGenerator.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfoGenerator.java
new file mode 100644
index 000000000..b6fed9acd
--- /dev/null
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfoGenerator.java
@@ -0,0 +1,9 @@
+package org.scijava.ops;
+
+import java.util.List;
+
+public interface OpInfoGenerator {
+
+	List<OpInfo> generateInfos();
+
+}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
index 6906cfbc4..21a077312 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
@@ -29,9 +29,6 @@
 
 package org.scijava.ops.impl;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
@@ -45,12 +42,10 @@
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.UUID;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import org.scijava.AbstractContextual;
-import org.scijava.Context;
-import org.scijava.InstantiableException;
 import org.scijava.Priority;
 import org.scijava.log.LogService;
 import org.scijava.ops.BaseOpHints.Adaptation;
@@ -62,16 +57,14 @@
 import org.scijava.ops.OpDependencyMember;
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.OpHistoryService;
-import org.scijava.ops.api.OpField;
 import org.scijava.ops.OpInfo;
+import org.scijava.ops.OpInfoGenerator;
 import org.scijava.ops.OpInstance;
 import org.scijava.ops.OpRef;
-import org.scijava.ops.OpUtils;
 import org.scijava.ops.OpWrapper;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpMethod;
+import org.scijava.ops.discovery.Discoverer;
 import org.scijava.ops.hint.AdaptationHints;
 import org.scijava.ops.hint.DefaultHints;
 import org.scijava.ops.hint.SimplificationHints;
@@ -82,20 +75,14 @@
 import org.scijava.ops.matcher.impl.DefaultOpRef;
 import org.scijava.ops.matcher.impl.OpAdaptationInfo;
 import org.scijava.ops.matcher.impl.OpClassInfo;
-import org.scijava.ops.matcher.impl.OpFieldInfo;
-import org.scijava.ops.matcher.impl.OpMethodInfo;
 import org.scijava.ops.simplify.SimplifiedOpInfo;
 import org.scijava.ops.struct.FunctionalParameters;
-import org.scijava.plugin.Parameter;
-import org.scijava.plugin.PluginInfo;
-import org.scijava.plugin.PluginService;
 import org.scijava.struct.FunctionalMethodType;
 import org.scijava.struct.ItemIO;
 import org.scijava.types.Nil;
 import org.scijava.types.TypeService;
 import org.scijava.types.Types;
 import org.scijava.types.inference.GenericAssignability;
-import org.scijava.util.ClassUtils;
 
 /**
  * Default implementation of {@link OpEnvironment}, whose ops and related state
@@ -103,22 +90,23 @@
  * 
  * @author Curtis Rueden
  */
-public class DefaultOpEnvironment extends AbstractContextual implements OpEnvironment {
+public class DefaultOpEnvironment implements OpEnvironment {
 
-	@Parameter
-	private PluginService pluginService;
+	private final Discoverer discoverer;
 
 	private OpMatcher matcher;
 
-	@Parameter
 	private LogService log;
 
-	@Parameter
 	private TypeService typeService;
 
-	@Parameter
 	private OpHistoryService history;
 
+	/**
+	 * The {@link OpInfoGenerator}s providing {@link OpInfo}s to this environment
+	 */
+	private List<OpInfoGenerator> infoGenerators;
+
 	/**
 	 * Data structure storing all known Ops, grouped by name. This reduces the
 	 * search size for any Op request to the number of known Ops with the name
@@ -149,9 +137,13 @@ public class DefaultOpEnvironment extends AbstractContextual implements OpEnviro
 	 */
 	private Hints environmentHints = null;
 
-	public DefaultOpEnvironment(final Context context) {
-		context.inject(this);
-		matcher = new DefaultOpMatcher(log);
+	public DefaultOpEnvironment(final Discoverer d, final TypeService typeService, final LogService log, final OpHistoryService history, final List<OpInfoGenerator> infoGenerators) {
+		this.discoverer = d;
+		this.typeService = typeService;
+		this.log = log;
+		this.history = history;
+		this.infoGenerators = infoGenerators;
+		matcher = new DefaultOpMatcher();
 	}
 
 	@Override
@@ -241,14 +233,14 @@ public OpInfo opify(final Class<?> opClass) {
 	}
 
 	@Override
-	public OpInfo opify(final Class<?> opClass, final double priority) {
-		return new OpClassInfo(opClass, priority);
+	public OpInfo opify(final Class<?> opClass, final double priority, final String... names) {
+		return new OpClassInfo(opClass, priority, names);
 	}
 
 	@Override
-	public void register(final OpInfo info, final String name) {
+	public void register(final OpInfo info) {
 		if (opDirectory == null) initOpDirectory();
-		addToOpIndex(info, name);
+		addToOpIndex.accept(info);
 	}
 
 	@SuppressWarnings("unchecked")
@@ -293,7 +285,7 @@ private void generateOpInstance(final MatchingConditions conditions, final OpInf
 		if (!conditions.ref().typesMatch(info.opType(), typeVarAssigns))
 			throw new OpMatchingException(
 				"The given OpRef and OpInfo are not compatible!");
-		OpCandidate candidate = new OpCandidate(this, this.log, conditions.ref(), info,
+		OpCandidate candidate = new OpCandidate(this, conditions.ref(), info,
 			typeVarAssigns);
 		// TODO: can this be replaced by simply setting the status code to match?
 		if (!matcher.typesMatch(candidate)) throw new OpMatchingException(
@@ -494,7 +486,9 @@ private List<MatchingConditions> resolveOpDependencies(OpCandidate candidate, Hi
 
 	private void initWrappers() {
 		wrappers = new HashMap<>();
-		for (OpWrapper<?> wrapper : pluginService.createInstancesOfType(OpWrapper.class)) {
+		Class<?>[] constructorClasses = {};
+		Object[] constructorObjects = {};
+		for (OpWrapper<?> wrapper : discoverer.implementingInstances(OpWrapper.class, constructorClasses, constructorObjects)) {
 			wrappers.put(wrapper.type(), wrapper);
 		}
 	}
@@ -602,7 +596,7 @@ private OpCandidate adaptOp(OpRef ref, Hints hints) {
 					.getType(), map);
 				OpAdaptationInfo adaptedInfo = new OpAdaptationInfo(srcCandidate
 					.opInfo(), adapterOpType, adaptorOp);
-				OpCandidate adaptedCandidate = new OpCandidate(this, log, ref, adaptedInfo, map);
+				OpCandidate adaptedCandidate = new OpCandidate(this, ref, adaptedInfo, map);
 				adaptedCandidate.setStatus(StatusCode.MATCH);
 				return adaptedCandidate;
 			}
@@ -719,45 +713,14 @@ private OpRef inferOpRef(Type type, String name, Map<TypeVariable<?>, Type> type
 
 	private void initOpDirectory() {
 		opDirectory = new HashMap<>();
-
-		// Add regular Ops
-		for (final PluginInfo<Op> pluginInfo : pluginService.getPluginsOfType(Op.class)) {
-			try {
-				final Class<?> opClass = pluginInfo.loadClass();
-				OpInfo opInfo = new OpClassInfo(opClass);
-				addToOpIndex(opInfo, pluginInfo.getName());
-			} catch (InstantiableException exc) {
-				log.error("Can't load class from plugin info: " + pluginInfo.toString(), exc);
-			}
-		}
-		// Add Ops contained in an OpCollection
-		for (final PluginInfo<OpCollection> pluginInfo : pluginService.getPluginsOfType(OpCollection.class)) {
-			try {
-				final Class<? extends OpCollection> c = pluginInfo.loadClass();
-				final List<Field> fields = ClassUtils.getAnnotatedFields(c, OpField.class);
-				Object instance = null;
-				for (Field field : fields) {
-					final boolean isStatic = Modifier.isStatic(field.getModifiers());
-					if (!isStatic && instance == null) {
-						instance = field.getDeclaringClass().newInstance();
-					}
-					OpInfo opInfo = new OpFieldInfo(isStatic ? null : instance, field);
-					addToOpIndex(opInfo, field.getAnnotation(OpField.class).names());
-				}
-				final List<Method> methods = ClassUtils.getAnnotatedMethods(c, OpMethod.class);
-				for (final Method method: methods) {
-					OpInfo opInfo = new OpMethodInfo(method);
-					addToOpIndex(opInfo, method.getAnnotation(OpMethod.class).names());
-				}
-			} catch (InstantiableException | InstantiationException | IllegalAccessException exc) {
-				log.error("Can't load class from plugin info: " + pluginInfo.toString(), exc);
-			}
+		for (final OpInfoGenerator generator : infoGenerators) {
+			List<OpInfo> infos = generator.generateInfos();
+			infos.forEach(addToOpIndex);
 		}
 	}
 
-	private void addToOpIndex(final OpInfo opInfo, final String opNames) {
-		String[] parsedOpNames = OpUtils.parseOpNames(opNames);
-		if (parsedOpNames == null || parsedOpNames.length == 0) {
+	private final Consumer<OpInfo> addToOpIndex = (final OpInfo opInfo) -> {
+		if (opInfo.names() == null || opInfo.names().size() == 0) {
 			log.error("Skipping Op " + opInfo.implementationName() + ":\n" + "Op implementation must provide name.");
 			return;
 		}
@@ -766,13 +729,13 @@ private void addToOpIndex(final OpInfo opInfo, final String opNames) {
 					+ opInfo.getValidityException().getMessage());
 			return;
 		}
-		for (String opName : parsedOpNames) {
+		for (String opName : opInfo.names()) {
 			if (!opDirectory.containsKey(opName))
 				opDirectory.put(opName, new TreeSet<>());
 			boolean success = opDirectory.get(opName).add(opInfo);
 			if(!success) System.out.println("Did not add OpInfo "+ opInfo);
 		}
-	}
+	};
 
 	private Set<OpInfo> opsOfName(final String name) {
 		final Set<OpInfo> ops = opDirectory.getOrDefault(name, Collections.emptySet());
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpService.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpService.java
index 20ff30013..09a9f4668 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpService.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpService.java
@@ -29,12 +29,27 @@
 
 package org.scijava.ops.impl;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.scijava.Context;
+import org.scijava.InstantiableException;
+import org.scijava.log.LogService;
 import org.scijava.ops.OpBuilder;
 import org.scijava.ops.OpEnvironment;
+import org.scijava.ops.OpHistoryService;
+import org.scijava.ops.OpInfoGenerator;
 import org.scijava.ops.OpService;
+import org.scijava.ops.discovery.Discoverer;
+import org.scijava.ops.discovery.Implementation;
 import org.scijava.plugin.Plugin;
+import org.scijava.plugin.PluginInfo;
+import org.scijava.plugin.PluginService;
+import org.scijava.plugin.SciJavaPlugin;
 import org.scijava.service.AbstractService;
 import org.scijava.service.Service;
+import org.scijava.types.TypeService;
 
 /**
  * Service to provide a list of available ops structured in a prefix tree and to
@@ -73,6 +88,87 @@ public OpEnvironment env() {
 
 	private synchronized void initEnv() {
 		if (env != null) return;
-		env = new DefaultOpEnvironment(context());
+		PluginService plugins = context().getService(PluginService.class);
+		LogService log = context().getService(LogService.class);
+		TypeService types = context().getService(TypeService.class);
+		OpHistoryService history = context().getService(OpHistoryService.class);
+		List<OpInfoGenerator> infoGenerators = Arrays.asList(
+			new PluginBasedClassOpInfoGenerator(plugins),
+			new PluginBasedOpCollectionInfoGenerator(plugins));
+		env = new DefaultOpEnvironment(new PluginBasedDiscoverer(context()), types,
+			log, history, infoGenerators);
+	}
+}
+
+class PluginBasedDiscoverer implements Discoverer {
+
+	private final PluginService p;
+
+	public PluginBasedDiscoverer(Context ctx) {
+		p = ctx.getService(PluginService.class);
+	}
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public <T> List<? extends Class<T>> implementingClasses(Class<T> c) {
+		if (!SciJavaPlugin.class.isAssignableFrom(c)) {
+			throw new UnsupportedOperationException(
+				"Current discovery mechanism tied to SciJava Context; only able to search for SciJavaPlugins");
+		}
+		List<PluginInfo<SciJavaPlugin>> infos = p.getPluginsOfType(
+			(Class<SciJavaPlugin>) c);
+		return infos.stream() //
+			.map(info -> makeClassOrNull(c, info)) //
+			.filter(cls -> cls != null).collect(Collectors.toList());
+	}
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public <T> List<? extends T> implementingInstances(Class<T> c,
+		Class<?>[] constructorClasses, Object[] constructorArgs)
+	{
+		if (!SciJavaPlugin.class.isAssignableFrom(c)) {
+			throw new UnsupportedOperationException(
+				"Current discovery mechanism tied to SciJava Context; only able to search for SciJavaPlugins");
+		}
+		List<SciJavaPlugin> instances = p.createInstancesOfType(
+			(Class<SciJavaPlugin>) c);
+		return instances.stream().map(instance -> (T) instance).collect(Collectors
+			.toList());
+	}
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public <T> List<Implementation<T>> implementationsOf(Class<T> c) {
+		if (!SciJavaPlugin.class.isAssignableFrom(c)) {
+			throw new UnsupportedOperationException(
+				"Current discovery mechanism tied to SciJava Context; only able to search for SciJavaPlugins");
+		}
+		List<PluginInfo<SciJavaPlugin>> instances = p.getPluginsOfType(
+			(Class<SciJavaPlugin>) c);
+		return instances.stream() //
+			.map(instance -> makeDiscoveryOrNull(c, instance)) //
+			.filter(d -> d.implementation() != null) //
+			.collect(Collectors.toList());
 	}
+
+	@SuppressWarnings("unchecked")
+	private <T> Class<T> makeClassOrNull(@SuppressWarnings("unused") Class<T> type,
+		PluginInfo<SciJavaPlugin> instance)
+	{
+		try {
+			return (Class<T>) instance.loadClass();
+		}
+		catch (InstantiableException exc) {
+			return null;
+		}
+	}
+
+	private <T> Implementation<T> makeDiscoveryOrNull(Class<T> type,
+		PluginInfo<SciJavaPlugin> instance)
+	{
+		return new Implementation<>(makeClassOrNull(type, instance), type, instance
+			.getName());
+	}
+
 }
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/PluginBasedClassOpInfoGenerator.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/PluginBasedClassOpInfoGenerator.java
new file mode 100644
index 000000000..9d8feb44d
--- /dev/null
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/PluginBasedClassOpInfoGenerator.java
@@ -0,0 +1,42 @@
+package org.scijava.ops.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.scijava.InstantiableException;
+import org.scijava.ops.OpInfo;
+import org.scijava.ops.OpInfoGenerator;
+import org.scijava.ops.OpUtils;
+import org.scijava.ops.api.Op;
+import org.scijava.ops.matcher.impl.OpClassInfo;
+import org.scijava.plugin.PluginInfo;
+import org.scijava.plugin.PluginService;
+
+
+public class PluginBasedClassOpInfoGenerator implements OpInfoGenerator {
+
+	private final PluginService service;
+
+	public PluginBasedClassOpInfoGenerator(PluginService service) {
+		this.service = service;
+	}
+
+	@Override
+	public List<OpInfo> generateInfos() {
+		List<OpInfo> infos = new ArrayList<>();
+		for (PluginInfo<Op> info : service.getPluginsOfType(Op.class) ) {
+			Class<?> opClass;
+			try {
+				opClass = info.loadClass();
+				String[] parsedOpNames = OpUtils.parseOpNames(info.getName());
+				infos.add(new OpClassInfo(opClass, parsedOpNames));
+			}
+			catch (InstantiableException exc) {
+				exc.printStackTrace();
+			}
+			
+		}
+		return infos;
+	}
+
+}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/PluginBasedOpCollectionInfoGenerator.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/PluginBasedOpCollectionInfoGenerator.java
new file mode 100644
index 000000000..a8b20d283
--- /dev/null
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/PluginBasedOpCollectionInfoGenerator.java
@@ -0,0 +1,63 @@
+package org.scijava.ops.impl;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.scijava.InstantiableException;
+import org.scijava.ops.OpInfo;
+import org.scijava.ops.OpInfoGenerator;
+import org.scijava.ops.OpUtils;
+import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpMethod;
+import org.scijava.ops.matcher.impl.OpFieldInfo;
+import org.scijava.ops.matcher.impl.OpMethodInfo;
+import org.scijava.plugin.PluginInfo;
+import org.scijava.plugin.PluginService;
+import org.scijava.util.ClassUtils;
+
+
+public class PluginBasedOpCollectionInfoGenerator implements OpInfoGenerator {
+
+	private final PluginService service;
+
+	public PluginBasedOpCollectionInfoGenerator(PluginService service) {
+		this.service = service;
+	}
+
+	@Override
+	public List<OpInfo> generateInfos() {
+		List<OpInfo> infos = new ArrayList<>();
+		for (PluginInfo<OpCollection> info : service.getPluginsOfType(OpCollection.class) ) {
+			try {
+				Class<?> c = info.loadClass();
+				final List<Field> fields = ClassUtils.getAnnotatedFields(c, OpField.class);
+				Object instance = null;
+				for (Field field : fields) {
+					final boolean isStatic = Modifier.isStatic(field.getModifiers());
+					if (!isStatic && instance == null) {
+						instance = field.getDeclaringClass().newInstance();
+					}
+					String unparsedOpNames = field.getAnnotation(OpField.class).names();
+					String[] parsedOpNames = OpUtils.parseOpNames(unparsedOpNames);
+					infos.add(new OpFieldInfo(isStatic ? null : instance, field,
+						parsedOpNames));
+				}
+				final List<Method> methods = ClassUtils.getAnnotatedMethods(c, OpMethod.class);
+				for (final Method method: methods) {
+					String unparsedOpNames = method.getAnnotation(OpMethod.class).names();
+					String[] parsedOpNames = OpUtils.parseOpNames(unparsedOpNames);
+					infos.add(new OpMethodInfo(method, parsedOpNames));
+				}
+			} catch (InstantiationException | IllegalAccessException | InstantiableException exc) {
+				// TODO: Consider how best to handle this.
+				exc.printStackTrace();
+			}
+		}
+		return infos;
+	}
+
+}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/DefaultOpMatcher.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/DefaultOpMatcher.java
index 61dae23bf..df49b2626 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/DefaultOpMatcher.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/DefaultOpMatcher.java
@@ -43,15 +43,14 @@
 import java.util.Set;
 import java.util.function.Predicate;
 
-import org.scijava.log.Logger;
+import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.ops.Hints;
 import org.scijava.ops.OpCandidate;
+import org.scijava.ops.OpCandidate.StatusCode;
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.OpInfo;
 import org.scijava.ops.OpRef;
 import org.scijava.ops.OpUtils;
-import org.scijava.ops.BaseOpHints.Simplification;
-import org.scijava.ops.OpCandidate.StatusCode;
 import org.scijava.ops.hint.DefaultHints;
 import org.scijava.ops.matcher.MatchingResult;
 import org.scijava.ops.matcher.OpMatcher;
@@ -69,12 +68,6 @@
  */
 public class DefaultOpMatcher extends AbstractService implements OpMatcher {
 
-	private final Logger log;
-
-	public DefaultOpMatcher(final Logger log) {
-		this.log = log;
-	}
-
 	@Override
 	public OpCandidate findSingleMatch(final OpEnvironment env, final OpRef ref) {
 		return findMatch(env, ref).singleMatch();
@@ -134,7 +127,7 @@ public List<OpCandidate> findCandidates(final OpEnvironment env, final List<OpRe
 			for (final OpInfo info : getInfos(env, ref, hints)) {
 				Map<TypeVariable<?>, Type> typeVarAssigns = new HashMap<>();
 				if (ref.typesMatch(info.opType(), typeVarAssigns)) {
-					OpCandidate candidate = info.createCandidate(env, log, ref, typeVarAssigns);
+					OpCandidate candidate = info.createCandidate(env, ref, typeVarAssigns);
 					candidates.add(candidate);
 				}
 			}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpAdaptationInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpAdaptationInfo.java
index 9fd622b1c..a2b0f42f2 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpAdaptationInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpAdaptationInfo.java
@@ -78,6 +78,11 @@ public List<OpDependencyMember<?>> dependencies() {
 		return srcInfo.dependencies();
 	}
 
+	@Override
+	public List<String> names() {
+		return srcInfo.names();
+	}
+
 	@Override
 	public Type opType() {
 		return type;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpClassInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpClassInfo.java
index 2fe4ada0f..a413ce828 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpClassInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpClassInfo.java
@@ -34,6 +34,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import org.scijava.Priority;
@@ -61,18 +62,20 @@
  */
 public class OpClassInfo implements OpInfo {
 
+	private final List<String> names;
 	private final Class<?> opClass;
 	private Struct struct;
 	private ValidityException validityException;
 	private final double priority;
 	private final Hints hints;
 
-	public OpClassInfo(final Class<?> opClass) {
-		this(opClass, priorityFromAnnotation(opClass));
+	public OpClassInfo(final Class<?> opClass, final String... names) {
+		this(opClass, priorityFromAnnotation(opClass), names);
 	}
 
-	public OpClassInfo(final Class<?> opClass, final double priority) {
+	public OpClassInfo(final Class<?> opClass, final double priority, final String... names) {
 		this.opClass = opClass;
+		this.names = Arrays.asList(names);
 		List<ValidityProblem> problems = new ArrayList<>();
 		try {
 			struct = Structs.from(opClass, problems, new ClassParameterMemberParser(), new ClassOpDependencyMemberParser());
@@ -87,6 +90,11 @@ public OpClassInfo(final Class<?> opClass, final double priority) {
 
 	// -- OpInfo methods --
 
+	@Override
+	public List<String> names() {
+		return names;
+	}
+
 	@Override
 	public Type opType() {
 		// TODO: Check whether this is correct!
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpFieldInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpFieldInfo.java
index 322575635..bfa928354 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpFieldInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpFieldInfo.java
@@ -34,6 +34,7 @@
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import org.scijava.Priority;
@@ -60,15 +61,17 @@ public class OpFieldInfo implements OpInfo {
 
 	private final Object instance;
 	private final Field field;
+	private final List<String> names;
 
 	private Struct struct;
 	private ValidityException validityException;
 
 	private final Hints hints;
 
-	public OpFieldInfo(final Object instance, final Field field) {
+	public OpFieldInfo(final Object instance, final Field field, final String... names) {
 		this.instance = instance;
 		this.field = field;
+		this.names = Arrays.asList(names);
 
 		if (Modifier.isStatic(field.getModifiers())) {
 			// Field is static; instance must be null.
@@ -108,6 +111,11 @@ public OpFieldInfo(final Object instance, final Field field) {
 
 	// -- OpInfo methods --
 
+	@Override
+	public List<String> names() {
+		return names;
+	}
+
 	@Override
 	public Type opType() {
 		return field.getGenericType();
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java
index 38cacbd30..5784526ad 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java
@@ -38,6 +38,7 @@
 import java.lang.reflect.Parameter;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -82,13 +83,14 @@
 public class OpMethodInfo implements OpInfo {
 
 	private final Method method;
+	private final List<String> names;
 	private Type opType;
 	private Struct struct;
 	private final ValidityException validityException;
 
 	private final Hints hints;
 
-	public OpMethodInfo(final Method method) {
+	public OpMethodInfo(final Method method, final String... names) {
 		final List<ValidityProblem> problems = new ArrayList<>();
 		// Reject all non public methods
 		if (!Modifier.isPublic(method.getModifiers())) {
@@ -103,6 +105,7 @@ public OpMethodInfo(final Method method) {
 				" must be static."));
 		}
 		this.method = method;
+		this.names = Arrays.asList(names);
 		this.hints = formHints(method.getAnnotation(OpHints.class));
 		// determine the functional interface this Op should implement
 		final OpMethod methodAnnotation = method.getAnnotation(OpMethod.class);
@@ -121,6 +124,11 @@ public OpMethodInfo(final Method method) {
 
 	// -- OpInfo methods --
 
+	@Override
+	public List<String> names() {
+		return names;
+	}
+
 	@Override
 	public Type opType() {
 		return opType;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java
index c9230cd49..44609a792 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java
+++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java
@@ -79,6 +79,11 @@ public OpInfo srcInfo() {
 		return srcInfo;
 	}
 
+	@Override
+	public List<String> names() {
+		return srcInfo().names();
+	}
+
 	@Override
 	public Type opType() {
 		return opType;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/AbstractTestEnvironment.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/AbstractTestEnvironment.java
index e2bce62c2..9b36bb083 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/AbstractTestEnvironment.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/AbstractTestEnvironment.java
@@ -11,6 +11,7 @@
 import org.junit.BeforeClass;
 import org.scijava.Context;
 import org.scijava.cache.CacheService;
+import org.scijava.ops.impl.DefaultOpService;
 import org.scijava.plugin.PluginService;
 import org.scijava.thread.ThreadService;
 import org.scijava.types.TypeService;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java
index a3c8051b8..a3bcd8896 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java
+++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java
@@ -57,8 +57,8 @@ public void testClassOpificationWithPriority() {
 	@Test
 	public void testRegister() {
 		String opName = "test.opifyOp";
-		OpInfo opifyOpInfo = ops.env().opify(OpifyOp.class, Priority.HIGH);
-		ops.env().register(opifyOpInfo, opName);
+		OpInfo opifyOpInfo = ops.env().opify(OpifyOp.class, Priority.HIGH, opName);
+		ops.env().register(opifyOpInfo);
 
 		String actual = ops.op(opName).input().outType(String.class).create();
 
diff --git a/scijava/scijava-ops/templates/main/java/module-info.vm b/scijava/scijava-ops/templates/main/java/module-info.vm
index 103d389d9..e37723ca5 100644
--- a/scijava/scijava-ops/templates/main/java/module-info.vm
+++ b/scijava/scijava-ops/templates/main/java/module-info.vm
@@ -33,6 +33,7 @@ module org.scijava.ops {
 	requires org.scijava.function;
 	requires org.scijava.struct;
 	requires org.scijava.ops.api;
+	requires org.scijava.ops.discovery;
 	requires org.scijava.types;
 	requires javassist;
 	requires java.compiler;

From 43c4e512dd3fa70a75be97947a66c7009e905c43 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 23 Jul 2021 16:01:08 -0500
Subject: [PATCH 81/91] Rename scijava-ops -> scijava-ops-engine

---
 imagej/imagej-ops2/pom.xml                    |   2 +-
 .../src/main/java/module-info.java            | 228 +++++++++---------
 .../java/net/imagej/ops2/copy/CopyII.java     |   3 +-
 .../accelerate/VectorAccelerator.java         |   3 +-
 .../net/imagej/ops2/eval/DefaultEval.java     |   2 +-
 .../net/imagej/ops2/eval/OpEvaluator.java     |   4 +-
 .../ops2/filter/pad/DefaultPadInputFFT.java   |   2 +-
 .../filter/pad/DefaultPadShiftKernelFFT.java  |   2 +-
 .../ops2/filter/pad/PadInputFFTMethods.java   |   2 +-
 .../filter/pad/PadShiftKernelFFTMethods.java  |   2 +-
 .../geom2d/LabelRegionToPolygonConverter.java |   4 +-
 .../ops2/geom/geom3d/RAIToMeshConverter.java  |   4 +-
 .../net/imagej/ops2/help/AbstractHelp.java    |   6 +-
 .../net/imagej/ops2/help/HelpForName.java     |   4 +-
 .../ops2/image/equation/DefaultEquation.java  |   2 +-
 .../imagemoments/AbstractImageMomentOp.java   |   2 +-
 .../MapNeighborhoodWithCenter.java            |   2 +-
 .../ops2/morphology/DistanceTransforms.java   |   2 +-
 .../ApplyLocalThresholdIntegral.java          |   2 +-
 .../apply/ApplyConstantThreshold.java         |   4 +-
 .../ComputeIntermodesThreshold.java           |   2 +-
 .../isoData/ComputeIsoDataThreshold.java      |   2 +-
 .../minError/ComputeMinErrorThreshold.java    |   2 +-
 .../java/net/imagej/ops2/AbstractOpTest.java  |   4 +-
 .../imagej/ops2/coloc/ColocalisationTest.java |   6 +-
 .../net/imagej/ops2/coloc/icq/LiICQTest.java  |   2 +-
 .../coloc/kendallTau/KendallTauBRankTest.java |   2 +-
 .../ops2/coloc/maxTKendallTau/MTKTTest.java   |   2 +-
 .../ops2/coloc/pValue/DefaultPValueTest.java  |   2 +-
 .../coloc/pearsons/DefaultPearsonsTest.java   |   2 +-
 .../imagej/ops2/convert/ConvertMapTest.java   |   2 +-
 .../imagej/ops2/copy/CopyArrayImgTest.java    |   1 -
 .../net/imagej/ops2/copy/CopyRAITest.java     |   2 +-
 .../imagej/ops2/create/CreateImgPlusTest.java |   2 +-
 .../net/imagej/ops2/create/CreateImgTest.java |   2 +-
 .../CreateKernel2ndDerivBiGaussTest.java      |   1 -
 .../ops2/create/CreateKernelBiGaussTest.java  |   1 -
 .../create/CreateKernelDiffractionTest.java   |   3 +-
 .../ops2/create/CreateKernelGaborTest.java    |   2 +-
 .../ops2/create/CreateKernelGaussTest.java    |   2 +-
 .../ops2/create/CreateKernelLogTest.java      |   2 +-
 .../ops2/create/CreateLabelingTest.java       |   2 +-
 .../java/net/imagej/ops2/eval/EvalTest.java   |   2 +-
 .../HistogramOfOrientedGradients2DTest.java   |   3 +-
 .../PartialDerivativeFilterTest.java          |   3 +-
 .../filter/hessian/HessianFilterTest.java     |   3 +-
 .../ops2/filter/mean/MeanFilterTest.java      |   3 +-
 .../ops2/filter/sobel/SobelFilterTest.java    |   3 +-
 .../vesselness/FrangiVesselnessTest.java      |   7 +-
 .../ops2/geom/geom3d/QuickHull3DTest.java     |   3 +-
 .../imagej/ops2/image/ascii/ASCIITest.java    |   3 +-
 .../DefaultDistanceTransformTest.java         |   3 +-
 .../DistanceTransform3DTest.java              |   3 +-
 .../image/histogram/DefaultHistogramTest.java |   3 +-
 .../ops2/image/integral/IntegralImgTest.java  |   3 +-
 .../ops2/image/normalize/NormalizeTest.java   |   3 +-
 .../image/watershed/WatershedBinaryTest.java  |   3 +-
 .../ops2/image/watershed/WatershedTest.java   |   3 +-
 .../ops2/linalg/rotate/Rotate3dTest.java      |   3 +-
 .../ops2/linalg/rotate/Rotate3fTest.java      |   3 +-
 .../ops2/logic/BooleanTypeLogicTest.java      |   3 +-
 .../imagej/ops2/logic/ConditionalTest.java    |   3 +-
 .../ops2/math/UnaryRealTypeMathTest.java      |   3 +-
 .../net/imagej/ops2/project/ProjectTest.java  |   3 +-
 .../ops2/threshold/AbstractThresholdTest.java |   3 +-
 .../ops2/threshold/ComputeThresholdTest.java  |   3 +-
 .../apply/ApplyManualThresholdTest.java       |   3 +-
 .../threshold/apply/LocalThresholdTest.java   |   3 +-
 .../CollapseNumericViewTest.java              |   3 +-
 .../CollapseRealViewTest.java                 |   3 +-
 .../collapseView/CollapseViewTest.java        |   3 +-
 .../concatenateView/ConcatenateViewTest.java  |   3 +-
 .../DropSingletonDimensionsViewTest.java      |   3 +-
 .../ExtendBorderViewTest.java                 |   3 +-
 .../ExtendMirrorDoubleViewTest.java           |   3 +-
 .../ExtendMirrorSingleViewTest.java           |   3 +-
 .../ExtendPeriodicViewTest.java               |   3 +-
 .../ExtendRandomViewTest.java                 |   3 +-
 .../extendValueView/ExtendValueViewTest.java  |   3 +-
 .../transform/extendView/ExtendViewTest.java  |   3 +-
 .../extendZeroView/ExtendZeroViewTest.java    |   3 +-
 .../FlatIterableViewTest.java                 |   3 +-
 .../hyperSliceView/HyperSliceViewTest.java    |   3 +-
 .../interpolateView/InterpolateViewTest.java  |   3 +-
 .../intervalView/IntervalViewTest.java        |   3 +-
 .../invertAxisView/InvertAxisViewTest.java    |   3 +-
 .../transform/offsetView/OffsetViewTest.java  |   3 +-
 .../permuteView/PermuteViewTest.java          |   3 +-
 .../transform/rasterView/RasterViewTest.java  |   3 +-
 .../transform/rotateView/RotateViewTest.java  |   3 +-
 .../transform/shearView/ShearViewTest.java    |   3 +-
 .../transform/stackView/StackViewTest.java    |   3 +-
 .../subsampleView/SubsampleViewTest.java      |   3 +-
 .../translateView/TranslateViewTest.java      |   3 +-
 .../unshearView/UnshearViewTest.java          |   3 +-
 .../zeroMinView/ZeroMinViewTest.java          |   3 +-
 pom.xml                                       |   4 +-
 scijava/scijava-ops-discovery/pom.xml         |   2 +-
 scijava/scijava-ops-engine/.gitignore         |   3 +-
 .../LICENSE.txt                               |   0
 .../README.md                                 |   0
 .../bin/generate.groovy                       |   0
 .../pom.xml                                   |  20 +-
 .../src/main/java/module-info.java            |  52 ++++
 .../engine}/AnnotatedOpDependencyMember.java  |   2 +-
 .../org/scijava/ops/engine}/BaseOpHints.java  |   2 +-
 .../scijava/ops/engine}/ExceptionUtils.java   |   2 +-
 .../ops/engine}/FieldOpDependencyMember.java  |   2 +-
 .../java/org/scijava/ops/engine}/Hints.java   |   4 +-
 .../MethodParameterOpDependencyMember.java    |   2 +-
 .../org/scijava/ops/engine}/NeededOp.java     |   2 +-
 .../org/scijava/ops/engine}/OpBuilder.java    |   2 +-
 .../org/scijava/ops/engine}/OpCandidate.java  |   4 +-
 .../scijava/ops/engine}/OpDependencies.java   |   2 +-
 .../ops/engine}/OpDependencyMember.java       |   2 +-
 .../scijava/ops/engine}/OpEnvironment.java    |   2 +-
 .../ops/engine}/OpExecutionException.java     |   2 +-
 .../ops/engine}/OpExecutionSummary.java       |   4 +-
 .../java/org/scijava/ops/engine}/OpHints.java |   2 +-
 .../org/scijava/ops/engine}/OpHistory.java    |   2 +-
 .../scijava/ops/engine}/OpHistoryService.java |   2 +-
 .../java/org/scijava/ops/engine}/OpInfo.java  |   2 +-
 .../scijava/ops/engine}/OpInfoGenerator.java  |   2 +-
 .../org/scijava/ops/engine}/OpInstance.java   |   2 +-
 .../java/org/scijava/ops/engine}/OpRef.java   |   4 +-
 .../org/scijava/ops/engine}/OpService.java    |   2 +-
 .../java/org/scijava/ops/engine}/OpUtils.java |   4 +-
 .../org/scijava/ops/engine}/OpWrapper.java    |   4 +-
 .../ComputersToFunctionsAndLift.java          |   2 +-
 .../FunctionsToComputersAndLift.java          |   2 +-
 .../ComputersToFunctionsViaFunction.java      |   2 +-
 .../ComputersToFunctionsViaSource.java        |   2 +-
 .../functional/FunctionsToComputers.java      |   2 +-
 .../adapt/functional/InplacesToFunctions.java |   2 +-
 .../engine}/adapt/lift/ComputerToArrays.java  |   2 +-
 .../adapt/lift/ComputerToIterables.java       |   2 +-
 .../engine}/adapt/lift/FunctionToArrays.java  |   2 +-
 .../adapt/lift/FunctionToIterables.java       |   2 +-
 .../engine}/adapt/lift/InplaceToArrays.java   |   2 +-
 .../conversionLoss/IdentityLossReporter.java  |   6 +-
 .../engine}/conversionLoss/LossReporter.java  |   2 +-
 .../conversionLoss/LossReporterWrapper.java   |  14 +-
 .../conversionLoss/LosslessReporter.java      |   2 +-
 .../PrimitiveArrayLossReporters.java          |   6 +-
 .../PrimitiveLossReporters.java               |   6 +-
 .../ops/engine}/copy/CopyOpCollection.java    |   2 +-
 .../engine}/create/CreateOpCollection.java    |   2 +-
 .../ops/engine}/hint/AbstractHints.java       |   4 +-
 .../ops/engine}/hint/AdaptationHints.java     |   6 +-
 .../ops/engine}/hint/DefaultHints.java        |  10 +-
 .../ops/engine}/hint/ImmutableHints.java      |   4 +-
 .../ops/engine}/hint/SimplificationHints.java |   6 +-
 .../engine}/impl/DefaultOpEnvironment.java    |  54 ++---
 .../ops/engine}/impl/DefaultOpHistory.java    |   8 +-
 .../ops/engine}/impl/DefaultOpService.java    |  12 +-
 .../ops/engine}/impl/LambdaTypeBaker.java     |   4 +-
 .../ops/engine}/impl/MatchingConditions.java  |   6 +-
 .../impl/PluginBasedClassOpInfoGenerator.java |  10 +-
 .../PluginBasedOpCollectionInfoGenerator.java |  12 +-
 .../impl/SingletonOpHistoryService.java       |   6 +-
 .../org/scijava/ops/engine}/log/Logger.java   |   2 +-
 .../matcher/DependencyMatchingException.java  |   4 +-
 .../ops/engine}/matcher/MatchingResult.java   |  10 +-
 .../ops/engine}/matcher/OpMatcher.java        |  10 +-
 .../engine}/matcher/OpMatchingException.java  |   4 +-
 .../matcher/impl/DefaultOpMatcher.java        |  26 +-
 .../engine}/matcher/impl/DefaultOpRef.java    |   6 +-
 .../engine}/matcher/impl/MatchingUtils.java   |   2 +-
 .../matcher/impl/OpAdaptationInfo.java        |  20 +-
 .../ops/engine}/matcher/impl/OpClassInfo.java |  18 +-
 .../ops/engine}/matcher/impl/OpFieldInfo.java |  14 +-
 .../engine}/matcher/impl/OpMethodInfo.java    |  22 +-
 .../ops/engine}/matcher/impl/OpWrappers.java  |  14 +-
 .../org/scijava/ops/engine}/math/Add.java     |   2 +-
 .../ops/engine}/math/MathOpCollection.java    |   2 +-
 .../org/scijava/ops/engine}/math/MathOps.java |   2 +-
 .../scijava/ops/engine}/math/Normalize.java   |   2 +-
 .../org/scijava/ops/engine}/math/Power.java   |   2 +-
 .../org/scijava/ops/engine}/math/Sqrt.java    |   2 +-
 .../org/scijava/ops/engine}/math/Zero.java    |   2 +-
 .../ops/engine}/monitor/DefaultOpMonitor.java |   4 +-
 .../ops/engine}/monitor/OpMonitor.java        |   4 +-
 .../ops/engine}/simplify/ChainCluster.java    |   4 +-
 .../ops/engine}/simplify/Identity.java        |   6 +-
 .../simplify/InfoSimplificationGenerator.java |  12 +-
 .../ops/engine}/simplify/MutatorChain.java    |   4 +-
 .../simplify/PrimitiveArraySimplifiers.java   |   6 +-
 .../simplify/PrimitiveListSimplifier.java     |   2 +-
 .../simplify/PrimitiveSimplifiers.java        |   6 +-
 .../simplify/SimplificationMetadata.java      |   8 +-
 .../engine}/simplify/SimplificationUtils.java |  12 +-
 .../engine}/simplify/SimplifiedMember.java    |   2 +-
 .../engine}/simplify/SimplifiedOpInfo.java    |  22 +-
 .../ops/engine}/simplify/SimplifiedOpRef.java |  18 +-
 .../ops/engine}/simplify/Simplifier.java      |   2 +-
 .../ops/engine}/simplify/TypePair.java        |   2 +-
 .../org/scijava/ops/engine}/stats/Mean.java   |   2 +-
 .../org/scijava/ops/engine}/stats/Size.java   |   2 +-
 .../struct/ClassOpDependencyMemberParser.java |   4 +-
 .../struct/ClassParameterMemberParser.java    |   2 +-
 .../struct/ConvertedParameterMember.java      |   2 +-
 .../struct/FieldParameterMemberParser.java    |   2 +-
 .../FunctionalParameterMemberParser.java      |   1 +
 .../engine}/struct/FunctionalParameters.java  |   6 +-
 .../engine}/struct/JavadocParameterData.java  |   6 +-
 .../MethodOpDependencyMemberParser.java       |   4 +-
 .../struct/MethodParameterMemberParser.java   |   4 +-
 .../struct/OpRetypingMemberParser.java        |   4 +-
 .../ops/engine}/struct/ParameterData.java     |   2 +-
 .../ops/engine/struct/ParameterMember.java    | 157 ++++++++++++
 .../ops/engine}/struct/RetypingRequest.java   |   2 +-
 .../struct/SynthesizedParameterData.java      |   2 +-
 .../struct/SynthesizedParameterMember.java    |   2 +-
 .../org/scijava/ops/engine}/util/Adapt.java   |   2 +-
 .../ops/engine}/util/AnnotationUtils.java     |   2 +-
 .../ops/engine}/util/FunctionUtils.java       |   6 +-
 .../org/scijava/ops/engine}/util/Inject.java  |   8 +-
 .../org/scijava/ops/engine}/util/Maps.java    |   2 +-
 .../ops/engine}/util/OpMethodUtils.java       |   2 +-
 .../ops/engine}/AbstractTestEnvironment.java  |   5 +-
 .../ops/engine}/AutoTransformTest.java        |   2 +-
 .../ops/engine}/JavadocParameterTest.java     |   8 +-
 .../org/scijava/ops/engine}/ModuleTest.java   |   2 +-
 .../ops/engine}/OpBuilderNoOutputTest.java    |   4 +-
 .../scijava/ops/engine}/OpBuilderTest.java    |   4 +-
 .../scijava/ops/engine}/OpBuilderTestOps.java |   2 +-
 .../scijava/ops/engine}/OpCollectionTest.java |   2 +-
 .../ops/engine}/OpEnvironmentTest.java        |   7 +-
 .../OpMethodDependencyPositionTest.java       |   2 +-
 .../org/scijava/ops/engine}/OpMethodTest.java |   2 +-
 .../scijava/ops/engine}/OpMethodTestOps.java  |   4 +-
 .../scijava/ops/engine}/OpPriorityTest.java   |   2 +-
 .../java/org/scijava/ops/engine}/OpsTest.java |   2 +-
 .../java/org/scijava/ops/engine}/TestOps.java |   2 +-
 .../org/scijava/ops/engine}/TestUtils.java    |   2 +-
 .../adapt/OpAdaptationPriorityTest.java       |  10 +-
 .../ComputerToFunctionIterablesTest.java      |   6 +-
 .../FunctionToComputerIterablesTest.java      |   6 +-
 .../ComputerToFunctionAdaptTest.java          |   6 +-
 .../ComputerToFunctionAdaptTestOps.java       |   2 +-
 .../FunctionToComputerAdaptTest.java          |   6 +-
 .../FunctionToComputerAdaptTestOps.java       |   2 +-
 .../InplaceToFunctionAdaptTest.java           |   6 +-
 .../adapt/lift/ComputerToArraysTest.java      |   6 +-
 .../adapt/lift/ComputerToIterablesTest.java   |   6 +-
 .../adapt/lift/FunctionToArraysTest.java      |   4 +-
 .../adapt/lift/FunctionToIterablesTest.java   |   6 +-
 .../adapt/lift/InplaceToArraysTest.java       |   6 +-
 .../ops/engine}/hints/AdaptationHintTest.java |  14 +-
 .../engine}/hints/SimplificationHintTest.java |  16 +-
 .../ops/engine}/impl/OpCachingTest.java       |  12 +-
 .../ops/engine/impl}/ProvenanceTest.java      |  14 +-
 .../matcher/DefaultMatchingErrorTest.java     |  10 +-
 .../engine}/matcher/MatchingUtilsTest.java    |   4 +-
 .../engine}/matcher/MatchingWithAnyTest.java  |   4 +-
 .../engine}/matcher/MatchingWithGCSTTest.java |   6 +-
 .../ops/engine}/matcher/OpWrappersTest.java   |   6 +-
 .../ops/engine}/monitor/OpMonitorTest.java    |   8 +-
 .../simplify/PrimitiveListSimplifierTest.java |   5 +-
 .../SimplificationAdaptationTest.java         |   4 +-
 .../simplify/SimplificationPriorityTest.java  |  10 +-
 .../ops/engine}/simplify/SimplifyIOTest.java  |   4 +-
 .../ops/engine}/simplify/SimplifyTest.java    |   4 +-
 .../scijava/ops/engine}/stats/MeanTest.java   |   6 +-
 .../ops/engine}/util/AdaptersTest.java        |   6 +-
 .../ops/engine}/util/ComputersTest.java       |   6 +-
 .../ops/engine}/util/FunctionsTest.java       |   6 +-
 .../ops/engine}/util/InplacesTest.java        |   6 +-
 .../ops/engine}/util/LambdaizerTest.java      |   3 +-
 .../scijava/ops/engine}/util/LiftTest.java    |   7 +-
 .../ops/engine}/util/OpsAsParametersTest.java |   6 +-
 .../templates/main/java/module-info.list      |   0
 .../templates/main/java/module-info.vm        |  16 +-
 .../org/scijava/ops/engine}/OpBuilder.list    |   2 +-
 .../java/org/scijava/ops/engine}/OpBuilder.vm |   2 +-
 .../ComputersToFunctionsAndLift.list          |   2 +-
 .../ComputersToFunctionsAndLift.vm            |   2 +-
 .../FunctionsToComputersAndLift.list          |   2 +-
 .../FunctionsToComputersAndLift.vm            |   2 +-
 .../ComputersToFunctionsViaFunction.list      |   2 +-
 .../ComputersToFunctionsViaFunction.vm        |   2 +-
 .../ComputersToFunctionsViaSource.list        |   2 +-
 .../ComputersToFunctionsViaSource.vm          |   2 +-
 .../functional/FunctionsToComputers.list      |   4 +
 .../adapt/functional/FunctionsToComputers.vm  |   2 +-
 .../adapt/functional/InplacesToFunctions.list |   2 +-
 .../adapt/functional/InplacesToFunctions.vm   |   2 +-
 .../engine}/adapt/lift/ComputerToArrays.list  |   2 +-
 .../engine}/adapt/lift/ComputerToArrays.vm    |   2 +-
 .../adapt/lift/ComputerToIterables.list       |   2 +-
 .../engine}/adapt/lift/ComputerToIterables.vm |   2 +-
 .../engine}/adapt/lift/FunctionToArrays.list  |   2 +-
 .../engine}/adapt/lift/FunctionToArrays.vm    |   2 +-
 .../adapt/lift/FunctionToIterables.list       |   2 +-
 .../engine}/adapt/lift/FunctionToIterables.vm |   2 +-
 .../engine}/adapt/lift/InplaceToArrays.list   |   2 +-
 .../ops/engine}/adapt/lift/InplaceToArrays.vm |   2 +-
 .../ops/engine}/matcher/impl/OpWrappers.list  |   2 +-
 .../ops/engine}/matcher/impl/OpWrappers.vm    |  14 +-
 .../ops/engine}/util/FunctionUtils.list       |   0
 .../scijava/ops/engine}/util/FunctionUtils.vm |   6 +-
 .../org/scijava/ops/engine}/util/Globals.list |   0
 .../scijava/ops/engine}/OpBuilderTest.list    |   2 +-
 .../org/scijava/ops/engine}/OpBuilderTest.vm  |   4 +-
 .../scijava/ops/engine}/OpBuilderTestOps.list |   0
 .../scijava/ops/engine}/OpBuilderTestOps.vm   |   2 +-
 .../org/scijava/ops/engine}/OpMethodTest.list |   2 +-
 .../org/scijava/ops/engine}/OpMethodTest.vm   |   2 +-
 .../scijava/ops/engine}/OpMethodTestOps.list  |   2 +-
 .../scijava/ops/engine}/OpMethodTestOps.vm    |   6 +-
 .../ComputerToFunctionIterablesTest.list      |   2 +-
 .../ComputerToFunctionIterablesTest.vm        |   6 +-
 .../FunctionToComputerIterablesTest.list      |   2 +-
 .../FunctionToComputerIterablesTest.vm        |   6 +-
 .../ComputerToFunctionAdaptTest.list          |   2 +-
 .../functional/ComputerToFunctionAdaptTest.vm |   6 +-
 .../ComputerToFunctionAdaptTestOps.list       |   2 +-
 .../ComputerToFunctionAdaptTestOps.vm         |   2 +-
 .../FunctionToComputerAdaptTest.list          |   2 +-
 .../functional/FunctionToComputerAdaptTest.vm |   6 +-
 .../FunctionToComputerAdaptTestOps.list       |   2 +-
 .../FunctionToComputerAdaptTestOps.vm         |   2 +-
 .../InplaceToFunctionAdaptTest.list           |   2 +-
 .../functional/InplaceToFunctionAdaptTest.vm  |   6 +-
 .../adapt/lift/ComputerToArraysTest.list      |   2 +-
 .../adapt/lift/ComputerToArraysTest.vm        |   6 +-
 .../adapt/lift/ComputerToIterablesTest.list   |   2 +-
 .../adapt/lift/ComputerToIterablesTest.vm     |   6 +-
 .../adapt/lift/FunctionToArraysTest.list      |   2 +-
 .../adapt/lift/FunctionToArraysTest.vm        |   4 +-
 .../adapt/lift/FunctionToIterablesTest.list   |   2 +-
 .../adapt/lift/FunctionToIterablesTest.vm     |   6 +-
 .../adapt/lift/InplaceToArraysTest.list       |   2 +-
 .../engine}/adapt/lift/InplaceToArraysTest.vm |   6 +-
 .../ops/engine}/matcher/OpWrappersTest.list   |   2 +-
 .../ops/engine}/matcher/OpWrappersTest.vm     |   6 +-
 scijava/scijava-ops/.gitignore                |   2 -
 .../src/main/java/module-info.java            |  52 ----
 .../functional/FunctionsToComputers.list      |   4 -
 339 files changed, 1048 insertions(+), 849 deletions(-)
 rename scijava/{scijava-ops => scijava-ops-engine}/LICENSE.txt (100%)
 rename scijava/{scijava-ops => scijava-ops-engine}/README.md (100%)
 rename scijava/{scijava-ops => scijava-ops-engine}/bin/generate.groovy (100%)
 mode change 100755 => 100644
 rename scijava/{scijava-ops => scijava-ops-engine}/pom.xml (86%)
 create mode 100644 scijava/scijava-ops-engine/src/main/java/module-info.java
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/AnnotatedOpDependencyMember.java (98%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/BaseOpHints.java (94%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/ExceptionUtils.java (94%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/FieldOpDependencyMember.java (98%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/Hints.java (91%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/MethodParameterOpDependencyMember.java (96%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/NeededOp.java (60%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/OpBuilder.java (99%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/OpCandidate.java (98%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/OpDependencies.java (96%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/OpDependencyMember.java (98%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/OpEnvironment.java (99%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/OpExecutionException.java (98%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/OpExecutionSummary.java (92%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/OpHints.java (89%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/OpHistory.java (96%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/OpHistoryService.java (76%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/OpInfo.java (98%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/OpInfoGenerator.java (69%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/OpInstance.java (93%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/OpRef.java (98%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/OpService.java (98%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/OpUtils.java (99%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/OpWrapper.java (86%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/adapt/complexLift/ComputersToFunctionsAndLift.java (99%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/adapt/complexLift/FunctionsToComputersAndLift.java (99%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/adapt/functional/ComputersToFunctionsViaFunction.java (99%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/adapt/functional/ComputersToFunctionsViaSource.java (99%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/adapt/functional/FunctionsToComputers.java (99%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/adapt/functional/InplacesToFunctions.java (99%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/adapt/lift/ComputerToArrays.java (97%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/adapt/lift/ComputerToIterables.java (99%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/adapt/lift/FunctionToArrays.java (99%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/adapt/lift/FunctionToIterables.java (99%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/adapt/lift/InplaceToArrays.java (98%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/conversionLoss/IdentityLossReporter.java (80%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/conversionLoss/LossReporter.java (89%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/conversionLoss/LossReporterWrapper.java (76%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/conversionLoss/LosslessReporter.java (83%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/conversionLoss/PrimitiveArrayLossReporters.java (77%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/conversionLoss/PrimitiveLossReporters.java (92%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/copy/CopyOpCollection.java (96%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/create/CreateOpCollection.java (97%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/hint/AbstractHints.java (92%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/hint/AdaptationHints.java (85%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/hint/DefaultHints.java (71%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/hint/ImmutableHints.java (88%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/hint/SimplificationHints.java (88%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/impl/DefaultOpEnvironment.java (95%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/impl/DefaultOpHistory.java (95%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/impl/DefaultOpService.java (95%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/impl/LambdaTypeBaker.java (96%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/impl/MatchingConditions.java (83%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/impl/PluginBasedClassOpInfoGenerator.java (76%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/impl/PluginBasedOpCollectionInfoGenerator.java (85%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/impl/SingletonOpHistoryService.java (75%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/log/Logger.java (99%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/matcher/DependencyMatchingException.java (92%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/matcher/MatchingResult.java (95%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/matcher/OpMatcher.java (92%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/matcher/OpMatchingException.java (85%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/matcher/impl/DefaultOpMatcher.java (95%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/matcher/impl/DefaultOpRef.java (97%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/matcher/impl/MatchingUtils.java (99%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/matcher/impl/OpAdaptationInfo.java (86%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/matcher/impl/OpClassInfo.java (93%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/matcher/impl/OpFieldInfo.java (94%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/matcher/impl/OpMethodInfo.java (92%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/matcher/impl/OpWrappers.java (99%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/math/Add.java (98%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/math/MathOpCollection.java (97%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/math/MathOps.java (92%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/math/Normalize.java (96%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/math/Power.java (96%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/math/Sqrt.java (96%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/math/Zero.java (94%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/monitor/DefaultOpMonitor.java (91%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/monitor/OpMonitor.java (97%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/simplify/ChainCluster.java (88%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/simplify/Identity.java (76%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/simplify/InfoSimplificationGenerator.java (92%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/simplify/MutatorChain.java (93%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/simplify/PrimitiveArraySimplifiers.java (92%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/simplify/PrimitiveListSimplifier.java (89%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/simplify/PrimitiveSimplifiers.java (93%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/simplify/SimplificationMetadata.java (94%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/simplify/SimplificationUtils.java (96%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/simplify/SimplifiedMember.java (88%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/simplify/SimplifiedOpInfo.java (90%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/simplify/SimplifiedOpRef.java (90%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/simplify/Simplifier.java (88%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/simplify/TypePair.java (88%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/stats/Mean.java (95%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/stats/Size.java (96%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/struct/ClassOpDependencyMemberParser.java (92%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/struct/ClassParameterMemberParser.java (94%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/struct/ConvertedParameterMember.java (92%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/struct/FieldParameterMemberParser.java (94%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/struct/FunctionalParameterMemberParser.java (96%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/struct/FunctionalParameters.java (93%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/struct/JavadocParameterData.java (96%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/struct/MethodOpDependencyMemberParser.java (92%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/struct/MethodParameterMemberParser.java (91%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/struct/OpRetypingMemberParser.java (92%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/struct/ParameterData.java (80%)
 create mode 100644 scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ParameterMember.java
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/struct/RetypingRequest.java (88%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/struct/SynthesizedParameterData.java (92%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/struct/SynthesizedParameterMember.java (96%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/util/Adapt.java (99%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/util/AnnotationUtils.java (98%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/util/FunctionUtils.java (97%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/util/Inject.java (92%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/util/Maps.java (97%)
 rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-ops-engine/src/main/java/org/scijava/ops/engine}/util/OpMethodUtils.java (95%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/AbstractTestEnvironment.java (91%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/AutoTransformTest.java (99%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/JavadocParameterTest.java (95%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/ModuleTest.java (95%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/OpBuilderNoOutputTest.java (91%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/OpBuilderTest.java (99%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/OpBuilderTestOps.java (99%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/OpCollectionTest.java (98%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/OpEnvironmentTest.java (89%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/OpMethodDependencyPositionTest.java (95%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/OpMethodTest.java (99%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/OpMethodTestOps.java (99%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/OpPriorityTest.java (98%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/OpsTest.java (99%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/TestOps.java (98%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/TestUtils.java (98%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/adapt/OpAdaptationPriorityTest.java (91%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/adapt/complexLift/ComputerToFunctionIterablesTest.java (98%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/adapt/complexLift/FunctionToComputerIterablesTest.java (97%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/adapt/functional/ComputerToFunctionAdaptTest.java (97%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/adapt/functional/ComputerToFunctionAdaptTestOps.java (99%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/adapt/functional/FunctionToComputerAdaptTest.java (97%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/adapt/functional/FunctionToComputerAdaptTestOps.java (99%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/adapt/functional/InplaceToFunctionAdaptTest.java (99%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/adapt/lift/ComputerToArraysTest.java (99%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/adapt/lift/ComputerToIterablesTest.java (98%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/adapt/lift/FunctionToArraysTest.java (99%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/adapt/lift/FunctionToIterablesTest.java (98%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/adapt/lift/InplaceToArraysTest.java (99%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/hints/AdaptationHintTest.java (89%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/hints/SimplificationHintTest.java (89%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/impl/OpCachingTest.java (93%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops/provenance => scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl}/ProvenanceTest.java (92%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/matcher/DefaultMatchingErrorTest.java (90%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/matcher/MatchingUtilsTest.java (99%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/matcher/MatchingWithAnyTest.java (97%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/matcher/MatchingWithGCSTTest.java (92%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/matcher/OpWrappersTest.java (99%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/monitor/OpMonitorTest.java (93%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/simplify/PrimitiveListSimplifierTest.java (84%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/simplify/SimplificationAdaptationTest.java (87%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/simplify/SimplificationPriorityTest.java (89%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/simplify/SimplifyIOTest.java (92%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/simplify/SimplifyTest.java (92%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/stats/MeanTest.java (82%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/util/AdaptersTest.java (95%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/util/ComputersTest.java (94%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/util/FunctionsTest.java (94%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/util/InplacesTest.java (94%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/util/LambdaizerTest.java (98%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/util/LiftTest.java (95%)
 rename scijava/{scijava-ops/src/test/java/org/scijava/ops => scijava-ops-engine/src/test/java/org/scijava/ops/engine}/util/OpsAsParametersTest.java (94%)
 rename scijava/{scijava-ops => scijava-ops-engine}/templates/main/java/module-info.list (100%)
 rename scijava/{scijava-ops => scijava-ops-engine}/templates/main/java/module-info.vm (71%)
 rename scijava/{scijava-ops/templates/main/java/org/scijava/ops => scijava-ops-engine/templates/main/java/org/scijava/ops/engine}/OpBuilder.list (97%)
 rename scijava/{scijava-ops/templates/main/java/org/scijava/ops => scijava-ops-engine/templates/main/java/org/scijava/ops/engine}/OpBuilder.vm (99%)
 rename scijava/{scijava-ops/templates/main/java/org/scijava/ops => scijava-ops-engine/templates/main/java/org/scijava/ops/engine}/adapt/complexLift/ComputersToFunctionsAndLift.list (94%)
 rename scijava/{scijava-ops/templates/main/java/org/scijava/ops => scijava-ops-engine/templates/main/java/org/scijava/ops/engine}/adapt/complexLift/ComputersToFunctionsAndLift.vm (98%)
 rename scijava/{scijava-ops/templates/main/java/org/scijava/ops => scijava-ops-engine/templates/main/java/org/scijava/ops/engine}/adapt/complexLift/FunctionsToComputersAndLift.list (94%)
 rename scijava/{scijava-ops/templates/main/java/org/scijava/ops => scijava-ops-engine/templates/main/java/org/scijava/ops/engine}/adapt/complexLift/FunctionsToComputersAndLift.vm (98%)
 rename scijava/{scijava-ops/templates/main/java/org/scijava/ops => scijava-ops-engine/templates/main/java/org/scijava/ops/engine}/adapt/functional/ComputersToFunctionsViaFunction.list (51%)
 rename scijava/{scijava-ops/templates/main/java/org/scijava/ops => scijava-ops-engine/templates/main/java/org/scijava/ops/engine}/adapt/functional/ComputersToFunctionsViaFunction.vm (98%)
 rename scijava/{scijava-ops/templates/main/java/org/scijava/ops => scijava-ops-engine/templates/main/java/org/scijava/ops/engine}/adapt/functional/ComputersToFunctionsViaSource.list (50%)
 rename scijava/{scijava-ops/templates/main/java/org/scijava/ops => scijava-ops-engine/templates/main/java/org/scijava/ops/engine}/adapt/functional/ComputersToFunctionsViaSource.vm (98%)
 create mode 100644 scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/FunctionsToComputers.list
 rename scijava/{scijava-ops/templates/main/java/org/scijava/ops => scijava-ops-engine/templates/main/java/org/scijava/ops/engine}/adapt/functional/FunctionsToComputers.vm (98%)
 rename scijava/{scijava-ops/templates/main/java/org/scijava/ops => scijava-ops-engine/templates/main/java/org/scijava/ops/engine}/adapt/functional/InplacesToFunctions.list (97%)
 rename scijava/{scijava-ops/templates/main/java/org/scijava/ops => scijava-ops-engine/templates/main/java/org/scijava/ops/engine}/adapt/functional/InplacesToFunctions.vm (98%)
 rename scijava/{scijava-ops/templates/main/java/org/scijava/ops => scijava-ops-engine/templates/main/java/org/scijava/ops/engine}/adapt/lift/ComputerToArrays.list (87%)
 rename scijava/{scijava-ops/templates/main/java/org/scijava/ops => scijava-ops-engine/templates/main/java/org/scijava/ops/engine}/adapt/lift/ComputerToArrays.vm (95%)
 rename scijava/{scijava-ops/templates/main/java/org/scijava/ops => scijava-ops-engine/templates/main/java/org/scijava/ops/engine}/adapt/lift/ComputerToIterables.list (94%)
 rename scijava/{scijava-ops/templates/main/java/org/scijava/ops => scijava-ops-engine/templates/main/java/org/scijava/ops/engine}/adapt/lift/ComputerToIterables.vm (98%)
 rename scijava/{scijava-ops/templates/main/java/org/scijava/ops => scijava-ops-engine/templates/main/java/org/scijava/ops/engine}/adapt/lift/FunctionToArrays.list (90%)
 rename scijava/{scijava-ops/templates/main/java/org/scijava/ops => scijava-ops-engine/templates/main/java/org/scijava/ops/engine}/adapt/lift/FunctionToArrays.vm (98%)
 rename scijava/{scijava-ops/templates/main/java/org/scijava/ops => scijava-ops-engine/templates/main/java/org/scijava/ops/engine}/adapt/lift/FunctionToIterables.list (92%)
 rename scijava/{scijava-ops/templates/main/java/org/scijava/ops => scijava-ops-engine/templates/main/java/org/scijava/ops/engine}/adapt/lift/FunctionToIterables.vm (99%)
 rename scijava/{scijava-ops/templates/main/java/org/scijava/ops => scijava-ops-engine/templates/main/java/org/scijava/ops/engine}/adapt/lift/InplaceToArrays.list (94%)
 rename scijava/{scijava-ops/templates/main/java/org/scijava/ops => scijava-ops-engine/templates/main/java/org/scijava/ops/engine}/adapt/lift/InplaceToArrays.vm (95%)
 rename scijava/{scijava-ops/templates/main/java/org/scijava/ops => scijava-ops-engine/templates/main/java/org/scijava/ops/engine}/matcher/impl/OpWrappers.list (96%)
 rename scijava/{scijava-ops/templates/main/java/org/scijava/ops => scijava-ops-engine/templates/main/java/org/scijava/ops/engine}/matcher/impl/OpWrappers.vm (93%)
 rename scijava/{scijava-ops/templates/main/java/org/scijava/ops => scijava-ops-engine/templates/main/java/org/scijava/ops/engine}/util/FunctionUtils.list (100%)
 rename scijava/{scijava-ops/templates/main/java/org/scijava/ops => scijava-ops-engine/templates/main/java/org/scijava/ops/engine}/util/FunctionUtils.vm (94%)
 rename scijava/{scijava-ops/templates/main/java/org/scijava/ops => scijava-ops-engine/templates/main/java/org/scijava/ops/engine}/util/Globals.list (100%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/OpBuilderTest.list (95%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/OpBuilderTest.vm (99%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/OpBuilderTestOps.list (100%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/OpBuilderTestOps.vm (99%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/OpMethodTest.list (96%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/OpMethodTest.vm (99%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/OpMethodTestOps.list (93%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/OpMethodTestOps.vm (97%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/adapt/complexLift/ComputerToFunctionIterablesTest.list (88%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/adapt/complexLift/ComputerToFunctionIterablesTest.vm (94%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/adapt/complexLift/FunctionToComputerIterablesTest.list (78%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/adapt/complexLift/FunctionToComputerIterablesTest.vm (93%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/adapt/functional/ComputerToFunctionAdaptTest.list (78%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/adapt/functional/ComputerToFunctionAdaptTest.vm (93%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/adapt/functional/ComputerToFunctionAdaptTestOps.list (84%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/adapt/functional/ComputerToFunctionAdaptTestOps.vm (97%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/adapt/functional/FunctionToComputerAdaptTest.list (78%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/adapt/functional/FunctionToComputerAdaptTest.vm (93%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/adapt/functional/FunctionToComputerAdaptTestOps.list (84%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/adapt/functional/FunctionToComputerAdaptTestOps.vm (98%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/adapt/functional/InplaceToFunctionAdaptTest.list (86%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/adapt/functional/InplaceToFunctionAdaptTest.vm (94%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/adapt/lift/ComputerToArraysTest.list (93%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/adapt/lift/ComputerToArraysTest.vm (95%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/adapt/lift/ComputerToIterablesTest.list (88%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/adapt/lift/ComputerToIterablesTest.vm (94%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/adapt/lift/FunctionToArraysTest.list (93%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/adapt/lift/FunctionToArraysTest.vm (97%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/adapt/lift/FunctionToIterablesTest.list (88%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/adapt/lift/FunctionToIterablesTest.vm (94%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/adapt/lift/InplaceToArraysTest.list (95%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/adapt/lift/InplaceToArraysTest.vm (95%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/matcher/OpWrappersTest.list (87%)
 rename scijava/{scijava-ops/templates/test/java/org/scijava/ops => scijava-ops-engine/templates/test/java/org/scijava/ops/engine}/matcher/OpWrappersTest.vm (93%)
 delete mode 100644 scijava/scijava-ops/.gitignore
 delete mode 100644 scijava/scijava-ops/src/main/java/module-info.java
 delete mode 100644 scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.list

diff --git a/imagej/imagej-ops2/pom.xml b/imagej/imagej-ops2/pom.xml
index 857774b88..62791da4b 100644
--- a/imagej/imagej-ops2/pom.xml
+++ b/imagej/imagej-ops2/pom.xml
@@ -273,7 +273,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.scijava</groupId>
-			<artifactId>scijava-ops</artifactId>
+			<artifactId>scijava-ops-engine</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/imagej/imagej-ops2/src/main/java/module-info.java b/imagej/imagej-ops2/src/main/java/module-info.java
index 77a79b22a..62479af5f 100644
--- a/imagej/imagej-ops2/src/main/java/module-info.java
+++ b/imagej/imagej-ops2/src/main/java/module-info.java
@@ -2,119 +2,119 @@
 	exports net.imagej.ops2;
 	
 	// -- Open plugins to scijava-common
-	opens net.imagej.ops2.coloc to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.coloc.icq to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.coloc.kendallTau to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.coloc.maxTKendallTau to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.coloc.pearsons to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.coloc.pValue to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.convert to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.convert.clip to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.convert.copy to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.copy to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.create to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.deconvolve to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.deconvolve.accelerate to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.eval to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.features.haralick to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.features.haralick.helper to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.features.hog to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.features.lbp2d to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.features.tamura2d to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.features.zernike to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.filter to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.filter.addNoise to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.filter.bilateral to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.filter.convolve to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.filter.correlate to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.filter.derivative to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.filter.derivativeGauss to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.filter.dog to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.filter.fft to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.filter.fftSize to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.filter.gauss to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.filter.hessian to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.filter.ifft to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.filter.max to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.filter.mean to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.filter.median to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.filter.min to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.filter.pad to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.filter.sigma to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.filter.sobel to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.filter.tubeness to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.filter.variance to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.filter.vesselness to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.geom to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.geom.geom2d to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.geom.geom3d to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.identity to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.image.ascii to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.image.cooccurrenceMatrix to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.image.distancetransform to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.image.equation to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.image.fill to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.image.histogram to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.image.integral to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.image.invert to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.image.normalize to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.image.watershed to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.imagemoments to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.imagemoments.centralmoments to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.imagemoments.hu to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.imagemoments.moments to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.imagemoments.normalizedcentralmoments to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.labeling to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.labeling.cca to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.linalg.rotate to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.logic to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.map.neighborhood to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.math to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.math.multiply to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.morphology to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.morphology.thin to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.project to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.segment.detectJunctions to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.segment.detectRidges to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.slice to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.stats to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.stats.regression.leastSquares to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.thread.chunker to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.threshold to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.threshold.apply to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.threshold.huang to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.threshold.ij1 to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.threshold.intermodes to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.threshold.isoData to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.threshold.li to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.threshold.localBernsen to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.threshold.localContrast to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.threshold.localMean to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.threshold.localMedian to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.threshold.localMidGrey to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.threshold.localNiblack to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.threshold.localPhansalkar to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.threshold.localSauvola to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.threshold.maxEntropy to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.threshold.maxLikelihood to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.threshold.mean to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.threshold.minError to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.threshold.minimum to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.threshold.moments to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.threshold.otsu to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.threshold.percentile to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.threshold.renyiEntropy to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.threshold.rosin to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.threshold.shanbhag to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.threshold.triangle to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.threshold.yen to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.topology to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.topology.eulerCharacteristic to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.transform to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.types to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.types.adapt to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.types.maxValue to org.scijava, org.scijava.ops;
-	opens net.imagej.ops2.types.minValue to org.scijava, org.scijava.ops;
+	opens net.imagej.ops2.coloc to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.coloc.icq to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.coloc.kendallTau to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.coloc.maxTKendallTau to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.coloc.pearsons to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.coloc.pValue to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.convert to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.convert.clip to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.convert.copy to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.copy to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.create to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.deconvolve to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.deconvolve.accelerate to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.eval to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.features.haralick to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.features.haralick.helper to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.features.hog to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.features.lbp2d to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.features.tamura2d to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.features.zernike to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.filter to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.filter.addNoise to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.filter.bilateral to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.filter.convolve to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.filter.correlate to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.filter.derivative to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.filter.derivativeGauss to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.filter.dog to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.filter.fft to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.filter.fftSize to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.filter.gauss to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.filter.hessian to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.filter.ifft to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.filter.max to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.filter.mean to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.filter.median to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.filter.min to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.filter.pad to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.filter.sigma to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.filter.sobel to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.filter.tubeness to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.filter.variance to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.filter.vesselness to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.geom to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.geom.geom2d to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.geom.geom3d to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.identity to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.image.ascii to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.image.cooccurrenceMatrix to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.image.distancetransform to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.image.equation to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.image.fill to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.image.histogram to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.image.integral to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.image.invert to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.image.normalize to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.image.watershed to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.imagemoments to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.imagemoments.centralmoments to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.imagemoments.hu to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.imagemoments.moments to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.imagemoments.normalizedcentralmoments to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.labeling to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.labeling.cca to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.linalg.rotate to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.logic to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.map.neighborhood to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.math to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.math.multiply to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.morphology to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.morphology.thin to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.project to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.segment.detectJunctions to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.segment.detectRidges to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.slice to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.stats to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.stats.regression.leastSquares to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.thread.chunker to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.threshold to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.threshold.apply to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.threshold.huang to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.threshold.ij1 to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.threshold.intermodes to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.threshold.isoData to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.threshold.li to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.threshold.localBernsen to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.threshold.localContrast to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.threshold.localMean to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.threshold.localMedian to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.threshold.localMidGrey to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.threshold.localNiblack to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.threshold.localPhansalkar to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.threshold.localSauvola to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.threshold.maxEntropy to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.threshold.maxLikelihood to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.threshold.mean to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.threshold.minError to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.threshold.minimum to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.threshold.moments to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.threshold.otsu to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.threshold.percentile to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.threshold.renyiEntropy to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.threshold.rosin to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.threshold.shanbhag to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.threshold.triangle to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.threshold.yen to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.topology to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.topology.eulerCharacteristic to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.transform to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.types to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.types.adapt to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.types.maxValue to org.scijava, org.scijava.ops.engine;
+	opens net.imagej.ops2.types.minValue to org.scijava, org.scijava.ops.engine;
 	
 	requires java.desktop;
 	requires java.scripting;
@@ -125,7 +125,7 @@
 	requires net.imglib2.roi;
 	requires org.joml;
 	requires org.scijava;
-	requires org.scijava.ops;
+	requires org.scijava.ops.engine;
 	requires org.scijava.parsington;
 	requires org.scijava.types;
 	
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java
index db72e70f5..634e619a4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java
@@ -38,8 +38,7 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
 import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.util.Maps;
+import org.scijava.ops.engine.util.Maps;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java
index fa79cf9de..7b28ad496 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java
@@ -48,8 +48,7 @@
 import org.scijava.function.Inplaces;
 import org.scijava.ops.api.Op;
 import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.util.Adapt;
+import org.scijava.ops.engine.util.Adapt;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java
index a3c5de82e..23bfe31c8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java
@@ -33,7 +33,7 @@
 
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpService;
+import org.scijava.ops.engine.OpService;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/OpEvaluator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/OpEvaluator.java
index 12bcc0310..241e4e223 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/OpEvaluator.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/OpEvaluator.java
@@ -38,8 +38,8 @@
 
 import org.scijava.function.Functions;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpService;
-import org.scijava.ops.util.FunctionUtils;
+import org.scijava.ops.engine.OpService;
+import org.scijava.ops.engine.util.FunctionUtils;
 import org.scijava.parsington.Operator;
 import org.scijava.parsington.Operators;
 import org.scijava.parsington.Variable;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java
index 93aaeb8ec..894c31484 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java
@@ -40,7 +40,7 @@
 import org.scijava.ops.api.Op;
 import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.util.Adapt;
+import org.scijava.ops.engine.util.Adapt;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java
index 67014c327..402d2e3c5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java
@@ -40,7 +40,7 @@
 import org.scijava.ops.api.Op;
 import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.util.Adapt;
+import org.scijava.ops.engine.util.Adapt;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java
index 949e4e378..8aed42165 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java
@@ -40,7 +40,7 @@
 import org.scijava.ops.api.Op;
 import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.util.Adapt;
+import org.scijava.ops.engine.util.Adapt;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java
index e59b07074..6997a228d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java
@@ -40,7 +40,7 @@
 import org.scijava.ops.api.Op;
 import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.util.Adapt;
+import org.scijava.ops.engine.util.Adapt;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/LabelRegionToPolygonConverter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/LabelRegionToPolygonConverter.java
index 6bc274c3e..5eb7dbf4e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/LabelRegionToPolygonConverter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/LabelRegionToPolygonConverter.java
@@ -41,8 +41,8 @@
 import org.scijava.convert.AbstractConverter;
 import org.scijava.convert.ConversionRequest;
 import org.scijava.convert.Converter;
-import org.scijava.ops.OpBuilder;
-import org.scijava.ops.OpService;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/RAIToMeshConverter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/RAIToMeshConverter.java
index 94695afda..a63fad96a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/RAIToMeshConverter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/RAIToMeshConverter.java
@@ -41,8 +41,8 @@
 import org.scijava.convert.AbstractConverter;
 import org.scijava.convert.ConversionRequest;
 import org.scijava.convert.Converter;
-import org.scijava.ops.OpBuilder;
-import org.scijava.ops.OpService;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/AbstractHelp.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/AbstractHelp.java
index 0d90657ab..c3f637192 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/AbstractHelp.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/AbstractHelp.java
@@ -33,9 +33,9 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.scijava.ops.OpCandidate;
-import org.scijava.ops.OpInfo;
-import org.scijava.ops.OpUtils;
+import org.scijava.ops.engine.OpCandidate;
+import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.engine.OpUtils;
 
 /**
  * Base class for help operations.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java
index 0577a4a51..3dec2c2b7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java
@@ -33,8 +33,8 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpInfo;
-import org.scijava.ops.OpService;
+import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.engine.OpService;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java
index 7cf347b3c..d6cef59cb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java
@@ -42,7 +42,7 @@
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpExecutionException;
+import org.scijava.ops.engine.OpExecutionException;
 import org.scijava.plugin.Plugin;
 import org.scijava.script.ScriptLanguage;
 import org.scijava.script.ScriptService;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/AbstractImageMomentOp.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/AbstractImageMomentOp.java
index 9b461f98f..a9e4b9bee 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/AbstractImageMomentOp.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/AbstractImageMomentOp.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpService;
+import org.scijava.ops.engine.OpService;
 
 /**
  * Abstract {@code ImageMomentOp}. Provides {@link OpService} and create the
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java
index 9a5feb4fa..0e17cd45a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java
@@ -41,7 +41,7 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpEnvironment;
+import org.scijava.ops.engine.OpEnvironment;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java
index aeabeb323..d062aa346 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java
@@ -10,7 +10,7 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.ExceptionUtils;
+import org.scijava.ops.engine.ExceptionUtils;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpField;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyLocalThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyLocalThresholdIntegral.java
index b2a809301..7c0a4f60e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyLocalThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyLocalThresholdIntegral.java
@@ -55,7 +55,7 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.OpExecutionException;
+import org.scijava.ops.engine.OpExecutionException;
 
 /**
  * Apply a local thresholding method to an image using integral images for speed
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java
index 4f3351434..ca71393d4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java
@@ -38,8 +38,8 @@
 import org.scijava.ops.api.Op;
 import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.util.Adapt;
-import org.scijava.ops.util.Maps;
+import org.scijava.ops.engine.util.Adapt;
+import org.scijava.ops.engine.util.Maps;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java
index bbbd55b4c..0904ca989 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java
@@ -36,7 +36,7 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpExecutionException;
+import org.scijava.ops.engine.OpExecutionException;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java
index a4faf3c0d..82798a27a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java
@@ -35,7 +35,7 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpExecutionException;
+import org.scijava.ops.engine.OpExecutionException;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java
index 926aabcf1..ae3360e31 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java
@@ -37,7 +37,7 @@
 
 import org.scijava.Priority;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpExecutionException;
+import org.scijava.ops.engine.OpExecutionException;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java
index bdb318f34..06891c1cf 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java
@@ -50,9 +50,9 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.scijava.Context;
 import org.scijava.cache.CacheService;
-import org.scijava.ops.OpHistoryService;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpService;
+import org.scijava.ops.engine.OpHistoryService;
+import org.scijava.ops.engine.OpService;
 import org.scijava.plugin.PluginService;
 import org.scijava.thread.ThreadService;
 import org.scijava.types.TypeService;
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/ColocalisationTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/ColocalisationTest.java
index 40079996e..48f26f575 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/ColocalisationTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/ColocalisationTest.java
@@ -59,9 +59,9 @@
 import org.scijava.app.StatusService;
 import org.scijava.cache.CacheService;
 import org.scijava.io.location.FileLocation;
-import org.scijava.ops.OpBuilder;
-import org.scijava.ops.OpHistoryService;
-import org.scijava.ops.OpService;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpHistoryService;
+import org.scijava.ops.engine.OpService;
 import org.scijava.plugin.PluginService;
 import org.scijava.thread.ThreadService;
 import org.scijava.types.TypeService;
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/icq/LiICQTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/icq/LiICQTest.java
index d2b8903e1..2f2247ff2 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/icq/LiICQTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/icq/LiICQTest.java
@@ -44,7 +44,7 @@
 import net.imglib2.type.numeric.real.FloatType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.thread.ThreadService;
 import org.scijava.types.Nil;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRankTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRankTest.java
index eaadb5be8..7d583d51d 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRankTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRankTest.java
@@ -50,7 +50,7 @@
 import net.imglib2.util.Pair;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.thread.ThreadService;
 import org.scijava.types.Nil;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/maxTKendallTau/MTKTTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/maxTKendallTau/MTKTTest.java
index 6f59caf5b..be038ccdf 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/maxTKendallTau/MTKTTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/maxTKendallTau/MTKTTest.java
@@ -47,7 +47,7 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.thread.ThreadService;
 import org.scijava.types.Nil;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/pValue/DefaultPValueTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/pValue/DefaultPValueTest.java
index 693edcbc9..30abbdd28 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/pValue/DefaultPValueTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/pValue/DefaultPValueTest.java
@@ -42,8 +42,8 @@
 import net.imglib2.type.numeric.real.FloatType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.types.Nil;
 import org.scijava.thread.ThreadService;
+import org.scijava.types.Nil;
 
 /**
  * Tests {@link DefaultPValue}.
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/pearsons/DefaultPearsonsTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/pearsons/DefaultPearsonsTest.java
index e168e6de5..b16b80eed 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/pearsons/DefaultPearsonsTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/pearsons/DefaultPearsonsTest.java
@@ -40,7 +40,7 @@
 import net.imglib2.type.numeric.real.FloatType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.thread.ThreadService;
 import org.scijava.types.Nil;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/convert/ConvertMapTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/convert/ConvertMapTest.java
index 54ab97359..f1b5d6d60 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/convert/ConvertMapTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/convert/ConvertMapTest.java
@@ -42,7 +42,7 @@
 import net.imglib2.util.Intervals;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 
 /**
  * Tests that the {@code convert} ops work on {@link Img} objects via
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyArrayImgTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyArrayImgTest.java
index d47df5c0b..efea7b768 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyArrayImgTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyArrayImgTest.java
@@ -41,7 +41,6 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
 import org.scijava.util.MersenneTwisterFast;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyRAITest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyRAITest.java
index 15344f33f..601323602 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyRAITest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyRAITest.java
@@ -49,7 +49,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.util.MersenneTwisterFast;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgPlusTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgPlusTest.java
index 56b8b2d9c..351f3289e 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgPlusTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgPlusTest.java
@@ -42,7 +42,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgTest.java
index 202e63259..26db2a63b 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgTest.java
@@ -59,7 +59,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.util.MersenneTwisterFast;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernel2ndDerivBiGaussTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernel2ndDerivBiGaussTest.java
index e95257ecd..f3a91112f 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernel2ndDerivBiGaussTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernel2ndDerivBiGaussTest.java
@@ -38,7 +38,6 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelBiGaussTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelBiGaussTest.java
index 027da3ee4..1bf165755 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelBiGaussTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelBiGaussTest.java
@@ -38,7 +38,6 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelDiffractionTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelDiffractionTest.java
index 2860a34f2..36d3e98c4 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelDiffractionTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelDiffractionTest.java
@@ -33,14 +33,13 @@
 
 import java.util.stream.StreamSupport;
 
+import net.imagej.ops2.AbstractOpTest;
 import net.imglib2.Dimensions;
 import net.imglib2.FinalDimensions;
 import net.imglib2.img.Img;
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.junit.jupiter.api.Test;
-import net.imagej.ops2.AbstractOpTest;
-
 import org.scijava.function.Functions;
 import org.scijava.types.Nil;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaborTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaborTest.java
index a2a34e4f4..f17979b9b 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaborTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaborTest.java
@@ -43,7 +43,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaussTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaussTest.java
index fe887c224..e3fc0b385 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaussTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaussTest.java
@@ -39,7 +39,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelLogTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelLogTest.java
index 97d76b591..fbeb2e5a8 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelLogTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelLogTest.java
@@ -39,7 +39,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateLabelingTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateLabelingTest.java
index 45b4ae7ac..1c78e4954 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateLabelingTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateLabelingTest.java
@@ -47,7 +47,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.util.MersenneTwisterFast;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/eval/EvalTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/eval/EvalTest.java
index 6029b91b5..7baef1c39 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/eval/EvalTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/eval/EvalTest.java
@@ -38,7 +38,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.OpService;
+import org.scijava.ops.engine.OpService;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2DTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2DTest.java
index ebf047468..2b76981b2 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2DTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2DTest.java
@@ -39,9 +39,8 @@
 import net.imglib2.type.numeric.real.FloatType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.types.Nil;
-import org.scijava.ops.OpBuilder;
 import org.scijava.thread.ThreadService;
+import org.scijava.types.Nil;
 
 /**
  * The HoG Op is tested by comparing its result with the ground-truth which was
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/derivative/PartialDerivativeFilterTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/derivative/PartialDerivativeFilterTest.java
index 1a7762338..fc184a5a9 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/derivative/PartialDerivativeFilterTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/derivative/PartialDerivativeFilterTest.java
@@ -43,7 +43,8 @@
 import net.imglib2.view.composite.RealComposite;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/hessian/HessianFilterTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/hessian/HessianFilterTest.java
index 8eb655c69..f376db930 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/hessian/HessianFilterTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/hessian/HessianFilterTest.java
@@ -42,7 +42,8 @@
 import net.imglib2.view.composite.RealComposite;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/mean/MeanFilterTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/mean/MeanFilterTest.java
index 2edd1da28..be73bb674 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/mean/MeanFilterTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/mean/MeanFilterTest.java
@@ -10,7 +10,8 @@
 import net.imglib2.type.numeric.integer.ByteType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 public class MeanFilterTest extends AbstractOpTest{
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/sobel/SobelFilterTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/sobel/SobelFilterTest.java
index 803527c17..7a4089b35 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/sobel/SobelFilterTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/sobel/SobelFilterTest.java
@@ -40,7 +40,8 @@
 import net.imglib2.util.Util;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/vesselness/FrangiVesselnessTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/vesselness/FrangiVesselnessTest.java
index 3d851e00b..29e64ba02 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/vesselness/FrangiVesselnessTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/vesselness/FrangiVesselnessTest.java
@@ -48,10 +48,9 @@
 import org.junit.jupiter.api.Test;
 import org.scijava.Context;
 import org.scijava.cache.CacheService;
-import org.scijava.ops.OpBuilder;
-import org.scijava.ops.OpHistory;
-import org.scijava.ops.OpHistoryService;
-import org.scijava.ops.OpService;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpHistoryService;
+import org.scijava.ops.engine.OpService;
 import org.scijava.plugin.PluginService;
 import org.scijava.script.ScriptService;
 import org.scijava.thread.ThreadService;
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/geom3d/QuickHull3DTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/geom3d/QuickHull3DTest.java
index 1b2367345..c39726e68 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/geom3d/QuickHull3DTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/geom3d/QuickHull3DTest.java
@@ -44,7 +44,8 @@
 
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 
 /**
  * This class tests the {@link DefaultConvexHull3D} implementation. The number
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/ascii/ASCIITest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/ascii/ASCIITest.java
index fb63cc11c..6eec972b3 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/ascii/ASCIITest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/ascii/ASCIITest.java
@@ -38,7 +38,8 @@
 import net.imglib2.util.Pair;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformTest.java
index 20686415b..8d7384038 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformTest.java
@@ -39,7 +39,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.types.Nil;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.thread.ThreadService;
 import org.scijava.util.MersenneTwisterFast;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DistanceTransform3DTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DistanceTransform3DTest.java
index b072ff63b..eb203ee43 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DistanceTransform3DTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DistanceTransform3DTest.java
@@ -39,7 +39,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.types.Nil;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.thread.ThreadService;
 import org.scijava.util.MersenneTwisterFast;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/histogram/DefaultHistogramTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/histogram/DefaultHistogramTest.java
index 9467439a0..34b90813c 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/histogram/DefaultHistogramTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/histogram/DefaultHistogramTest.java
@@ -9,7 +9,8 @@
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/integral/IntegralImgTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/integral/IntegralImgTest.java
index e4b71f7cd..6e6cdafc0 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/integral/IntegralImgTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/integral/IntegralImgTest.java
@@ -49,7 +49,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/normalize/NormalizeTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/normalize/NormalizeTest.java
index abfb77813..590120fea 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/normalize/NormalizeTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/normalize/NormalizeTest.java
@@ -41,7 +41,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedBinaryTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedBinaryTest.java
index f96b881af..e80d0dd31 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedBinaryTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedBinaryTest.java
@@ -46,7 +46,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.types.Nil;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.thread.ThreadService;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedTest.java
index 9d861ae11..f546c871c 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedTest.java
@@ -51,7 +51,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.thread.ThreadService;
 import org.scijava.types.Nil;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3dTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3dTest.java
index a11df24ba..e236e3226 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3dTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3dTest.java
@@ -39,7 +39,8 @@
 import org.joml.Quaterniondc;
 import org.joml.Vector3d;
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 
 /**
  * Tests for {@link Rotate3d}.
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3fTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3fTest.java
index 73cdeb339..302e07b8e 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3fTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3fTest.java
@@ -39,7 +39,8 @@
 import org.joml.Quaternionfc;
 import org.joml.Vector3f;
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 
 /**
  * Tests for {@link Rotate3f}.
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/BooleanTypeLogicTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/BooleanTypeLogicTest.java
index b2ca28123..ecc7e7090 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/BooleanTypeLogicTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/BooleanTypeLogicTest.java
@@ -36,7 +36,8 @@
 import net.imglib2.type.logic.BitType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 
 /**
  * Tests {@link BooleanTypeLogic}.
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/ConditionalTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/ConditionalTest.java
index 6f4b3a511..3428022b7 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/ConditionalTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/ConditionalTest.java
@@ -36,7 +36,8 @@
 import net.imglib2.type.numeric.integer.ByteType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 
 /**
  * Tests {@link Ternary} and {@link Default}.
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/math/UnaryRealTypeMathTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/math/UnaryRealTypeMathTest.java
index 470c2d0be..52623a98a 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/math/UnaryRealTypeMathTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/math/UnaryRealTypeMathTest.java
@@ -41,7 +41,8 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/project/ProjectTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/project/ProjectTest.java
index fa6947b39..54800651a 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/project/ProjectTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/project/ProjectTest.java
@@ -40,7 +40,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 public class ProjectTest extends AbstractOpTest {
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/AbstractThresholdTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/AbstractThresholdTest.java
index 154000c05..ba3a2f485 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/AbstractThresholdTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/AbstractThresholdTest.java
@@ -46,7 +46,8 @@
 import net.imglib2.type.numeric.integer.UnsignedShortType;
 
 import org.junit.jupiter.api.BeforeEach;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.util.ListUtils;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/ComputeThresholdTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/ComputeThresholdTest.java
index bea79d915..b091feb70 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/ComputeThresholdTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/ComputeThresholdTest.java
@@ -35,7 +35,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/ApplyManualThresholdTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/ApplyManualThresholdTest.java
index 04f71ee81..e7d2a9450 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/ApplyManualThresholdTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/ApplyManualThresholdTest.java
@@ -39,7 +39,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/LocalThresholdTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/LocalThresholdTest.java
index ef3e231e7..6974e6a74 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/LocalThresholdTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/LocalThresholdTest.java
@@ -77,7 +77,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseNumericView/CollapseNumericViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseNumericView/CollapseNumericViewTest.java
index 3f328af3b..3565f9064 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseNumericView/CollapseNumericViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseNumericView/CollapseNumericViewTest.java
@@ -45,7 +45,8 @@
 import net.imglib2.view.composite.NumericComposite;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseRealView/CollapseRealViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseRealView/CollapseRealViewTest.java
index afa64d7b9..0ce2b333d 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseRealView/CollapseRealViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseRealView/CollapseRealViewTest.java
@@ -45,7 +45,8 @@
 import net.imglib2.view.composite.RealComposite;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseView/CollapseViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseView/CollapseViewTest.java
index 49acee2a2..fd5d3ee57 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseView/CollapseViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseView/CollapseViewTest.java
@@ -44,7 +44,8 @@
 import net.imglib2.view.composite.GenericComposite;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/concatenateView/ConcatenateViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/concatenateView/ConcatenateViewTest.java
index cc76e764d..4b6449988 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/concatenateView/ConcatenateViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/concatenateView/ConcatenateViewTest.java
@@ -49,7 +49,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.util.MersenneTwisterFast;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/dropSingleDimensionsView/DropSingletonDimensionsViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/dropSingleDimensionsView/DropSingletonDimensionsViewTest.java
index 6de6c9a27..8f5a4518d 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/dropSingleDimensionsView/DropSingletonDimensionsViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/dropSingleDimensionsView/DropSingletonDimensionsViewTest.java
@@ -40,7 +40,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendBorderView/ExtendBorderViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendBorderView/ExtendBorderViewTest.java
index 6ce1067a6..842d00181 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendBorderView/ExtendBorderViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendBorderView/ExtendBorderViewTest.java
@@ -42,7 +42,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorDoubleView/ExtendMirrorDoubleViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorDoubleView/ExtendMirrorDoubleViewTest.java
index f6428bb93..0bad3642c 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorDoubleView/ExtendMirrorDoubleViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorDoubleView/ExtendMirrorDoubleViewTest.java
@@ -42,7 +42,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorSingleView/ExtendMirrorSingleViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorSingleView/ExtendMirrorSingleViewTest.java
index 9ad7b254e..dc390b8fc 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorSingleView/ExtendMirrorSingleViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorSingleView/ExtendMirrorSingleViewTest.java
@@ -42,7 +42,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendPeriodicView/ExtendPeriodicViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendPeriodicView/ExtendPeriodicViewTest.java
index a3d899618..69c51bd45 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendPeriodicView/ExtendPeriodicViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendPeriodicView/ExtendPeriodicViewTest.java
@@ -42,7 +42,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendRandomView/ExtendRandomViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendRandomView/ExtendRandomViewTest.java
index cd4e89453..c6ba76881 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendRandomView/ExtendRandomViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendRandomView/ExtendRandomViewTest.java
@@ -41,7 +41,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendValueView/ExtendValueViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendValueView/ExtendValueViewTest.java
index 2635486ab..fea9fc72e 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendValueView/ExtendValueViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendValueView/ExtendValueViewTest.java
@@ -42,7 +42,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendView/ExtendViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendView/ExtendViewTest.java
index c2e2f6d71..5080e83ef 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendView/ExtendViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendView/ExtendViewTest.java
@@ -44,7 +44,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendZeroView/ExtendZeroViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendZeroView/ExtendZeroViewTest.java
index fbbb589b1..5b21b898d 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendZeroView/ExtendZeroViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendZeroView/ExtendZeroViewTest.java
@@ -42,7 +42,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/flatIterableView/FlatIterableViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/flatIterableView/FlatIterableViewTest.java
index 02b8f4e9d..08a6f2c3d 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/flatIterableView/FlatIterableViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/flatIterableView/FlatIterableViewTest.java
@@ -42,7 +42,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/hyperSliceView/HyperSliceViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/hyperSliceView/HyperSliceViewTest.java
index 1cd95c34e..856bfaa1f 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/hyperSliceView/HyperSliceViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/hyperSliceView/HyperSliceViewTest.java
@@ -42,7 +42,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/interpolateView/InterpolateViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/interpolateView/InterpolateViewTest.java
index 340d8dee2..6f2ee32b6 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/interpolateView/InterpolateViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/interpolateView/InterpolateViewTest.java
@@ -43,7 +43,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.util.MersenneTwisterFast;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/intervalView/IntervalViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/intervalView/IntervalViewTest.java
index 2566b740e..cce68c444 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/intervalView/IntervalViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/intervalView/IntervalViewTest.java
@@ -45,7 +45,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.util.MersenneTwisterFast;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/invertAxisView/InvertAxisViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/invertAxisView/InvertAxisViewTest.java
index 205374b8d..0ca8f4f7e 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/invertAxisView/InvertAxisViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/invertAxisView/InvertAxisViewTest.java
@@ -43,7 +43,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/offsetView/OffsetViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/offsetView/OffsetViewTest.java
index efe48cbd5..a07bae50f 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/offsetView/OffsetViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/offsetView/OffsetViewTest.java
@@ -46,7 +46,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/permuteView/PermuteViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/permuteView/PermuteViewTest.java
index f3b3e1be0..728e81251 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/permuteView/PermuteViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/permuteView/PermuteViewTest.java
@@ -49,7 +49,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.util.MersenneTwisterFast;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rasterView/RasterViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rasterView/RasterViewTest.java
index 3e75ae8e0..5f21a2469 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rasterView/RasterViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rasterView/RasterViewTest.java
@@ -44,7 +44,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.util.MersenneTwisterFast;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rotateView/RotateViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rotateView/RotateViewTest.java
index 38dec3153..63ffcc8fb 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rotateView/RotateViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rotateView/RotateViewTest.java
@@ -43,7 +43,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/shearView/ShearViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/shearView/ShearViewTest.java
index 162be50b2..94145d598 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/shearView/ShearViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/shearView/ShearViewTest.java
@@ -45,7 +45,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/stackView/StackViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/stackView/StackViewTest.java
index 40e9c3c99..dbac38ba0 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/stackView/StackViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/stackView/StackViewTest.java
@@ -44,7 +44,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/subsampleView/SubsampleViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/subsampleView/SubsampleViewTest.java
index 384c84c96..011e28827 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/subsampleView/SubsampleViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/subsampleView/SubsampleViewTest.java
@@ -48,7 +48,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.util.MersenneTwisterFast;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/translateView/TranslateViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/translateView/TranslateViewTest.java
index db1b873a5..c9bc51d93 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/translateView/TranslateViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/translateView/TranslateViewTest.java
@@ -46,7 +46,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/unshearView/UnshearViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/unshearView/UnshearViewTest.java
index 9725fb8cb..c9db839f8 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/unshearView/UnshearViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/unshearView/UnshearViewTest.java
@@ -45,7 +45,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/zeroMinView/ZeroMinViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/zeroMinView/ZeroMinViewTest.java
index 112372925..72e1b21db 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/zeroMinView/ZeroMinViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/zeroMinView/ZeroMinViewTest.java
@@ -41,7 +41,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/pom.xml b/pom.xml
index 64cf6a2f2..2e1b84818 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,10 +49,10 @@
 		<module>imagej/imagej-testutil</module>
 		<module>scijava/scijava-persist</module>
 		<module>scijava/scijava-function</module>
-		<module>scijava/scijava-ops</module>
-		<module>scijava/scijava-struct</module>
 		<module>scijava/scijava-ops-api</module>
 		<module>scijava/scijava-ops-discovery</module>
+		<module>scijava/scijava-ops-engine</module>
+		<module>scijava/scijava-struct</module>
 		<module>scijava/scijava-taglets</module>
 		<module>scijava/scijava-testutil</module>
 		<module>scijava/scijava-types</module>
diff --git a/scijava/scijava-ops-discovery/pom.xml b/scijava/scijava-ops-discovery/pom.xml
index ace275668..b55aca60c 100644
--- a/scijava/scijava-ops-discovery/pom.xml
+++ b/scijava/scijava-ops-discovery/pom.xml
@@ -13,7 +13,7 @@
 
 	<artifactId>scijava-ops-discovery</artifactId>
 
-	<name>SciJava Ops API</name>
+	<name>SciJava Ops Discovery</name>
 	<description>SciJava Operations Discovery: Discovery mechanisms used by the SciJava Operations framework.</description>
 	<url>https://github.com/scijava/scijava-ops-discovery</url>
 	<inceptionYear>2021</inceptionYear>
diff --git a/scijava/scijava-ops-engine/.gitignore b/scijava/scijava-ops-engine/.gitignore
index ae3c17260..00d2ab71d 100644
--- a/scijava/scijava-ops-engine/.gitignore
+++ b/scijava/scijava-ops-engine/.gitignore
@@ -1 +1,2 @@
-/bin/
+/.apt_generated/
+/.apt_generated_tests/
diff --git a/scijava/scijava-ops/LICENSE.txt b/scijava/scijava-ops-engine/LICENSE.txt
similarity index 100%
rename from scijava/scijava-ops/LICENSE.txt
rename to scijava/scijava-ops-engine/LICENSE.txt
diff --git a/scijava/scijava-ops/README.md b/scijava/scijava-ops-engine/README.md
similarity index 100%
rename from scijava/scijava-ops/README.md
rename to scijava/scijava-ops-engine/README.md
diff --git a/scijava/scijava-ops/bin/generate.groovy b/scijava/scijava-ops-engine/bin/generate.groovy
old mode 100755
new mode 100644
similarity index 100%
rename from scijava/scijava-ops/bin/generate.groovy
rename to scijava/scijava-ops-engine/bin/generate.groovy
diff --git a/scijava/scijava-ops/pom.xml b/scijava/scijava-ops-engine/pom.xml
similarity index 86%
rename from scijava/scijava-ops/pom.xml
rename to scijava/scijava-ops-engine/pom.xml
index e3988c4bc..3e9cad365 100644
--- a/scijava/scijava-ops/pom.xml
+++ b/scijava/scijava-ops-engine/pom.xml
@@ -11,11 +11,11 @@
 		<relativePath>../..</relativePath>
 	</parent>
 
-	<artifactId>scijava-ops</artifactId>
+	<artifactId>scijava-ops-engine</artifactId>
 
-	<name>SciJava Ops</name>
-	<description>SciJava Operations: a framework for reusable algorithms.</description>
-	<url>https://github.com/scijava/scijava-ops</url>
+	<name>SciJava Ops Engine</name>
+	<description>SciJava Operations Engine: a framework for reusable algorithms.</description>
+	<url>https://github.com/scijava/scijava-ops-engine</url>
 	<inceptionYear>2016</inceptionYear>
 	<organization>
 		<name>SciJava</name>
@@ -78,7 +78,7 @@
 	<mailingLists>
 		<mailingList>
 			<name>Image.sc Forum</name>
-			<archive>https://forum.image.sc/tags/scijava-ops</archive>
+			<archive>https://forum.image.sc/tags/scijava-ops-engine</archive>
 		</mailingList>
 	</mailingLists>
 
@@ -90,7 +90,7 @@
 	</scm>
 	<issueManagement>
 		<system>GitHub Issues</system>
-		<url>https://github.com/scijava/scijava-ops/issues</url>
+		<url>https://github.com/scijava/scijava-ops-engine/issues</url>
 	</issueManagement>
 	<ciManagement>
 		<system>Travis CI</system>
@@ -98,14 +98,14 @@
 	</ciManagement>
 
 	<properties>
-		<main-class>org.scijava.ops.Main</main-class>
-		<package-name>org.scijava.ops</package-name>
+		<main-class>org.scijava.ops.engine.Main</main-class>
+		<package-name>org.scijava.ops.engine</package-name>
 
 		<license.licenseName>bsd_2</license.licenseName>
 		<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
 		<!--  <enforcer.skip>true</enforcer.skip>-->
-		<scijava-ops.allowedDuplicateClasses>${scijava.allowedDuplicateClasses},com.github.therapi.runtimejavadoc.repack.com.eclipsesource.json.*</scijava-ops.allowedDuplicateClasses>
-		<allowedDuplicateClasses>${scijava-ops.allowedDuplicateClasses}</allowedDuplicateClasses>
+		<scijava-ops-engine.allowedDuplicateClasses>${scijava.allowedDuplicateClasses},com.github.therapi.runtimejavadoc.repack.com.eclipsesource.json.*</scijava-ops-engine.allowedDuplicateClasses>
+		<allowedDuplicateClasses>${scijava-ops-engine.allowedDuplicateClasses}</allowedDuplicateClasses>
 	</properties>
 	<build>
 		<plugins>
diff --git a/scijava/scijava-ops-engine/src/main/java/module-info.java b/scijava/scijava-ops-engine/src/main/java/module-info.java
new file mode 100644
index 000000000..dc940ceef
--- /dev/null
+++ b/scijava/scijava-ops-engine/src/main/java/module-info.java
@@ -0,0 +1,52 @@
+module org.scijava.ops.engine {
+
+/*
+ * This is autogenerated source code -- DO NOT EDIT. Instead, edit the
+ * corresponding template in templates/ and rerun bin/generate.groovy.
+ */
+
+	//TODO: rearrange packages to export only needed classes
+	exports org.scijava.ops.engine; //contains OpDependency interface
+	exports org.scijava.ops.engine.matcher;
+	exports org.scijava.ops.engine.math;
+	exports org.scijava.ops.engine.simplify;
+	exports org.scijava.ops.engine.conversionLoss;
+	// TODO: move OpWrapper to its own package (org.scijava.ops.wrap??)
+	exports org.scijava.ops.engine.util; // contains OpWrapper interface
+
+	opens org.scijava.ops.engine to therapi.runtime.javadoc, org.scijava;
+	opens org.scijava.ops.engine.monitor to therapi.runtime.javadoc;
+	opens org.scijava.ops.engine.create to therapi.runtime.javadoc;
+	opens org.scijava.ops.engine.matcher.impl to therapi.runtime.javadoc, org.scijava;
+	opens org.scijava.ops.engine.conversionLoss to therapi.runtime.javadoc;
+	opens org.scijava.ops.engine.copy to therapi.runtime.javadoc;
+	opens org.scijava.ops.engine.log to therapi.runtime.javadoc;
+	opens org.scijava.ops.engine.matcher to therapi.runtime.javadoc;
+	opens org.scijava.ops.engine.simplify to therapi.runtime.javadoc;
+	opens org.scijava.ops.engine.impl to therapi.runtime.javadoc, org.scijava;
+	opens org.scijava.ops.engine.adapt.complexLift to therapi.runtime.javadoc;
+	opens org.scijava.ops.engine.adapt.lift to therapi.runtime.javadoc;
+	opens org.scijava.ops.engine.struct to therapi.runtime.javadoc;
+	opens org.scijava.ops.engine.adapt.functional to therapi.runtime.javadoc;
+	opens org.scijava.ops.engine.hint to therapi.runtime.javadoc;
+	opens org.scijava.ops.engine.stats to therapi.runtime.javadoc;
+	opens org.scijava.ops.engine.util to therapi.runtime.javadoc;
+	opens org.scijava.ops.engine.math to therapi.runtime.javadoc;
+
+	// FIXME: This is a file name and is thus unstable
+	requires geantyref;
+
+	requires java.desktop;
+
+	requires org.scijava;
+	requires org.scijava.function;
+	requires org.scijava.struct;
+	requires org.scijava.ops.api;
+	requires org.scijava.ops.discovery;
+	requires org.scijava.types;
+	requires javassist;
+	requires java.compiler;
+	requires therapi.runtime.javadoc;
+
+	uses javax.annotation.processing.Processor;
+}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/AnnotatedOpDependencyMember.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/AnnotatedOpDependencyMember.java
similarity index 98%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/AnnotatedOpDependencyMember.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/AnnotatedOpDependencyMember.java
index 43f4303a2..7483a6dad 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/AnnotatedOpDependencyMember.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/AnnotatedOpDependencyMember.java
@@ -28,7 +28,7 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.lang.reflect.Type;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/BaseOpHints.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/BaseOpHints.java
similarity index 94%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/BaseOpHints.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/BaseOpHints.java
index 0e5f8aa25..3eeed8b44 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/BaseOpHints.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/BaseOpHints.java
@@ -1,4 +1,4 @@
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.lang.annotation.Annotation;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/ExceptionUtils.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/ExceptionUtils.java
similarity index 94%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/ExceptionUtils.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/ExceptionUtils.java
index 6c9aa34af..601b4c694 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/ExceptionUtils.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/ExceptionUtils.java
@@ -1,4 +1,4 @@
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 public class ExceptionUtils {
 	// For void methods
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/FieldOpDependencyMember.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/FieldOpDependencyMember.java
similarity index 98%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/FieldOpDependencyMember.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/FieldOpDependencyMember.java
index bc5002091..b2ac0c98a 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/FieldOpDependencyMember.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/FieldOpDependencyMember.java
@@ -28,7 +28,7 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.lang.reflect.Field;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/Hints.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/Hints.java
similarity index 91%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/Hints.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/Hints.java
index a449457ec..01a38c8e9 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/Hints.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/Hints.java
@@ -1,11 +1,11 @@
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.util.Deque;
 import java.util.Map;
 import java.util.UUID;
 
-import org.scijava.ops.BaseOpHints.Simplification;
+import org.scijava.ops.engine.BaseOpHints.Simplification;
 
 /**
  * A basic interface for storing and accessing Hints. The general structure for a Hint is
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/MethodParameterOpDependencyMember.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/MethodParameterOpDependencyMember.java
similarity index 96%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/MethodParameterOpDependencyMember.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/MethodParameterOpDependencyMember.java
index 578aecab7..baa005d60 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/MethodParameterOpDependencyMember.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/MethodParameterOpDependencyMember.java
@@ -28,7 +28,7 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.lang.reflect.Parameter;
 import java.lang.reflect.Type;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/NeededOp.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/NeededOp.java
similarity index 60%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/NeededOp.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/NeededOp.java
index fad389a75..6dbca0055 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/NeededOp.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/NeededOp.java
@@ -1,4 +1,4 @@
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 public @interface NeededOp {
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpBuilder.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpBuilder.java
similarity index 99%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/OpBuilder.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpBuilder.java
index 413b5eee5..e895c59db 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpBuilder.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpBuilder.java
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.lang.reflect.Type;
 import java.util.function.BiFunction;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpCandidate.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpCandidate.java
similarity index 98%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/OpCandidate.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpCandidate.java
index 8759ee254..6cc65cb4a 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpCandidate.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpCandidate.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
@@ -35,7 +35,7 @@
 import java.util.Map;
 
 import org.scijava.ValidityProblem;
-import org.scijava.ops.matcher.OpMatcher;
+import org.scijava.ops.engine.matcher.OpMatcher;
 import org.scijava.struct.Member;
 import org.scijava.struct.Struct;
 import org.scijava.struct.StructInstance;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpDependencies.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpDependencies.java
similarity index 96%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/OpDependencies.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpDependencies.java
index cb392acc5..d706303ad 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpDependencies.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpDependencies.java
@@ -28,7 +28,7 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpDependencyMember.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpDependencyMember.java
similarity index 98%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/OpDependencyMember.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpDependencyMember.java
index 86a91bcce..b58807a23 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpDependencyMember.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpDependencyMember.java
@@ -28,7 +28,7 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import org.scijava.struct.ItemIO;
 import org.scijava.struct.Member;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpEnvironment.java
similarity index 99%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpEnvironment.java
index cde4dbc2d..101fe0d40 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpEnvironment.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.lang.reflect.Type;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpExecutionException.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpExecutionException.java
similarity index 98%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/OpExecutionException.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpExecutionException.java
index 509bb0dbc..365c69a42 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpExecutionException.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpExecutionException.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 /**
  * Thrown to indicate that an Op failed in its execution
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpExecutionSummary.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpExecutionSummary.java
similarity index 92%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/OpExecutionSummary.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpExecutionSummary.java
index e84b4f83e..ff47f12bf 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpExecutionSummary.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpExecutionSummary.java
@@ -1,9 +1,9 @@
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.util.UUID;
 
-import org.scijava.ops.impl.DefaultOpEnvironment;
+import org.scijava.ops.engine.impl.DefaultOpEnvironment;
 
 /**
  * Describes the execution of an Op
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpHints.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpHints.java
similarity index 89%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/OpHints.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpHints.java
index b624069d4..b1555ddb0 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpHints.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpHints.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpHistory.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpHistory.java
similarity index 96%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/OpHistory.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpHistory.java
index 285de5306..b4c2a03b5 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpHistory.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpHistory.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import com.google.common.graph.Graph;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpHistoryService.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpHistoryService.java
similarity index 76%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/OpHistoryService.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpHistoryService.java
index 1b5600da4..d8c71925b 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpHistoryService.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpHistoryService.java
@@ -1,4 +1,4 @@
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import org.scijava.service.SciJavaService;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpInfo.java
similarity index 98%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpInfo.java
index 40874298d..fe609b5de 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpInfo.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Type;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfoGenerator.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpInfoGenerator.java
similarity index 69%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfoGenerator.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpInfoGenerator.java
index b6fed9acd..1070a097b 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfoGenerator.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpInfoGenerator.java
@@ -1,4 +1,4 @@
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.util.List;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInstance.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpInstance.java
similarity index 93%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/OpInstance.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpInstance.java
index 9b37948f7..37c770d0b 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInstance.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpInstance.java
@@ -1,4 +1,4 @@
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpRef.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpRef.java
similarity index 98%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/OpRef.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpRef.java
index 93c149e1d..71d958c65 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpRef.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpRef.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
@@ -35,7 +35,7 @@
 import java.util.Map;
 import java.util.Objects;
 
-import org.scijava.ops.matcher.OpMatcher;
+import org.scijava.ops.engine.matcher.OpMatcher;
 import org.scijava.types.Types;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpService.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpService.java
similarity index 98%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/OpService.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpService.java
index 8b059552a..a263bf57d 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpService.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpService.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import org.scijava.service.SciJavaService;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpUtils.java
similarity index 99%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpUtils.java
index 0eac98950..bfc099e4d 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpUtils.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
@@ -38,7 +38,7 @@
 import java.util.stream.Collectors;
 
 import org.scijava.ValidityProblem;
-import org.scijava.ops.OpCandidate.StatusCode;
+import org.scijava.ops.engine.OpCandidate.StatusCode;
 import org.scijava.struct.Member;
 import org.scijava.struct.MemberInstance;
 import org.scijava.struct.Struct;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpWrapper.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpWrapper.java
similarity index 86%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/OpWrapper.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpWrapper.java
index d2d631281..e0c937914 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpWrapper.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpWrapper.java
@@ -1,11 +1,9 @@
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.UUID;
 
-import org.scijava.ops.Hints;
-import org.scijava.ops.OpInfo;
 import org.scijava.plugin.SciJavaPlugin;
 import org.scijava.types.Types;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/complexLift/ComputersToFunctionsAndLift.java
similarity index 99%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/complexLift/ComputersToFunctionsAndLift.java
index c9a30b3ae..4cc7fbe3f 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/complexLift/ComputersToFunctionsAndLift.java
@@ -66,7 +66,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.complexLift;
+package org.scijava.ops.engine.adapt.complexLift;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/complexLift/FunctionsToComputersAndLift.java
similarity index 99%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/complexLift/FunctionsToComputersAndLift.java
index 7a09dc856..168776960 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/complexLift/FunctionsToComputersAndLift.java
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.complexLift;
+package org.scijava.ops.engine.adapt.complexLift;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaFunction.java
similarity index 99%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaFunction.java
index 2925392f0..fb09d9b14 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaFunction.java
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.functional;
+package org.scijava.ops.engine.adapt.functional;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaSource.java
similarity index 99%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaSource.java
index 6cda7adb9..d82031b74 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaSource.java
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.functional;
+package org.scijava.ops.engine.adapt.functional;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/functional/FunctionsToComputers.java
similarity index 99%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/functional/FunctionsToComputers.java
index ad8a4cdf2..bb5e792b5 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/functional/FunctionsToComputers.java
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.functional;
+package org.scijava.ops.engine.adapt.functional;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/functional/InplacesToFunctions.java
similarity index 99%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/functional/InplacesToFunctions.java
index 483a90e2a..cc18ab11a 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/functional/InplacesToFunctions.java
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.functional;
+package org.scijava.ops.engine.adapt.functional;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/ComputerToArrays.java
similarity index 97%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/ComputerToArrays.java
index a81d17afd..cc65e5226 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/ComputerToArrays.java
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.lift;
+package org.scijava.ops.engine.adapt.lift;
 
 import java.util.function.Function;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/ComputerToIterables.java
similarity index 99%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/ComputerToIterables.java
index 7100556ad..c8cfadea6 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/ComputerToIterables.java
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.lift;
+package org.scijava.ops.engine.adapt.lift;
 
 import java.util.Iterator;
 import java.util.function.Function;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/FunctionToArrays.java
similarity index 99%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/FunctionToArrays.java
index 33ba13626..a0047106c 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/FunctionToArrays.java
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.lift;
+package org.scijava.ops.engine.adapt.lift;
 
 import java.lang.reflect.Array;
 import java.util.function.BiFunction;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/FunctionToIterables.java
similarity index 99%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/FunctionToIterables.java
index 17bc61bad..5e913b0e9 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/FunctionToIterables.java
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.lift;
+package org.scijava.ops.engine.adapt.lift;
 
 import java.util.Iterator;
 import java.util.function.BiFunction;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/InplaceToArrays.java
similarity index 98%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/InplaceToArrays.java
index bc92d3e42..14a8dfa07 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/InplaceToArrays.java
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.lift;
+package org.scijava.ops.engine.adapt.lift;
 
 import java.util.function.Function;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/IdentityLossReporter.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/IdentityLossReporter.java
similarity index 80%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/IdentityLossReporter.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/IdentityLossReporter.java
index 7381bf306..c497d4bc2 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/IdentityLossReporter.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/IdentityLossReporter.java
@@ -1,9 +1,9 @@
 
-package org.scijava.ops.conversionLoss;
+package org.scijava.ops.engine.conversionLoss;
 
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpHints;
-import org.scijava.ops.BaseOpHints.Simplification;
+import org.scijava.ops.engine.OpHints;
+import org.scijava.ops.engine.BaseOpHints.Simplification;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporter.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/LossReporter.java
similarity index 89%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporter.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/LossReporter.java
index 4b98e7869..7e15781aa 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporter.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/LossReporter.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops.conversionLoss;
+package org.scijava.ops.engine.conversionLoss;
 
 import java.lang.reflect.Type;
 import java.util.function.BiFunction;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporterWrapper.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/LossReporterWrapper.java
similarity index 76%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporterWrapper.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/LossReporterWrapper.java
index a0af5d463..b6c28d1e8 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporterWrapper.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/LossReporterWrapper.java
@@ -1,14 +1,14 @@
-package org.scijava.ops.conversionLoss;
+package org.scijava.ops.engine.conversionLoss;
 
 import java.lang.reflect.Type;
 import java.util.UUID;
 
-import org.scijava.ops.BaseOpHints.DependencyMatching;
-import org.scijava.ops.Hints;
-import org.scijava.ops.OpExecutionSummary;
-import org.scijava.ops.OpHistory;
-import org.scijava.ops.OpInfo;
-import org.scijava.ops.OpWrapper;
+import org.scijava.ops.engine.BaseOpHints.DependencyMatching;
+import org.scijava.ops.engine.Hints;
+import org.scijava.ops.engine.OpExecutionSummary;
+import org.scijava.ops.engine.OpHistory;
+import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.engine.OpWrapper;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.GenericTyped;
 import org.scijava.types.Nil;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LosslessReporter.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/LosslessReporter.java
similarity index 83%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LosslessReporter.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/LosslessReporter.java
index 47e2ddcae..ddfbabc8c 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LosslessReporter.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/LosslessReporter.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops.conversionLoss;
+package org.scijava.ops.engine.conversionLoss;
 
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/PrimitiveArrayLossReporters.java
similarity index 77%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/PrimitiveArrayLossReporters.java
index 438e70fc2..5491e3d1b 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/PrimitiveArrayLossReporters.java
@@ -1,11 +1,11 @@
-package org.scijava.ops.conversionLoss;
+package org.scijava.ops.engine.conversionLoss;
 
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpField;
+import org.scijava.ops.engine.OpHints;
+import org.scijava.ops.engine.BaseOpHints.Simplification;
 import org.scijava.ops.api.OpField;
-import org.scijava.ops.OpHints;
-import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveLossReporters.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/PrimitiveLossReporters.java
similarity index 92%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveLossReporters.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/PrimitiveLossReporters.java
index 219e5909f..2ac7a7090 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveLossReporters.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/PrimitiveLossReporters.java
@@ -1,12 +1,12 @@
 
-package org.scijava.ops.conversionLoss;
+package org.scijava.ops.engine.conversionLoss;
 
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpField;
+import org.scijava.ops.engine.OpHints;
+import org.scijava.ops.engine.BaseOpHints.Simplification;
 import org.scijava.ops.api.OpField;
-import org.scijava.ops.OpHints;
-import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/copy/CopyOpCollection.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/copy/CopyOpCollection.java
similarity index 96%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/copy/CopyOpCollection.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/copy/CopyOpCollection.java
index a2bf906a0..3e408b00a 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/copy/CopyOpCollection.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/copy/CopyOpCollection.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.copy;
+package org.scijava.ops.engine.copy;
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/create/CreateOpCollection.java
similarity index 97%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/create/CreateOpCollection.java
index 5a066c1d0..d70e40d89 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/create/CreateOpCollection.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.create;
+package org.scijava.ops.engine.create;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/AbstractHints.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/AbstractHints.java
similarity index 92%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/hint/AbstractHints.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/AbstractHints.java
index 11fa46d05..6db8e1772 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/AbstractHints.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/AbstractHints.java
@@ -1,11 +1,11 @@
-package org.scijava.ops.hint;
+package org.scijava.ops.engine.hint;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.UUID;
 
-import org.scijava.ops.Hints;
+import org.scijava.ops.engine.Hints;
 
 /**
  * Abstract class containing behavior common to most {@link Hints}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/AdaptationHints.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/AdaptationHints.java
similarity index 85%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/hint/AdaptationHints.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/AdaptationHints.java
index d910a88ff..1f830a418 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/AdaptationHints.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/AdaptationHints.java
@@ -1,12 +1,12 @@
 
-package org.scijava.ops.hint;
+package org.scijava.ops.engine.hint;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
-import org.scijava.ops.Hints;
-import org.scijava.ops.BaseOpHints.Adaptation;
+import org.scijava.ops.engine.Hints;
+import org.scijava.ops.engine.BaseOpHints.Adaptation;
 
 /**
  * A set of {@link Hints} governing Adaptation procedures.
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/DefaultHints.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/DefaultHints.java
similarity index 71%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/hint/DefaultHints.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/DefaultHints.java
index f37ee34db..d34150a8d 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/DefaultHints.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/DefaultHints.java
@@ -1,13 +1,13 @@
-package org.scijava.ops.hint;
+package org.scijava.ops.engine.hint;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
-import org.scijava.ops.BaseOpHints.Adaptation;
-import org.scijava.ops.BaseOpHints.DependencyMatching;
-import org.scijava.ops.BaseOpHints.Simplification;
-import org.scijava.ops.Hints;
+import org.scijava.ops.engine.BaseOpHints.Adaptation;
+import org.scijava.ops.engine.BaseOpHints.DependencyMatching;
+import org.scijava.ops.engine.BaseOpHints.Simplification;
+import org.scijava.ops.engine.Hints;
 
 /**
  * Default Implementation of {@link Hints}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/ImmutableHints.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/ImmutableHints.java
similarity index 88%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/hint/ImmutableHints.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/ImmutableHints.java
index d3c2613e8..e8567ef89 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/ImmutableHints.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/ImmutableHints.java
@@ -1,10 +1,10 @@
-package org.scijava.ops.hint;
+package org.scijava.ops.engine.hint;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
-import org.scijava.ops.Hints;
+import org.scijava.ops.engine.Hints;
 
 /**
  * A {@link Hints} not modifiable after creation.
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/SimplificationHints.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/SimplificationHints.java
similarity index 88%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/hint/SimplificationHints.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/SimplificationHints.java
index b99c31d90..2edd58d36 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/SimplificationHints.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/SimplificationHints.java
@@ -1,12 +1,12 @@
 
-package org.scijava.ops.hint;
+package org.scijava.ops.engine.hint;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
-import org.scijava.ops.Hints;
-import org.scijava.ops.BaseOpHints.Simplification;
+import org.scijava.ops.engine.Hints;
+import org.scijava.ops.engine.BaseOpHints.Simplification;
 
 public class SimplificationHints extends AbstractHints {
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpEnvironment.java
similarity index 95%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpEnvironment.java
index 21a077312..7a0b6b6d2 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpEnvironment.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops.impl;
+package org.scijava.ops.engine.impl;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -48,35 +48,35 @@
 
 import org.scijava.Priority;
 import org.scijava.log.LogService;
-import org.scijava.ops.BaseOpHints.Adaptation;
-import org.scijava.ops.BaseOpHints.DependencyMatching;
-import org.scijava.ops.BaseOpHints.Simplification;
-import org.scijava.ops.Hints;
-import org.scijava.ops.OpCandidate;
-import org.scijava.ops.OpCandidate.StatusCode;
-import org.scijava.ops.OpDependencyMember;
-import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.OpHistoryService;
-import org.scijava.ops.OpInfo;
-import org.scijava.ops.OpInfoGenerator;
-import org.scijava.ops.OpInstance;
-import org.scijava.ops.OpRef;
-import org.scijava.ops.OpWrapper;
 import org.scijava.ops.api.Op;
 import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.discovery.Discoverer;
-import org.scijava.ops.hint.AdaptationHints;
-import org.scijava.ops.hint.DefaultHints;
-import org.scijava.ops.hint.SimplificationHints;
-import org.scijava.ops.matcher.DependencyMatchingException;
-import org.scijava.ops.matcher.OpMatcher;
-import org.scijava.ops.matcher.OpMatchingException;
-import org.scijava.ops.matcher.impl.DefaultOpMatcher;
-import org.scijava.ops.matcher.impl.DefaultOpRef;
-import org.scijava.ops.matcher.impl.OpAdaptationInfo;
-import org.scijava.ops.matcher.impl.OpClassInfo;
-import org.scijava.ops.simplify.SimplifiedOpInfo;
-import org.scijava.ops.struct.FunctionalParameters;
+import org.scijava.ops.engine.BaseOpHints.Adaptation;
+import org.scijava.ops.engine.BaseOpHints.DependencyMatching;
+import org.scijava.ops.engine.BaseOpHints.Simplification;
+import org.scijava.ops.engine.Hints;
+import org.scijava.ops.engine.OpCandidate;
+import org.scijava.ops.engine.OpCandidate.StatusCode;
+import org.scijava.ops.engine.OpDependencyMember;
+import org.scijava.ops.engine.OpEnvironment;
+import org.scijava.ops.engine.OpHistoryService;
+import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.engine.OpInfoGenerator;
+import org.scijava.ops.engine.OpInstance;
+import org.scijava.ops.engine.OpRef;
+import org.scijava.ops.engine.OpWrapper;
+import org.scijava.ops.engine.hint.AdaptationHints;
+import org.scijava.ops.engine.hint.DefaultHints;
+import org.scijava.ops.engine.hint.SimplificationHints;
+import org.scijava.ops.engine.matcher.DependencyMatchingException;
+import org.scijava.ops.engine.matcher.OpMatcher;
+import org.scijava.ops.engine.matcher.OpMatchingException;
+import org.scijava.ops.engine.matcher.impl.DefaultOpMatcher;
+import org.scijava.ops.engine.matcher.impl.DefaultOpRef;
+import org.scijava.ops.engine.matcher.impl.OpAdaptationInfo;
+import org.scijava.ops.engine.matcher.impl.OpClassInfo;
+import org.scijava.ops.engine.simplify.SimplifiedOpInfo;
+import org.scijava.ops.engine.struct.FunctionalParameters;
 import org.scijava.struct.FunctionalMethodType;
 import org.scijava.struct.ItemIO;
 import org.scijava.types.Nil;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpHistory.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpHistory.java
similarity index 95%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpHistory.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpHistory.java
index 707f36d69..3ee4a2f69 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpHistory.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpHistory.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops.impl;
+package org.scijava.ops.engine.impl;
 
 import com.google.common.graph.Graph;
 import com.google.common.graph.GraphBuilder;
@@ -13,10 +13,10 @@
 import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.stream.Collectors;
 
-import org.scijava.ops.OpExecutionSummary;
-import org.scijava.ops.OpHistory;
-import org.scijava.ops.OpInfo;
 import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.engine.OpExecutionSummary;
+import org.scijava.ops.engine.OpHistory;
+import org.scijava.ops.engine.OpInfo;
 import org.scijava.plugin.Plugin;
 import org.scijava.service.AbstractService;
 import org.scijava.service.Service;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpService.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpService.java
similarity index 95%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpService.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpService.java
index 09a9f4668..95f71be87 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpService.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpService.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops.impl;
+package org.scijava.ops.engine.impl;
 
 import java.util.Arrays;
 import java.util.List;
@@ -36,13 +36,13 @@
 import org.scijava.Context;
 import org.scijava.InstantiableException;
 import org.scijava.log.LogService;
-import org.scijava.ops.OpBuilder;
-import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.OpHistoryService;
-import org.scijava.ops.OpInfoGenerator;
-import org.scijava.ops.OpService;
 import org.scijava.ops.discovery.Discoverer;
 import org.scijava.ops.discovery.Implementation;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.OpEnvironment;
+import org.scijava.ops.engine.OpHistoryService;
+import org.scijava.ops.engine.OpInfoGenerator;
+import org.scijava.ops.engine.OpService;
 import org.scijava.plugin.Plugin;
 import org.scijava.plugin.PluginInfo;
 import org.scijava.plugin.PluginService;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/LambdaTypeBaker.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/LambdaTypeBaker.java
similarity index 96%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/impl/LambdaTypeBaker.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/LambdaTypeBaker.java
index 714ec6d11..699be2bf7 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/LambdaTypeBaker.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/LambdaTypeBaker.java
@@ -1,11 +1,11 @@
-package org.scijava.ops.impl;
+package org.scijava.ops.engine.impl;
 
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
 
-import org.scijava.ops.OpUtils;
+import org.scijava.ops.engine.OpUtils;
 import org.scijava.types.GenericTyped;
 import org.scijava.types.Types;
 import org.scijava.types.inference.InterfaceInference;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/MatchingConditions.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/MatchingConditions.java
similarity index 83%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/impl/MatchingConditions.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/MatchingConditions.java
index 77c96d147..08e1c2197 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/MatchingConditions.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/MatchingConditions.java
@@ -1,10 +1,10 @@
 
-package org.scijava.ops.impl;
+package org.scijava.ops.engine.impl;
 
 import java.util.Objects;
 
-import org.scijava.ops.Hints;
-import org.scijava.ops.OpRef;
+import org.scijava.ops.engine.Hints;
+import org.scijava.ops.engine.OpRef;
 
 public class MatchingConditions {
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/PluginBasedClassOpInfoGenerator.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedClassOpInfoGenerator.java
similarity index 76%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/impl/PluginBasedClassOpInfoGenerator.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedClassOpInfoGenerator.java
index 9d8feb44d..05195d7f2 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/PluginBasedClassOpInfoGenerator.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedClassOpInfoGenerator.java
@@ -1,14 +1,14 @@
-package org.scijava.ops.impl;
+package org.scijava.ops.engine.impl;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.scijava.InstantiableException;
-import org.scijava.ops.OpInfo;
-import org.scijava.ops.OpInfoGenerator;
-import org.scijava.ops.OpUtils;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.matcher.impl.OpClassInfo;
+import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.engine.OpInfoGenerator;
+import org.scijava.ops.engine.OpUtils;
+import org.scijava.ops.engine.matcher.impl.OpClassInfo;
 import org.scijava.plugin.PluginInfo;
 import org.scijava.plugin.PluginService;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/PluginBasedOpCollectionInfoGenerator.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedOpCollectionInfoGenerator.java
similarity index 85%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/impl/PluginBasedOpCollectionInfoGenerator.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedOpCollectionInfoGenerator.java
index a8b20d283..3b7deed1e 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/PluginBasedOpCollectionInfoGenerator.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedOpCollectionInfoGenerator.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.impl;
+package org.scijava.ops.engine.impl;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -7,14 +7,14 @@
 import java.util.List;
 
 import org.scijava.InstantiableException;
-import org.scijava.ops.OpInfo;
-import org.scijava.ops.OpInfoGenerator;
-import org.scijava.ops.OpUtils;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpMethod;
-import org.scijava.ops.matcher.impl.OpFieldInfo;
-import org.scijava.ops.matcher.impl.OpMethodInfo;
+import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.engine.OpInfoGenerator;
+import org.scijava.ops.engine.OpUtils;
+import org.scijava.ops.engine.matcher.impl.OpFieldInfo;
+import org.scijava.ops.engine.matcher.impl.OpMethodInfo;
 import org.scijava.plugin.PluginInfo;
 import org.scijava.plugin.PluginService;
 import org.scijava.util.ClassUtils;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/SingletonOpHistoryService.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/SingletonOpHistoryService.java
similarity index 75%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/impl/SingletonOpHistoryService.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/SingletonOpHistoryService.java
index 951116aa9..425408118 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/SingletonOpHistoryService.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/SingletonOpHistoryService.java
@@ -1,7 +1,7 @@
-package org.scijava.ops.impl;
+package org.scijava.ops.engine.impl;
 
-import org.scijava.ops.OpHistory;
-import org.scijava.ops.OpHistoryService;
+import org.scijava.ops.engine.OpHistory;
+import org.scijava.ops.engine.OpHistoryService;
 import org.scijava.plugin.Plugin;
 import org.scijava.service.AbstractService;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/log/Logger.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/log/Logger.java
similarity index 99%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/log/Logger.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/log/Logger.java
index 585924f3f..f212b15a6 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/log/Logger.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/log/Logger.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops.log;
+package org.scijava.ops.engine.log;
 
 import static org.scijava.log.LogLevel.DEBUG;
 import static org.scijava.log.LogLevel.ERROR;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DependencyMatchingException.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/DependencyMatchingException.java
similarity index 92%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DependencyMatchingException.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/DependencyMatchingException.java
index 7ce7561cb..62943a30a 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DependencyMatchingException.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/DependencyMatchingException.java
@@ -1,7 +1,7 @@
 
-package org.scijava.ops.matcher;
+package org.scijava.ops.engine.matcher;
 
-import org.scijava.ops.OpRef;
+import org.scijava.ops.engine.OpRef;
 
 /**
  * An {@link OpMatchingException} caused by another {@code OpMatchingException}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingResult.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/MatchingResult.java
similarity index 95%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingResult.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/MatchingResult.java
index 8d7dbfbe0..3e8906d06 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingResult.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/MatchingResult.java
@@ -1,12 +1,12 @@
-package org.scijava.ops.matcher;
+package org.scijava.ops.engine.matcher;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.scijava.ops.OpCandidate;
-import org.scijava.ops.OpCandidate.StatusCode;
-import org.scijava.ops.OpRef;
-import org.scijava.ops.OpUtils;
+import org.scijava.ops.engine.OpCandidate;
+import org.scijava.ops.engine.OpRef;
+import org.scijava.ops.engine.OpUtils;
+import org.scijava.ops.engine.OpCandidate.StatusCode;
 
 /**
  * Class representing the result from type matching done by the
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/OpMatcher.java
similarity index 92%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/OpMatcher.java
index c0708145f..e10fa0fe1 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/OpMatcher.java
@@ -27,14 +27,14 @@
  * #L%
  */
 
-package org.scijava.ops.matcher;
+package org.scijava.ops.engine.matcher;
 
 import java.util.List;
 
-import org.scijava.ops.Hints;
-import org.scijava.ops.OpCandidate;
-import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.OpRef;
+import org.scijava.ops.engine.Hints;
+import org.scijava.ops.engine.OpCandidate;
+import org.scijava.ops.engine.OpEnvironment;
+import org.scijava.ops.engine.OpRef;
 
 /**
  * Finds Ops which match an {@link OpRef}.
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatchingException.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/OpMatchingException.java
similarity index 85%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatchingException.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/OpMatchingException.java
index d29b1aaa7..75f9f32b4 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatchingException.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/OpMatchingException.java
@@ -1,6 +1,6 @@
-package org.scijava.ops.matcher;
+package org.scijava.ops.engine.matcher;
 
-import org.scijava.ops.OpRef;
+import org.scijava.ops.engine.OpRef;
 
 /**
  * Indicates that no op matching a given {@link OpRef} could be found.
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/DefaultOpMatcher.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/DefaultOpMatcher.java
similarity index 95%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/DefaultOpMatcher.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/DefaultOpMatcher.java
index df49b2626..2e43ddb5f 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/DefaultOpMatcher.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/DefaultOpMatcher.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops.matcher.impl;
+package org.scijava.ops.engine.matcher.impl;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -43,18 +43,18 @@
 import java.util.Set;
 import java.util.function.Predicate;
 
-import org.scijava.ops.BaseOpHints.Simplification;
-import org.scijava.ops.Hints;
-import org.scijava.ops.OpCandidate;
-import org.scijava.ops.OpCandidate.StatusCode;
-import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.OpInfo;
-import org.scijava.ops.OpRef;
-import org.scijava.ops.OpUtils;
-import org.scijava.ops.hint.DefaultHints;
-import org.scijava.ops.matcher.MatchingResult;
-import org.scijava.ops.matcher.OpMatcher;
-import org.scijava.ops.simplify.InfoSimplificationGenerator;
+import org.scijava.ops.engine.Hints;
+import org.scijava.ops.engine.OpCandidate;
+import org.scijava.ops.engine.OpEnvironment;
+import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.engine.OpRef;
+import org.scijava.ops.engine.OpUtils;
+import org.scijava.ops.engine.BaseOpHints.Simplification;
+import org.scijava.ops.engine.OpCandidate.StatusCode;
+import org.scijava.ops.engine.hint.DefaultHints;
+import org.scijava.ops.engine.matcher.MatchingResult;
+import org.scijava.ops.engine.matcher.OpMatcher;
+import org.scijava.ops.engine.simplify.InfoSimplificationGenerator;
 import org.scijava.service.AbstractService;
 import org.scijava.struct.Member;
 import org.scijava.types.Types;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/DefaultOpRef.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/DefaultOpRef.java
similarity index 97%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/DefaultOpRef.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/DefaultOpRef.java
index a3bc28bad..7c8e0d235 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/DefaultOpRef.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/DefaultOpRef.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops.matcher.impl;
+package org.scijava.ops.engine.matcher.impl;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -36,8 +36,8 @@
 import java.util.Map;
 
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpRef;
-import org.scijava.ops.matcher.OpMatcher;
+import org.scijava.ops.engine.OpRef;
+import org.scijava.ops.engine.matcher.OpMatcher;
 import org.scijava.types.Types;
 import org.scijava.types.inference.GenericAssignability;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/MatchingUtils.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/MatchingUtils.java
similarity index 99%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/MatchingUtils.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/MatchingUtils.java
index f1655ba5e..dd3e33c72 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/MatchingUtils.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/MatchingUtils.java
@@ -30,7 +30,7 @@
  * #L%
  */
 
-package org.scijava.ops.matcher.impl;
+package org.scijava.ops.engine.matcher.impl;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpAdaptationInfo.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpAdaptationInfo.java
similarity index 86%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpAdaptationInfo.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpAdaptationInfo.java
index a2b0f42f2..d3d8732d9 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpAdaptationInfo.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpAdaptationInfo.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops.matcher.impl;
+package org.scijava.ops.engine.matcher.impl;
 
 import com.google.common.collect.Streams;
 
@@ -10,15 +10,15 @@
 import java.util.function.Function;
 
 import org.scijava.ValidityProblem;
-import org.scijava.ops.BaseOpHints.Adaptation;
-import org.scijava.ops.Hints;
-import org.scijava.ops.OpDependencyMember;
-import org.scijava.ops.OpInfo;
-import org.scijava.ops.OpUtils;
-import org.scijava.ops.hint.ImmutableHints;
-import org.scijava.ops.struct.OpRetypingMemberParser;
-import org.scijava.ops.struct.FunctionalParameters;
-import org.scijava.ops.struct.RetypingRequest;
+import org.scijava.ops.engine.Hints;
+import org.scijava.ops.engine.OpDependencyMember;
+import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.engine.OpUtils;
+import org.scijava.ops.engine.BaseOpHints.Adaptation;
+import org.scijava.ops.engine.hint.ImmutableHints;
+import org.scijava.ops.engine.struct.FunctionalParameters;
+import org.scijava.ops.engine.struct.OpRetypingMemberParser;
+import org.scijava.ops.engine.struct.RetypingRequest;
 import org.scijava.struct.FunctionalMethodType;
 import org.scijava.struct.ItemIO;
 import org.scijava.struct.Struct;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpClassInfo.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpClassInfo.java
similarity index 93%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpClassInfo.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpClassInfo.java
index a413ce828..b0d24ca0c 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpClassInfo.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpClassInfo.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops.matcher.impl;
+package org.scijava.ops.engine.matcher.impl;
 
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Constructor;
@@ -39,14 +39,14 @@
 
 import org.scijava.Priority;
 import org.scijava.ValidityProblem;
-import org.scijava.ops.Hints;
-import org.scijava.ops.OpDependencyMember;
-import org.scijava.ops.OpHints;
-import org.scijava.ops.OpInfo;
-import org.scijava.ops.OpUtils;
-import org.scijava.ops.hint.ImmutableHints;
-import org.scijava.ops.struct.ClassOpDependencyMemberParser;
-import org.scijava.ops.struct.ClassParameterMemberParser;
+import org.scijava.ops.engine.Hints;
+import org.scijava.ops.engine.OpDependencyMember;
+import org.scijava.ops.engine.OpHints;
+import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.engine.OpUtils;
+import org.scijava.ops.engine.hint.ImmutableHints;
+import org.scijava.ops.engine.struct.ClassOpDependencyMemberParser;
+import org.scijava.ops.engine.struct.ClassParameterMemberParser;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.Struct;
 import org.scijava.struct.StructInstance;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpFieldInfo.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpFieldInfo.java
similarity index 94%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpFieldInfo.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpFieldInfo.java
index bfa928354..b8fc0ec63 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpFieldInfo.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpFieldInfo.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops.matcher.impl;
+package org.scijava.ops.engine.matcher.impl;
 
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Field;
@@ -39,14 +39,14 @@
 
 import org.scijava.Priority;
 import org.scijava.ValidityProblem;
-import org.scijava.ops.Hints;
 import org.scijava.ops.api.OpField;
+import org.scijava.ops.engine.Hints;
+import org.scijava.ops.engine.OpHints;
+import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.engine.OpUtils;
+import org.scijava.ops.engine.hint.ImmutableHints;
+import org.scijava.ops.engine.struct.FieldParameterMemberParser;
 import org.scijava.ops.api.OpField;
-import org.scijava.ops.OpHints;
-import org.scijava.ops.OpInfo;
-import org.scijava.ops.OpUtils;
-import org.scijava.ops.hint.ImmutableHints;
-import org.scijava.ops.struct.FieldParameterMemberParser;
 import org.scijava.struct.Struct;
 import org.scijava.struct.StructInstance;
 import org.scijava.struct.Structs;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpMethodInfo.java
similarity index 92%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpMethodInfo.java
index 5784526ad..b862005b1 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpMethodInfo.java
@@ -28,7 +28,7 @@
  * #L%
  */
 
-package org.scijava.ops.matcher.impl;
+package org.scijava.ops.engine.matcher.impl;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -45,20 +45,20 @@
 
 import org.scijava.Priority;
 import org.scijava.ValidityProblem;
-import org.scijava.ops.Hints;
 import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.OpDependencyMember;
-import org.scijava.ops.OpHints;
-import org.scijava.ops.OpInfo;
 import org.scijava.ops.api.OpMethod;
+import org.scijava.ops.engine.Hints;
+import org.scijava.ops.engine.OpDependencyMember;
+import org.scijava.ops.engine.OpHints;
+import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.engine.OpUtils;
+import org.scijava.ops.engine.hint.ImmutableHints;
+import org.scijava.ops.engine.struct.MethodOpDependencyMemberParser;
+import org.scijava.ops.engine.struct.MethodParameterMemberParser;
+import org.scijava.ops.engine.util.Adapt;
+import org.scijava.ops.engine.util.OpMethodUtils;
 import org.scijava.ops.api.OpMethod;
-import org.scijava.ops.OpUtils;
-import org.scijava.ops.hint.ImmutableHints;
-import org.scijava.ops.struct.MethodOpDependencyMemberParser;
-import org.scijava.ops.struct.MethodParameterMemberParser;
-import org.scijava.ops.util.Adapt;
-import org.scijava.ops.util.OpMethodUtils;
 import org.scijava.struct.Member;
 import org.scijava.struct.Struct;
 import org.scijava.struct.StructInstance;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpWrappers.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpWrappers.java
similarity index 99%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpWrappers.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpWrappers.java
index 8c7e59ceb..487db20b7 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpWrappers.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpWrappers.java
@@ -3,7 +3,7 @@
  * corresponding template in templates/ and rerun bin/generate.groovy.
  */
 
-package org.scijava.ops.matcher.impl;
+package org.scijava.ops.engine.matcher.impl;
 
 import java.lang.reflect.Type;
 import java.util.UUID;
@@ -15,12 +15,12 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.BaseOpHints.DependencyMatching;
-import org.scijava.ops.Hints;
-import org.scijava.ops.OpExecutionSummary;
-import org.scijava.ops.OpHistory;
-import org.scijava.ops.OpInfo;
-import org.scijava.ops.OpWrapper;
+import org.scijava.ops.engine.BaseOpHints.DependencyMatching;
+import org.scijava.ops.engine.Hints;
+import org.scijava.ops.engine.OpExecutionSummary;
+import org.scijava.ops.engine.OpHistory;
+import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.engine.OpWrapper;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.GenericTyped;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Add.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Add.java
similarity index 98%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/math/Add.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Add.java
index feaad0f2f..7652c4c7f 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Add.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Add.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.math;
+package org.scijava.ops.engine.math;
 
 import com.google.common.collect.Streams;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOpCollection.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/MathOpCollection.java
similarity index 97%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOpCollection.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/MathOpCollection.java
index aed06fd88..57eb7b898 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOpCollection.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/MathOpCollection.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.math;
+package org.scijava.ops.engine.math;
 
 import java.util.function.BiFunction;
 import java.util.function.BinaryOperator;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOps.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/MathOps.java
similarity index 92%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOps.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/MathOps.java
index 557d1bda7..918e546e6 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOps.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/MathOps.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.math;
+package org.scijava.ops.engine.math;
 
 public class MathOps {
 	public final static String ADD = "math.add";
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Normalize.java
similarity index 96%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Normalize.java
index 854cba6d6..ba8255b42 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Normalize.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.math;
+package org.scijava.ops.engine.math;
 
 import java.util.Arrays;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Power.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Power.java
similarity index 96%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/math/Power.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Power.java
index d07db866b..f16cef033 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Power.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Power.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.math;
+package org.scijava.ops.engine.math;
 
 import java.util.function.BiFunction;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Sqrt.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Sqrt.java
similarity index 96%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/math/Sqrt.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Sqrt.java
index 8481e1165..41f1ba308 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Sqrt.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Sqrt.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.math;
+package org.scijava.ops.engine.math;
 
 import java.util.function.Function;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Zero.java
similarity index 94%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Zero.java
index be8e16dc9..f40fa22a4 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Zero.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.math;
+package org.scijava.ops.engine.math;
 
 import java.util.stream.IntStream;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/monitor/DefaultOpMonitor.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/monitor/DefaultOpMonitor.java
similarity index 91%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/monitor/DefaultOpMonitor.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/monitor/DefaultOpMonitor.java
index 78e90084f..89e5aa563 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/monitor/DefaultOpMonitor.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/monitor/DefaultOpMonitor.java
@@ -1,6 +1,6 @@
-package org.scijava.ops.monitor;
+package org.scijava.ops.engine.monitor;
 
-import org.scijava.ops.log.Logger;
+import org.scijava.ops.engine.log.Logger;
 
 /**
  * Default implementation of {@link OpMonitor}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/monitor/OpMonitor.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/monitor/OpMonitor.java
similarity index 97%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/monitor/OpMonitor.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/monitor/OpMonitor.java
index 78f6f70bd..358db6242 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/monitor/OpMonitor.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/monitor/OpMonitor.java
@@ -26,11 +26,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
-package org.scijava.ops.monitor;
+package org.scijava.ops.engine.monitor;
 
 import java.util.concurrent.CancellationException;
 
-import org.scijava.ops.log.Logger;
+import org.scijava.ops.engine.log.Logger;
 
 /**
  * Used as a bridge between the {@link Op} and the user. Allows the user to
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/ChainCluster.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/ChainCluster.java
similarity index 88%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/ChainCluster.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/ChainCluster.java
index 193513209..3da73b8ec 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/ChainCluster.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/ChainCluster.java
@@ -1,12 +1,12 @@
 
-package org.scijava.ops.simplify;
+package org.scijava.ops.engine.simplify;
 
 import com.google.common.collect.Lists;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.scijava.ops.OpInfo;
+import org.scijava.ops.engine.OpInfo;
 
 public class ChainCluster {
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Identity.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/Identity.java
similarity index 76%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Identity.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/Identity.java
index 4237c8eb3..e18778caf 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Identity.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/Identity.java
@@ -1,11 +1,11 @@
 
-package org.scijava.ops.simplify;
+package org.scijava.ops.engine.simplify;
 
 import java.util.function.Function;
 
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpHints;
-import org.scijava.ops.BaseOpHints.Simplification;
+import org.scijava.ops.engine.OpHints;
+import org.scijava.ops.engine.BaseOpHints.Simplification;
 import org.scijava.plugin.Plugin;
 
 @OpHints(hints = { Simplification.FORBIDDEN })
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/InfoSimplificationGenerator.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/InfoSimplificationGenerator.java
similarity index 92%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/InfoSimplificationGenerator.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/InfoSimplificationGenerator.java
index 10b687024..38662969b 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/InfoSimplificationGenerator.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/InfoSimplificationGenerator.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.simplify;
+package org.scijava.ops.engine.simplify;
 
 import com.google.common.collect.Streams;
 
@@ -9,11 +9,11 @@
 import java.util.Map;
 import java.util.Optional;
 
-import org.scijava.ops.Hints;
-import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.OpInfo;
-import org.scijava.ops.OpRef;
-import org.scijava.ops.OpUtils;
+import org.scijava.ops.engine.Hints;
+import org.scijava.ops.engine.OpEnvironment;
+import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.engine.OpRef;
+import org.scijava.ops.engine.OpUtils;
 import org.scijava.types.Types;
 
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/MutatorChain.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/MutatorChain.java
similarity index 93%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/MutatorChain.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/MutatorChain.java
index 70b33f9d8..61fb65099 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/MutatorChain.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/MutatorChain.java
@@ -1,8 +1,8 @@
-package org.scijava.ops.simplify;
+package org.scijava.ops.engine.simplify;
 
 import java.lang.reflect.Type;
 
-import org.scijava.ops.OpInfo;
+import org.scijava.ops.engine.OpInfo;
 import org.scijava.util.Types;
 
 public class MutatorChain implements Comparable<MutatorChain>{
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveArraySimplifiers.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveArraySimplifiers.java
similarity index 92%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveArraySimplifiers.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveArraySimplifiers.java
index 17a1a3108..735e5de59 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveArraySimplifiers.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveArraySimplifiers.java
@@ -1,14 +1,14 @@
 
-package org.scijava.ops.simplify;
+package org.scijava.ops.engine.simplify;
 
 import java.util.function.Function;
 
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpField;
+import org.scijava.ops.engine.OpHints;
+import org.scijava.ops.engine.BaseOpHints.Simplification;
 import org.scijava.ops.api.OpField;
-import org.scijava.ops.OpHints;
-import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.plugin.Plugin;
 import org.scijava.util.ObjectArray;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveListSimplifier.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveListSimplifier.java
similarity index 89%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveListSimplifier.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveListSimplifier.java
index 6f4d667bd..be7210ed8 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveListSimplifier.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveListSimplifier.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.simplify;
+package org.scijava.ops.engine.simplify;
 
 import java.util.List;
 import java.util.function.Function;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveSimplifiers.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveSimplifiers.java
similarity index 93%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveSimplifiers.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveSimplifiers.java
index 4311a3377..8f84fb171 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveSimplifiers.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveSimplifiers.java
@@ -1,14 +1,14 @@
 
-package org.scijava.ops.simplify;
+package org.scijava.ops.engine.simplify;
 
 import java.util.function.Function;
 
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpField;
+import org.scijava.ops.engine.OpHints;
+import org.scijava.ops.engine.BaseOpHints.Simplification;
 import org.scijava.ops.api.OpField;
-import org.scijava.ops.OpHints;
-import org.scijava.ops.BaseOpHints.Simplification;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationMetadata.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplificationMetadata.java
similarity index 94%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationMetadata.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplificationMetadata.java
index 0df3715d3..29629ba9c 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationMetadata.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplificationMetadata.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops.simplify;
+package org.scijava.ops.engine.simplify;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -11,9 +11,9 @@
 import java.util.stream.Collectors;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.OpInfo;
-import org.scijava.ops.OpUtils;
+import org.scijava.ops.engine.OpEnvironment;
+import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.engine.OpUtils;
 import org.scijava.struct.Member;
 import org.scijava.util.Types;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplificationUtils.java
similarity index 96%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplificationUtils.java
index 0f641263b..aaf55b32a 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplificationUtils.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.simplify;
+package org.scijava.ops.engine.simplify;
 
 import com.google.common.collect.Streams;
 
@@ -21,11 +21,11 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Container;
 import org.scijava.function.Mutable;
-import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.OpInfo;
-import org.scijava.ops.OpRef;
-import org.scijava.ops.OpUtils;
-import org.scijava.ops.util.AnnotationUtils;
+import org.scijava.ops.engine.OpEnvironment;
+import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.engine.OpRef;
+import org.scijava.ops.engine.OpUtils;
+import org.scijava.ops.engine.util.AnnotationUtils;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
 import org.scijava.types.inference.GenericAssignability;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedMember.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedMember.java
similarity index 88%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedMember.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedMember.java
index f3bb99b8a..418f38f36 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedMember.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedMember.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.simplify;
+package org.scijava.ops.engine.simplify;
 
 import java.lang.reflect.Type;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedOpInfo.java
similarity index 90%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedOpInfo.java
index 44609a792..684d5c76e 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedOpInfo.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.simplify;
+package org.scijava.ops.engine.simplify;
 
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Type;
@@ -8,17 +8,17 @@
 
 import org.scijava.Priority;
 import org.scijava.ValidityProblem;
-import org.scijava.ops.BaseOpHints.Simplification;
-import org.scijava.ops.Hints;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.OpInfo;
-import org.scijava.ops.OpUtils;
-import org.scijava.ops.conversionLoss.LossReporter;
-import org.scijava.ops.hint.ImmutableHints;
-import org.scijava.ops.matcher.OpMatchingException;
-import org.scijava.ops.struct.OpRetypingMemberParser;
-import org.scijava.ops.struct.RetypingRequest;
+import org.scijava.ops.engine.Hints;
+import org.scijava.ops.engine.OpEnvironment;
+import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.engine.OpUtils;
+import org.scijava.ops.engine.BaseOpHints.Simplification;
+import org.scijava.ops.engine.conversionLoss.LossReporter;
+import org.scijava.ops.engine.hint.ImmutableHints;
+import org.scijava.ops.engine.matcher.OpMatchingException;
+import org.scijava.ops.engine.struct.OpRetypingMemberParser;
+import org.scijava.ops.engine.struct.RetypingRequest;
 import org.scijava.struct.FunctionalMethodType;
 import org.scijava.struct.ItemIO;
 import org.scijava.struct.Member;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpRef.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedOpRef.java
similarity index 90%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpRef.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedOpRef.java
index 5667703f7..2fc943972 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpRef.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedOpRef.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops.simplify;
+package org.scijava.ops.engine.simplify;
 
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
@@ -10,14 +10,14 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Computers.Arity1;
-import org.scijava.ops.BaseOpHints.Adaptation;
-import org.scijava.ops.BaseOpHints.Simplification;
-import org.scijava.ops.Hints;
-import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.OpInfo;
-import org.scijava.ops.OpRef;
-import org.scijava.ops.hint.DefaultHints;
-import org.scijava.ops.matcher.OpMatchingException;
+import org.scijava.ops.engine.BaseOpHints.Adaptation;
+import org.scijava.ops.engine.BaseOpHints.Simplification;
+import org.scijava.ops.engine.Hints;
+import org.scijava.ops.engine.OpEnvironment;
+import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.engine.OpRef;
+import org.scijava.ops.engine.hint.DefaultHints;
+import org.scijava.ops.engine.matcher.OpMatchingException;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Simplifier.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/Simplifier.java
similarity index 88%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Simplifier.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/Simplifier.java
index ca3250d2d..a7c8a00d3 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Simplifier.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/Simplifier.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops.simplify;
+package org.scijava.ops.engine.simplify;
 
 import java.lang.reflect.Type;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/TypePair.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/TypePair.java
similarity index 88%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/TypePair.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/TypePair.java
index 0682db38b..ad08862b3 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/TypePair.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/TypePair.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.simplify;
+package org.scijava.ops.engine.simplify;
 
 import java.lang.reflect.Type;
 import java.util.Arrays;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/stats/Mean.java
similarity index 95%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/stats/Mean.java
index f29d5531e..b03f9daf8 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/stats/Mean.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.stats;
+package org.scijava.ops.engine.stats;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Size.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/stats/Size.java
similarity index 96%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Size.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/stats/Size.java
index 8718f2424..4d431f3cc 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Size.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/stats/Size.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops.stats;
+package org.scijava.ops.engine.stats;
 
 import java.util.function.Function;
 import java.util.stream.StreamSupport;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassOpDependencyMemberParser.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ClassOpDependencyMemberParser.java
similarity index 92%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassOpDependencyMemberParser.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ClassOpDependencyMemberParser.java
index c34f68e45..f3b0a2306 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassOpDependencyMemberParser.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ClassOpDependencyMemberParser.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops.struct;
+package org.scijava.ops.engine.struct;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -7,8 +7,8 @@
 import java.util.List;
 
 import org.scijava.ValidityProblem;
-import org.scijava.ops.FieldOpDependencyMember;
 import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.engine.FieldOpDependencyMember;
 import org.scijava.ops.api.OpDependency;
 import org.scijava.struct.MemberParser;
 import org.scijava.struct.ValidityException;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassParameterMemberParser.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ClassParameterMemberParser.java
similarity index 94%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassParameterMemberParser.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ClassParameterMemberParser.java
index 17316e50c..e8d70261f 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassParameterMemberParser.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ClassParameterMemberParser.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops.struct;
+package org.scijava.ops.engine.struct;
 
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ConvertedParameterMember.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ConvertedParameterMember.java
similarity index 92%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ConvertedParameterMember.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ConvertedParameterMember.java
index 150d6e132..29c492a9f 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ConvertedParameterMember.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ConvertedParameterMember.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.struct;
+package org.scijava.ops.engine.struct;
 
 import java.lang.reflect.Type;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FieldParameterMemberParser.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/FieldParameterMemberParser.java
similarity index 94%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FieldParameterMemberParser.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/FieldParameterMemberParser.java
index 34e5b9285..9a49538fa 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FieldParameterMemberParser.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/FieldParameterMemberParser.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops.struct;
+package org.scijava.ops.engine.struct;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FunctionalParameterMemberParser.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/FunctionalParameterMemberParser.java
similarity index 96%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FunctionalParameterMemberParser.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/FunctionalParameterMemberParser.java
index 70e30b861..c45836134 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FunctionalParameterMemberParser.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/FunctionalParameterMemberParser.java
@@ -1,3 +1,4 @@
+package org.scijava.ops.engine.struct;
 //
 //package org.scijava.ops.struct;
 //
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FunctionalParameters.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/FunctionalParameters.java
similarity index 93%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FunctionalParameters.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/FunctionalParameters.java
index fe935a4e3..db32d896e 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FunctionalParameters.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/FunctionalParameters.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.struct;
+package org.scijava.ops.engine.struct;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
@@ -9,8 +9,8 @@
 import org.scijava.ValidityProblem;
 import org.scijava.function.Container;
 import org.scijava.function.Mutable;
-import org.scijava.ops.OpUtils;
-import org.scijava.ops.util.AnnotationUtils;
+import org.scijava.ops.engine.OpUtils;
+import org.scijava.ops.engine.util.AnnotationUtils;
 import org.scijava.struct.FunctionalMethodType;
 import org.scijava.struct.ItemIO;
 import org.scijava.types.Types;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/JavadocParameterData.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/JavadocParameterData.java
similarity index 96%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/struct/JavadocParameterData.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/JavadocParameterData.java
index 3678be177..de690e3aa 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/JavadocParameterData.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/JavadocParameterData.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops.struct;
+package org.scijava.ops.engine.struct;
 
 import com.github.therapi.runtimejavadoc.Comment;
 import com.github.therapi.runtimejavadoc.FieldJavadoc;
@@ -18,9 +18,9 @@
 import java.util.stream.Collectors;
 
 import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.engine.OpUtils;
 import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.OpInfo;
-import org.scijava.ops.OpUtils;
 import org.scijava.struct.FunctionalMethodType;
 import org.scijava.struct.Member;
 import org.scijava.types.Types;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodOpDependencyMemberParser.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/MethodOpDependencyMemberParser.java
similarity index 92%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodOpDependencyMemberParser.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/MethodOpDependencyMemberParser.java
index e34240374..dec5e80d2 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodOpDependencyMemberParser.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/MethodOpDependencyMemberParser.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops.struct;
+package org.scijava.ops.engine.struct;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
@@ -8,8 +8,8 @@
 import java.util.List;
 
 import org.scijava.ValidityProblem;
-import org.scijava.ops.MethodParameterOpDependencyMember;
 import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.engine.MethodParameterOpDependencyMember;
 import org.scijava.struct.MemberParser;
 import org.scijava.struct.ValidityException;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodParameterMemberParser.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/MethodParameterMemberParser.java
similarity index 91%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodParameterMemberParser.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/MethodParameterMemberParser.java
index 3a84caa73..2ffc81018 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodParameterMemberParser.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/MethodParameterMemberParser.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops.struct;
+package org.scijava.ops.engine.struct;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
@@ -10,8 +10,8 @@
 
 import org.scijava.ValidityProblem;
 import org.scijava.ops.api.OpMethod;
+import org.scijava.ops.engine.util.OpMethodUtils;
 import org.scijava.ops.api.OpMethod;
-import org.scijava.ops.util.OpMethodUtils;
 import org.scijava.struct.MemberParser;
 import org.scijava.struct.ValidityException;
 import org.scijava.types.Types;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/OpRetypingMemberParser.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/OpRetypingMemberParser.java
similarity index 92%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/struct/OpRetypingMemberParser.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/OpRetypingMemberParser.java
index 2e31765eb..00a053778 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/OpRetypingMemberParser.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/OpRetypingMemberParser.java
@@ -1,10 +1,10 @@
 
-package org.scijava.ops.struct;
+package org.scijava.ops.engine.struct;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.scijava.ops.simplify.SimplifiedOpInfo;
+import org.scijava.ops.engine.simplify.SimplifiedOpInfo;
 import org.scijava.struct.FunctionalMethodType;
 import org.scijava.struct.ItemIO;
 import org.scijava.struct.Member;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ParameterData.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ParameterData.java
similarity index 80%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ParameterData.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ParameterData.java
index 515452df3..0395f6091 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ParameterData.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ParameterData.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.struct;
+package org.scijava.ops.engine.struct;
 
 import java.util.List;
 
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ParameterMember.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ParameterMember.java
new file mode 100644
index 000000000..8b3766759
--- /dev/null
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ParameterMember.java
@@ -0,0 +1,157 @@
+package org.scijava.ops.engine.struct;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.scijava.ItemVisibility;
+import org.scijava.struct.Member;
+
+/**
+ * A {@link Member} with extra commonly useful metadata.
+ * <p>
+ * This metadata is aligned with&mdash;but not explicitly bound to&mdash;the
+ * fields of the {@code @Parameter} annotation type. As such, other code such as
+ * the {@code org.scijava.script} package can use this interface without being
+ * bound to the Java-specific {@code @Parameter} annotation type.
+ * </p>
+ * 
+ * @author Curtis Rueden
+ * @see Parameter
+ */
+public interface ParameterMember<T> extends Member<T> {
+
+	/** Gets the visibility of the parameter. */
+	// TODO: fork ItemVisibility and rename to MemberVisibility
+	default ItemVisibility getVisibility() {
+		return ItemVisibility.NORMAL;
+	}
+
+	/** Gets whether the parameter value is allowed to be auto-filled. */
+	default boolean isAutoFill() {
+		return true;
+	}
+
+	/** Gets whether the parameter value must be specified (i.e., no default). */
+	default boolean isRequired() {
+		return true;
+	}
+
+	/** Gets whether to remember the most recent value of the parameter. */
+	default boolean isPersisted() {
+		return getPersistKey() != null;
+	}
+
+	/** Gets the key to use for saving the value persistently. */
+	default String getPersistKey() {
+		return null;
+	}
+
+	/** Gets the function that is called to initialize the parameter's value. */
+	default String getInitializer() {
+		return null;
+	}
+
+	/** Gets the function that is called to validate the parameter's value. */
+	default String getValidater() {
+		return null;
+	}
+
+	/**
+	 * Gets the function that is called whenever this parameter changes.
+	 * <p>
+	 * This mechanism enables interdependent parameters of various types. For
+	 * example, two int parameters "width" and "height" could update each other
+	 * when another boolean "Preserve aspect ratio" flag is set.
+	 * </p>
+	 */
+	default String getCallback() {
+		return null;
+	}
+
+	/**
+	 * Gets the preferred widget style to use when rendering the parameter in a
+	 * user interface.
+	 */
+	default String getWidgetStyle() {
+		return null;
+	}
+
+	/** Gets the default value. */
+	default Object getDefaultValue() {
+		return null;
+	}
+
+	/** Gets the minimum allowed value (if applicable). */
+	default Object getMinimumValue() {
+		return null;
+	}
+
+	/** Gets the maximum allowed value (if applicable). */
+	default Object getMaximumValue() {
+		return null;
+	}
+
+	/**
+	 * Gets the "soft" minimum value (if applicable).
+	 * <p>
+	 * The soft minimum is a hint for use in bounded scenarios, such as rendering
+	 * in a user interface with a slider or scroll bar widget; the parameter value
+	 * will not actually be clamped to the soft bounds, but they may be used in
+	 * certain circumstances where appropriate.
+	 * </p>
+	 */
+	default Object getSoftMinimum() {
+		// NB: Return hard minimum by default.
+		return getMinimumValue();
+	}
+
+	/**
+	 * Gets the "soft" maximum value (if applicable).
+	 * <p>
+	 * The soft maximum is a hint for use in bounded scenarios, such as rendering
+	 * in a user interface with a slider or scroll bar widget; the parameter value
+	 * will not actually be clamped to the soft bounds, but they may be used in
+	 * certain circumstances where appropriate.
+	 * </p>
+	 */
+	default Object getSoftMaximum() {
+		// NB: Return hard maximum by default.
+		return getMaximumValue();
+	}
+
+	/**
+	 * Gets the preferred step size to use when rendering the parameter in a user
+	 * interface (if applicable).
+	 */
+	default Object getStepSize() {
+		return null;
+	}
+
+	/** Gets the list of possible values. */
+	default List<Object> getChoices() {
+		final Class<T> rawType = getRawType();
+		final T[] choices = rawType.getEnumConstants();
+		return choices == null ? null : Arrays.asList(choices);
+	}
+
+	// -- BasicDetails methods --
+
+	// TODO: Reconcile with BasicDetails.
+	// We need BasicDetails to be read-only, and then have
+	// MutableBasicDetails(?) which adds the setters.
+
+	/** Gets a human-readable label. */
+	default String getLabel() {
+		return getKey();
+	}
+
+	/** Returns true iff the given key is defined. */
+	default boolean has(@SuppressWarnings("unused") String key) {
+		return false;
+	}
+
+	/** Gets the value of the given key, or null if undefined. */
+	default String get(@SuppressWarnings("unused") String key) {
+		return null;
+	}
+}
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/RetypingRequest.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/RetypingRequest.java
similarity index 88%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/struct/RetypingRequest.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/RetypingRequest.java
index f141f9987..7fa4c30a9 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/RetypingRequest.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/RetypingRequest.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops.struct;
+package org.scijava.ops.engine.struct;
 
 import java.util.List;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterData.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/SynthesizedParameterData.java
similarity index 92%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterData.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/SynthesizedParameterData.java
index 894e6369c..106d3f44d 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterData.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/SynthesizedParameterData.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops.struct;
+package org.scijava.ops.engine.struct;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterMember.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/SynthesizedParameterMember.java
similarity index 96%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterMember.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/SynthesizedParameterMember.java
index 7771a9ba1..3aeedf578 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterMember.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/SynthesizedParameterMember.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops.struct;
+package org.scijava.ops.engine.struct;
 
 import java.lang.reflect.Type;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Adapt.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/Adapt.java
similarity index 99%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/util/Adapt.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/Adapt.java
index 58278ec2d..cfc606873 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Adapt.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/Adapt.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.util;
+package org.scijava.ops.engine.util;
 
 import java.lang.invoke.LambdaMetafactory;
 import java.lang.invoke.MethodHandle;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/AnnotationUtils.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/AnnotationUtils.java
similarity index 98%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/util/AnnotationUtils.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/AnnotationUtils.java
index e68905f29..8c9ddaa8a 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/AnnotationUtils.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/AnnotationUtils.java
@@ -33,7 +33,7 @@
 // File path shortening code adapted from:
 // from: http://www.rgagnon.com/javadetails/java-0661.html
 
-package org.scijava.ops.util;
+package org.scijava.ops.engine.util;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/FunctionUtils.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/FunctionUtils.java
similarity index 97%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/util/FunctionUtils.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/FunctionUtils.java
index bd05a2d33..f8c05c4b7 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/FunctionUtils.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/FunctionUtils.java
@@ -3,7 +3,7 @@
  * corresponding template in templates/ and rerun bin/generate.groovy.
  */
 
-package org.scijava.ops.util;
+package org.scijava.ops.engine.util;
 
 import java.lang.reflect.Type;
 import java.util.Map;
@@ -12,8 +12,8 @@
 
 import org.scijava.function.Functions;
 import org.scijava.function.Producer;
-import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.Hints;
+import org.scijava.ops.engine.OpEnvironment;
+import org.scijava.ops.engine.Hints;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Inject.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/Inject.java
similarity index 92%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/util/Inject.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/Inject.java
index 5fa1f2504..5769c567c 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Inject.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/Inject.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.util;
+package org.scijava.ops.engine.util;
 
 import java.util.ArrayList;
 import java.util.EnumSet;
@@ -7,9 +7,9 @@
 import java.util.stream.Collectors;
 
 import org.scijava.command.Command;
-import org.scijava.ops.OpDependencyMember;
-import org.scijava.ops.struct.ClassOpDependencyMemberParser;
-import org.scijava.ops.struct.ClassParameterMemberParser;
+import org.scijava.ops.engine.OpDependencyMember;
+import org.scijava.ops.engine.struct.ClassOpDependencyMemberParser;
+import org.scijava.ops.engine.struct.ClassParameterMemberParser;
 import org.scijava.struct.ItemIO;
 import org.scijava.struct.Struct;
 import org.scijava.struct.StructInstance;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Maps.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/Maps.java
similarity index 97%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/util/Maps.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/Maps.java
index ca54d0371..8d8d0237a 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Maps.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/Maps.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.util;
+package org.scijava.ops.engine.util;
 
 import com.google.common.collect.Streams;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpMethodUtils.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/OpMethodUtils.java
similarity index 95%
rename from scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpMethodUtils.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/OpMethodUtils.java
index c8e33bd90..f95d5d185 100644
--- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpMethodUtils.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/OpMethodUtils.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.util;
+package org.scijava.ops.engine.util;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/AbstractTestEnvironment.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/AbstractTestEnvironment.java
similarity index 91%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/AbstractTestEnvironment.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/AbstractTestEnvironment.java
index 9b36bb083..1ab0a5864 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/AbstractTestEnvironment.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/AbstractTestEnvironment.java
@@ -1,4 +1,4 @@
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -11,7 +11,8 @@
 import org.junit.BeforeClass;
 import org.scijava.Context;
 import org.scijava.cache.CacheService;
-import org.scijava.ops.impl.DefaultOpService;
+import org.scijava.ops.engine.OpService;
+import org.scijava.ops.engine.impl.DefaultOpService;
 import org.scijava.plugin.PluginService;
 import org.scijava.thread.ThreadService;
 import org.scijava.types.TypeService;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/AutoTransformTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/AutoTransformTest.java
similarity index 99%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/AutoTransformTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/AutoTransformTest.java
index 076301020..050e1cc3f 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/AutoTransformTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/AutoTransformTest.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import com.google.common.collect.Streams;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/JavadocParameterTest.java
similarity index 95%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/JavadocParameterTest.java
index 6de7f5d16..be751c60c 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/JavadocParameterTest.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -20,6 +20,8 @@
 import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpMethod;
+import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.engine.OpUtils;
 import org.scijava.plugin.Plugin;
 
 /**
@@ -403,7 +405,7 @@ public void opStringRegressionTest() {
 
 		// test standard op string
 		String expected =
-			"public static java.util.List<java.lang.Long> org.scijava.ops.JavadocParameterTest." +
+			"public static java.util.List<java.lang.Long> org.scijava.ops.engine.JavadocParameterTest." +
 				"OpMethodPR(java.util.List<java.lang.String>,java.util.List<java.lang.String>)(\n" +
 				"	 Inputs:\n" +
 				"		java.util.List<java.lang.String> foo -> the first input\n" +
@@ -415,7 +417,7 @@ public void opStringRegressionTest() {
 
 		// test special op string
 		expected =
-			"public static java.util.List<java.lang.Long> org.scijava.ops.JavadocParameterTest." +
+			"public static java.util.List<java.lang.Long> org.scijava.ops.engine.JavadocParameterTest." +
 				"OpMethodPR(java.util.List<java.lang.String>,java.util.List<java.lang.String>)(\n" +
 				"	 Inputs:\n" +
 				"		java.util.List<java.lang.String> foo -> the first input\n" +
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/ModuleTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/ModuleTest.java
similarity index 95%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/ModuleTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/ModuleTest.java
index c4221a800..9b1293151 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/ModuleTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/ModuleTest.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import static org.junit.Assert.assertTrue;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderNoOutputTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpBuilderNoOutputTest.java
similarity index 91%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderNoOutputTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpBuilderNoOutputTest.java
index 5e5e1f600..a1c1f4519 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderNoOutputTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpBuilderNoOutputTest.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -7,10 +7,10 @@
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.scijava.ops.OpBuilder;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpField;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpBuilderTest.java
similarity index 99%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpBuilderTest.java
index 6846fe0e4..12e6846cb 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpBuilderTest.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -41,7 +41,7 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.engine.AbstractTestEnvironment;
 
 /**
  * Tests {@link OpBuilder}. For each arity, we test the following matches and
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderTestOps.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpBuilderTestOps.java
similarity index 99%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderTestOps.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpBuilderTestOps.java
index f9f70b3d6..d4ef624fb 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderTestOps.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpBuilderTestOps.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCollectionTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpCollectionTest.java
similarity index 98%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/OpCollectionTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpCollectionTest.java
index 78ba809d6..a04ba10da 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCollectionTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpCollectionTest.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.util.function.BiFunction;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpEnvironmentTest.java
similarity index 89%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpEnvironmentTest.java
index a3bcd8896..110e100b8 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpEnvironmentTest.java
@@ -1,4 +1,4 @@
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.lang.reflect.Type;
 import java.util.function.Function;
@@ -7,7 +7,10 @@
 import org.junit.Test;
 import org.scijava.Priority;
 import org.scijava.function.Producer;
-import org.scijava.ops.matcher.impl.OpClassInfo;
+import org.scijava.ops.engine.OpEnvironment;
+import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.engine.OpService;
+import org.scijava.ops.engine.matcher.impl.OpClassInfo;
 import org.scijava.types.GenericTyped;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodDependencyPositionTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpMethodDependencyPositionTest.java
similarity index 95%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodDependencyPositionTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpMethodDependencyPositionTest.java
index 419281fa3..5edbe29c6 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodDependencyPositionTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpMethodDependencyPositionTest.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpMethodTest.java
similarity index 99%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpMethodTest.java
index e3836c33d..d2f327acd 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpMethodTest.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpMethodTestOps.java
similarity index 99%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpMethodTestOps.java
index 1ecfe9335..4e03479f4 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpMethodTestOps.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.util.List;
 import java.util.function.BiFunction;
@@ -37,10 +37,10 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpMethod;
+import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpPriorityTest.java
similarity index 98%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpPriorityTest.java
index 8d20fcc38..0bdf85770 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpPriorityTest.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpsTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpsTest.java
similarity index 99%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/OpsTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpsTest.java
index 98b852e7d..34702f4aa 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpsTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpsTest.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/TestOps.java
similarity index 98%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/TestOps.java
index d5f0e489e..781f233fe 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/TestOps.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/TestUtils.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/TestUtils.java
similarity index 98%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/TestUtils.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/TestUtils.java
index 0a40a90f8..c48f55ac7 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/TestUtils.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/TestUtils.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.util.Arrays;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/OpAdaptationPriorityTest.java
similarity index 91%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/OpAdaptationPriorityTest.java
index 73913adc6..6df880951 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/OpAdaptationPriorityTest.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops.adapt;
+package org.scijava.ops.engine.adapt;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
@@ -37,14 +37,14 @@
 import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.function.Producer;
-import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpBuilder;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpField;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.adapt.functional.ComputersToFunctionsViaFunction;
+import org.scijava.ops.engine.adapt.functional.ComputersToFunctionsViaSource;
 import org.scijava.ops.api.OpField;
-import org.scijava.ops.adapt.functional.ComputersToFunctionsViaFunction;
-import org.scijava.ops.adapt.functional.ComputersToFunctionsViaSource;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/complexLift/ComputerToFunctionIterablesTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/complexLift/ComputerToFunctionIterablesTest.java
similarity index 98%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/complexLift/ComputerToFunctionIterablesTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/complexLift/ComputerToFunctionIterablesTest.java
index 3b54fed83..4b6b4e84b 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/complexLift/ComputerToFunctionIterablesTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/complexLift/ComputerToFunctionIterablesTest.java
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.complexLift;
+package org.scijava.ops.engine.adapt.complexLift;
 
 import static org.junit.Assert.assertArrayEquals;
 
@@ -41,8 +41,8 @@
 
 import org.junit.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/complexLift/FunctionToComputerIterablesTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/complexLift/FunctionToComputerIterablesTest.java
similarity index 97%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/complexLift/FunctionToComputerIterablesTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/complexLift/FunctionToComputerIterablesTest.java
index cfca57cbb..a313302e1 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/complexLift/FunctionToComputerIterablesTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/complexLift/FunctionToComputerIterablesTest.java
@@ -32,15 +32,15 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.complexLift;
+package org.scijava.ops.engine.adapt.complexLift;
 
 import java.util.Arrays;
 import java.util.List;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.OpBuilder;
 
 public class FunctionToComputerIterablesTest extends AbstractTestEnvironment {
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTest.java
similarity index 97%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTest.java
index d7f8b4c59..e1da90f34 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTest.java
@@ -32,13 +32,13 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.functional;
+package org.scijava.ops.engine.adapt.functional;
 
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.OpBuilder;
 
 public class ComputerToFunctionAdaptTest extends AbstractTestEnvironment {
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTestOps.java
similarity index 99%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTestOps.java
index 9439483ca..ada24df50 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTestOps.java
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.functional;
+package org.scijava.ops.engine.adapt.functional;
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.OpField;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTest.java
similarity index 97%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTest.java
index b30eabb53..0d71f6b92 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTest.java
@@ -32,12 +32,12 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.functional;
+package org.scijava.ops.engine.adapt.functional;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.OpBuilder;
 
 public class FunctionToComputerAdaptTest extends AbstractTestEnvironment {
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTestOps.java
similarity index 99%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTestOps.java
index 34fb3da62..1ffb9ce12 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTestOps.java
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.functional;
+package org.scijava.ops.engine.adapt.functional;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/InplaceToFunctionAdaptTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/InplaceToFunctionAdaptTest.java
similarity index 99%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/InplaceToFunctionAdaptTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/InplaceToFunctionAdaptTest.java
index 43039aa61..ec709070c 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/InplaceToFunctionAdaptTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/InplaceToFunctionAdaptTest.java
@@ -32,15 +32,15 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.functional;
+package org.scijava.ops.engine.adapt.functional;
 
 import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;
 
 import org.junit.Test;
-import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 public class InplaceToFunctionAdaptTest extends AbstractTestEnvironment {
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/ComputerToArraysTest.java
similarity index 99%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/ComputerToArraysTest.java
index af5e213c1..0bae9f25e 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/ComputerToArraysTest.java
@@ -32,16 +32,14 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.lift;
+package org.scijava.ops.engine.adapt.lift;
 
 import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Computers;
-import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.engine.AbstractTestEnvironment;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToIterablesTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/ComputerToIterablesTest.java
similarity index 98%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToIterablesTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/ComputerToIterablesTest.java
index eb9b6e8fa..39dd515df 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToIterablesTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/ComputerToIterablesTest.java
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.lift;
+package org.scijava.ops.engine.adapt.lift;
 
 import static org.junit.Assert.assertArrayEquals;
 
@@ -41,8 +41,8 @@
 
 import org.junit.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.OpBuilder;
 
 /**
  * Tests the adaptation of {@link Computers} running on a type into
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/FunctionToArraysTest.java
similarity index 99%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/FunctionToArraysTest.java
index d768f2342..0d4ada99c 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/FunctionToArraysTest.java
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.lift;
+package org.scijava.ops.engine.adapt.lift;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
@@ -40,7 +40,7 @@
 import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Functions;
-import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.engine.AbstractTestEnvironment;
 import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpCollection;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToIterablesTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/FunctionToIterablesTest.java
similarity index 98%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToIterablesTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/FunctionToIterablesTest.java
index fecffb2ce..a9e23eb87 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToIterablesTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/FunctionToIterablesTest.java
@@ -32,15 +32,15 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.lift;
+package org.scijava.ops.engine.adapt.lift;
 
 import java.util.Arrays;
 import java.util.List;
 
 import org.junit.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/InplaceToArraysTest.java
similarity index 99%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/InplaceToArraysTest.java
index 8d431abd7..dd6fd3ea8 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/InplaceToArraysTest.java
@@ -32,15 +32,13 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.lift;
+package org.scijava.ops.engine.adapt.lift;
 
 import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.engine.AbstractTestEnvironment;
 import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/AdaptationHintTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/AdaptationHintTest.java
similarity index 89%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/hints/AdaptationHintTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/AdaptationHintTest.java
index 43232cc90..cfb5f3364 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/AdaptationHintTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/AdaptationHintTest.java
@@ -1,21 +1,21 @@
-package org.scijava.ops.hints;
+package org.scijava.ops.engine.hints;
 
 import static org.junit.Assert.assertTrue;
 
 import java.util.function.Function;
 
 import org.junit.Test;
-import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.Hints;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpField;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.Hints;
+import org.scijava.ops.engine.OpHints;
+import org.scijava.ops.engine.BaseOpHints.Adaptation;
+import org.scijava.ops.engine.hint.DefaultHints;
+import org.scijava.ops.engine.matcher.OpMatchingException;
 import org.scijava.ops.api.OpField;
-import org.scijava.ops.OpHints;
-import org.scijava.ops.BaseOpHints.Adaptation;
-import org.scijava.ops.hint.DefaultHints;
 import org.scijava.function.Computers;
-import org.scijava.ops.matcher.OpMatchingException;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/SimplificationHintTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/SimplificationHintTest.java
similarity index 89%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/hints/SimplificationHintTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/SimplificationHintTest.java
index 3e157504f..2de1494d7 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/SimplificationHintTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/SimplificationHintTest.java
@@ -1,22 +1,22 @@
 
-package org.scijava.ops.hints;
+package org.scijava.ops.engine.hints;
 
 import static org.junit.Assert.assertTrue;
 
 import java.util.function.Function;
 
 import org.junit.Test;
-import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.Hints;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpField;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.Hints;
+import org.scijava.ops.engine.OpHints;
+import org.scijava.ops.engine.BaseOpHints.Adaptation;
+import org.scijava.ops.engine.BaseOpHints.Simplification;
+import org.scijava.ops.engine.hint.DefaultHints;
+import org.scijava.ops.engine.matcher.OpMatchingException;
 import org.scijava.ops.api.OpField;
-import org.scijava.ops.OpHints;
-import org.scijava.ops.BaseOpHints.Adaptation;
-import org.scijava.ops.BaseOpHints.Simplification;
-import org.scijava.ops.hint.DefaultHints;
-import org.scijava.ops.matcher.OpMatchingException;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/OpCachingTest.java
similarity index 93%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/OpCachingTest.java
index 2ede99d73..57d52869e 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/OpCachingTest.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops.impl;
+package org.scijava.ops.engine.impl;
 
 import static org.junit.Assert.fail;
 
@@ -40,15 +40,15 @@
 import org.junit.jupiter.api.Assertions;
 import org.scijava.Context;
 import org.scijava.function.Producer;
-import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.OpHistoryService;
-import org.scijava.ops.OpInstance;
-import org.scijava.ops.OpService;
 import org.scijava.ops.api.Op;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.api.OpField;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.OpEnvironment;
+import org.scijava.ops.engine.OpHistoryService;
+import org.scijava.ops.engine.OpInstance;
+import org.scijava.ops.engine.OpService;
 import org.scijava.plugin.Plugin;
 import org.scijava.plugin.PluginService;
 import org.scijava.types.TypeService;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/ProvenanceTest.java
similarity index 92%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/ProvenanceTest.java
index 72df31ba7..2f34c95c1 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/ProvenanceTest.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.provenance;
+package org.scijava.ops.engine.impl;
 
 import com.google.common.graph.Graph;
 
@@ -12,16 +12,16 @@
 import org.junit.Test;
 import org.scijava.Priority;
 import org.scijava.function.Producer;
-import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.Hints;
-import org.scijava.ops.OpExecutionSummary;
-import org.scijava.ops.OpHistoryService;
-import org.scijava.ops.OpInfo;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpMethod;
-import org.scijava.ops.hint.DefaultHints;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.Hints;
+import org.scijava.ops.engine.OpExecutionSummary;
+import org.scijava.ops.engine.OpHistoryService;
+import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.engine.hint.DefaultHints;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/DefaultMatchingErrorTest.java
similarity index 90%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/DefaultMatchingErrorTest.java
index f98e90aff..4e2260ada 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/DefaultMatchingErrorTest.java
@@ -1,21 +1,17 @@
 
-package org.scijava.ops.matcher;
+package org.scijava.ops.engine.matcher;
 
 import java.util.function.Function;
 
 import org.junit.Assert;
 import org.junit.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.api.Op;
 import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.engine.AbstractTestEnvironment;
 import org.scijava.plugin.Plugin;
-import org.scijava.struct.ItemIO;
 
 @Plugin(type = OpCollection.class)
 public class DefaultMatchingErrorTest extends AbstractTestEnvironment {
@@ -39,7 +35,7 @@ public void duplicateErrorRegressionTest() {
 		}
 		catch (IllegalArgumentException e) {
 			Assert.assertTrue(e.getMessage().startsWith(
-				"org.scijava.ops.matcher.OpMatchingException: " +
+				"org.scijava.ops.engine.matcher.OpMatchingException: " +
 					"Multiple 'test.duplicateOp/java.util.function.Function<java.lang.Double, java.lang.Double>' " +
 					"ops of priority 0.0:"));
 		}
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingUtilsTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingUtilsTest.java
similarity index 99%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingUtilsTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingUtilsTest.java
index 019210014..35638edda 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingUtilsTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingUtilsTest.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops.matcher;
+package org.scijava.ops.engine.matcher;
 
 import static org.junit.Assert.assertTrue;
 
@@ -44,7 +44,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
-import org.scijava.ops.matcher.impl.MatchingUtils;
+import org.scijava.ops.engine.matcher.impl.MatchingUtils;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
 import org.scijava.types.inference.GenericAssignability;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingWithAnyTest.java
similarity index 97%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingWithAnyTest.java
index a6b6589f0..b474ee4b4 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingWithAnyTest.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.matcher;
+package org.scijava.ops.engine.matcher;
 
 import static org.junit.Assert.assertEquals;
 
@@ -10,8 +10,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Producer;
-import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.api.Op;
+import org.scijava.ops.engine.AbstractTestEnvironment;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Any;
 import org.scijava.types.TypeExtractor;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingWithGCSTTest.java
similarity index 92%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingWithGCSTTest.java
index 0e10ba56b..b4447f95a 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingWithGCSTTest.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.matcher;
+package org.scijava.ops.engine.matcher;
 
 import static org.junit.Assert.assertEquals;
 
@@ -7,11 +7,11 @@
 import java.util.function.Function;
 
 import org.junit.Test;
-import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpBuilder;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpField;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/OpWrappersTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/OpWrappersTest.java
similarity index 99%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/OpWrappersTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/OpWrappersTest.java
index dc561899b..943d1dbd1 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/OpWrappersTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/OpWrappersTest.java
@@ -3,7 +3,7 @@
  * corresponding template in templates/ and rerun bin/generate.groovy.
  */
 
-package org.scijava.ops.matcher;
+package org.scijava.ops.engine.matcher;
 
 import static org.junit.Assert.assertTrue;
 
@@ -15,8 +15,8 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.GenericTyped;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/monitor/OpMonitorTest.java
similarity index 93%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/monitor/OpMonitorTest.java
index f2c99ebaf..2803f15ad 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/monitor/OpMonitorTest.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.monitor;
+package org.scijava.ops.engine.monitor;
 
 import java.math.BigInteger;
 import java.util.concurrent.CancellationException;
@@ -10,9 +10,11 @@
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.monitor.DefaultOpMonitor;
+import org.scijava.ops.engine.monitor.OpMonitor;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/PrimitiveListSimplifierTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/PrimitiveListSimplifierTest.java
similarity index 84%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/PrimitiveListSimplifierTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/PrimitiveListSimplifierTest.java
index 1a7c37da4..e75af0c86 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/PrimitiveListSimplifierTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/PrimitiveListSimplifierTest.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.simplify;
+package org.scijava.ops.engine.simplify;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -9,7 +9,8 @@
 import java.util.List;
 
 import org.junit.Test;
-import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.simplify.PrimitiveListSimplifier;
 
 public class PrimitiveListSimplifierTest extends AbstractTestEnvironment {
 	
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationAdaptationTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplificationAdaptationTest.java
similarity index 87%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationAdaptationTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplificationAdaptationTest.java
index a202d63fe..4e99d24f5 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationAdaptationTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplificationAdaptationTest.java
@@ -1,12 +1,12 @@
-package org.scijava.ops.simplify;
+package org.scijava.ops.engine.simplify;
 
 import org.junit.Assert;
 import org.junit.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpField;
+import org.scijava.ops.engine.AbstractTestEnvironment;
 import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationPriorityTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplificationPriorityTest.java
similarity index 89%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationPriorityTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplificationPriorityTest.java
index feca6306b..508410954 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationPriorityTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplificationPriorityTest.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops.simplify;
+package org.scijava.ops.engine.simplify;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -7,14 +7,14 @@
 import java.util.function.Function;
 
 import org.junit.Test;
-import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpField;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.OpHints;
+import org.scijava.ops.engine.BaseOpHints.Simplification;
+import org.scijava.ops.engine.conversionLoss.LossReporter;
 import org.scijava.ops.api.OpField;
-import org.scijava.ops.OpHints;
-import org.scijava.ops.BaseOpHints.Simplification;
-import org.scijava.ops.conversionLoss.LossReporter;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyIOTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplifyIOTest.java
similarity index 92%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyIOTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplifyIOTest.java
index 6c7a08e48..1f625c062 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyIOTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplifyIOTest.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.simplify;
+package org.scijava.ops.engine.simplify;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -8,10 +8,10 @@
 import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpField;
+import org.scijava.ops.engine.AbstractTestEnvironment;
 import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplifyTest.java
similarity index 92%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplifyTest.java
index 65296f17f..a01f56dc2 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplifyTest.java
@@ -1,15 +1,15 @@
 
-package org.scijava.ops.simplify;
+package org.scijava.ops.engine.simplify;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.function.BiFunction;
 
 import org.junit.Test;
-import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpField;
+import org.scijava.ops.engine.AbstractTestEnvironment;
 import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/stats/MeanTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/stats/MeanTest.java
similarity index 82%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/stats/MeanTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/stats/MeanTest.java
index 9e81b6d27..6ff5dcebe 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/stats/MeanTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/stats/MeanTest.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.stats;
+package org.scijava.ops.engine.stats;
 
 import static org.junit.Assert.assertEquals;
 
@@ -7,8 +7,8 @@
 import java.util.function.Function;
 
 import org.junit.Test;
-import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 public class MeanTest <N extends Number> extends AbstractTestEnvironment{
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/AdaptersTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/AdaptersTest.java
similarity index 95%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/util/AdaptersTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/AdaptersTest.java
index d558346f5..c6a1495d0 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/AdaptersTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/AdaptersTest.java
@@ -27,15 +27,15 @@
  * #L%
  */
 
-package org.scijava.ops.util;
+package org.scijava.ops.engine.util;
 
 import java.util.function.BiFunction;
 
 import org.junit.Test;
 import org.scijava.types.Nil;
 import org.scijava.function.Computers;
-import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.util.Adapt;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.util.Adapt;
 
 public class AdaptersTest extends AbstractTestEnvironment {
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/ComputersTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/ComputersTest.java
similarity index 94%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/util/ComputersTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/ComputersTest.java
index ab40372be..012e3fbf1 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/ComputersTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/ComputersTest.java
@@ -27,12 +27,12 @@
  * #L%
  */
 
-package org.scijava.ops.util;
+package org.scijava.ops.engine.util;
 
 import org.junit.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 public class ComputersTest extends AbstractTestEnvironment {
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/FunctionsTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/FunctionsTest.java
similarity index 94%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/util/FunctionsTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/FunctionsTest.java
index 5243415b9..50bb24439 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/FunctionsTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/FunctionsTest.java
@@ -27,14 +27,14 @@
  * #L%
  */
 
-package org.scijava.ops.util;
+package org.scijava.ops.engine.util;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
 import org.junit.Test;
-import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 public class FunctionsTest extends AbstractTestEnvironment {
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/InplacesTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/InplacesTest.java
similarity index 94%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/util/InplacesTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/InplacesTest.java
index ce35a3610..95f9bd25e 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/InplacesTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/InplacesTest.java
@@ -27,12 +27,12 @@
  * #L%
  */
 
-package org.scijava.ops.util;
+package org.scijava.ops.engine.util;
 
 import org.junit.Test;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 public class InplacesTest extends AbstractTestEnvironment {
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/LambdaizerTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/LambdaizerTest.java
similarity index 98%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/util/LambdaizerTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/LambdaizerTest.java
index b301282cf..f8c262bcf 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/LambdaizerTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/LambdaizerTest.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.util;
+package org.scijava.ops.engine.util;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -9,6 +9,7 @@
 import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
+import org.scijava.ops.engine.util.Adapt;
 
 /**
  * Confirms the capabilities of the lambdaizer to convert methods into their
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/LiftTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/LiftTest.java
similarity index 95%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/util/LiftTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/LiftTest.java
index c625f1c91..9211a8e4e 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/LiftTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/LiftTest.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops.util;
+package org.scijava.ops.engine.util;
 
 import com.google.common.collect.Streams;
 
@@ -39,8 +39,9 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.engine.util.Maps;
 import org.scijava.types.Nil;
 
 public class LiftTest extends AbstractTestEnvironment {
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/OpsAsParametersTest.java
similarity index 94%
rename from scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
rename to scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/OpsAsParametersTest.java
index fb10209a3..387952e36 100644
--- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/OpsAsParametersTest.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.util;
+package org.scijava.ops.engine.util;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -6,12 +6,12 @@
 import java.util.function.Function;
 
 import org.junit.Test;
-import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.api.Op;
-import org.scijava.ops.OpBuilder;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpField;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.ops.api.OpField;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
diff --git a/scijava/scijava-ops/templates/main/java/module-info.list b/scijava/scijava-ops-engine/templates/main/java/module-info.list
similarity index 100%
rename from scijava/scijava-ops/templates/main/java/module-info.list
rename to scijava/scijava-ops-engine/templates/main/java/module-info.list
diff --git a/scijava/scijava-ops/templates/main/java/module-info.vm b/scijava/scijava-ops-engine/templates/main/java/module-info.vm
similarity index 71%
rename from scijava/scijava-ops/templates/main/java/module-info.vm
rename to scijava/scijava-ops-engine/templates/main/java/module-info.vm
index e37723ca5..fc3bb3425 100644
--- a/scijava/scijava-ops/templates/main/java/module-info.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/module-info.vm
@@ -1,4 +1,4 @@
-module org.scijava.ops {
+module org.scijava.ops.engine {
 
 /*
  * This is autogenerated source code -- DO NOT EDIT. Instead, edit the
@@ -8,17 +8,17 @@ module org.scijava.ops {
 ## Determines all packages in the module
 #set($packages = $modulePackages.call("src/main/java/org/scijava"))
 ## Defines the packages that should be exported to org.scijava
-#set($scijavaPackages = ["org.scijava.ops", "org.scijava.ops.impl", "org.scijava.ops.matcher.impl"])
+#set($scijavaPackages = ["org.scijava.ops.engine", "org.scijava.ops.engine.impl", "org.scijava.ops.engine.matcher.impl"])
 ## Defines the packages that should be exported to therapi.runtime.javadoc
 #set($therapiPackages = $modulePackages.call("src/main/java/org/scijava"))
 	//TODO: rearrange packages to export only needed classes
-	exports org.scijava.ops; //contains OpDependency interface
-	exports org.scijava.ops.matcher;
-	exports org.scijava.ops.math;
-	exports org.scijava.ops.simplify;
-	exports org.scijava.ops.conversionLoss;
+	exports org.scijava.ops.engine; //contains OpDependency interface
+	exports org.scijava.ops.engine.matcher;
+	exports org.scijava.ops.engine.math;
+	exports org.scijava.ops.engine.simplify;
+	exports org.scijava.ops.engine.conversionLoss;
 	// TODO: move OpWrapper to its own package (org.scijava.ops.wrap??)
-	exports org.scijava.ops.util; // contains OpWrapper interface
+	exports org.scijava.ops.engine.util; // contains OpWrapper interface
 
 #foreach($package in $packages)
 	opens $package to $opensToString.call($package, $scijavaPackages, $therapiPackages);
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.list b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/OpBuilder.list
similarity index 97%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.list
rename to scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/OpBuilder.list
index f4f87aae9..0cef647dc 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.list
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/OpBuilder.list
@@ -1,4 +1,4 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
 arities = (1..maxArity).collect()
 
 [OpBuilder.java]
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.vm b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/OpBuilder.vm
similarity index 99%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.vm
rename to scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/OpBuilder.vm
index 3781e30d8..122c8b32f 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/OpBuilder.vm
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.lang.reflect.Type;
 import java.util.function.BiFunction;
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.list b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/complexLift/ComputersToFunctionsAndLift.list
similarity index 94%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.list
rename to scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/complexLift/ComputersToFunctionsAndLift.list
index 5ed4ceef8..1febe798e 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.list
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/complexLift/ComputersToFunctionsAndLift.list
@@ -1,4 +1,4 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
 arities = (1..maxArity).collect()
 
 [ComputersToFunctionsAndLift.java]
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.vm b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/complexLift/ComputersToFunctionsAndLift.vm
similarity index 98%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.vm
rename to scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/complexLift/ComputersToFunctionsAndLift.vm
index 0cab6cabc..d6f68eaeb 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/complexLift/ComputersToFunctionsAndLift.vm
@@ -66,7 +66,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.complexLift;
+package org.scijava.ops.engine.adapt.complexLift;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.list b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/complexLift/FunctionsToComputersAndLift.list
similarity index 94%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.list
rename to scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/complexLift/FunctionsToComputersAndLift.list
index 645bc8a04..09b3e38fe 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.list
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/complexLift/FunctionsToComputersAndLift.list
@@ -1,4 +1,4 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
 arities = (1..maxArity).collect()
 
 [FunctionsToComputersAndLift.java]
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.vm b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/complexLift/FunctionsToComputersAndLift.vm
similarity index 98%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.vm
rename to scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/complexLift/FunctionsToComputersAndLift.vm
index ccf97a2b7..ff83be5dc 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/complexLift/FunctionsToComputersAndLift.vm
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.complexLift;
+package org.scijava.ops.engine.adapt.complexLift;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.list b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaFunction.list
similarity index 51%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.list
rename to scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaFunction.list
index 438cb5e01..0607ffaa3 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.list
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaFunction.list
@@ -1,4 +1,4 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
 arities = (1..maxArity).collect()
 
 [ComputersToFunctionsViaFunction.java]
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.vm b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaFunction.vm
similarity index 98%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.vm
rename to scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaFunction.vm
index 3e89eb70e..30aff0c80 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaFunction.vm
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.functional;
+package org.scijava.ops.engine.adapt.functional;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.list b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaSource.list
similarity index 50%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.list
rename to scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaSource.list
index a6e433646..8e5b576cf 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.list
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaSource.list
@@ -1,4 +1,4 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
 arities = (1..maxArity).collect()
 
 [ComputersToFunctionsViaSource.java]
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.vm b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaSource.vm
similarity index 98%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.vm
rename to scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaSource.vm
index b6ca9501c..2e61dcbd1 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaSource.vm
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.functional;
+package org.scijava.ops.engine.adapt.functional;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
diff --git a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/FunctionsToComputers.list b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/FunctionsToComputers.list
new file mode 100644
index 000000000..346a325b9
--- /dev/null
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/FunctionsToComputers.list
@@ -0,0 +1,4 @@
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
+arities = (1..maxArity).collect()
+
+[FunctionsToComputers.java]
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.vm b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/FunctionsToComputers.vm
similarity index 98%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.vm
rename to scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/FunctionsToComputers.vm
index cc9b29c46..d96d5753e 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/FunctionsToComputers.vm
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.functional;
+package org.scijava.ops.engine.adapt.functional;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.list b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/InplacesToFunctions.list
similarity index 97%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.list
rename to scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/InplacesToFunctions.list
index 58cd80a56..580ce0e84 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.list
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/InplacesToFunctions.list
@@ -1,4 +1,4 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
 arities = (1..maxArity).collect()
 
 [InplacesToFunctions.java]
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.vm b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/InplacesToFunctions.vm
similarity index 98%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.vm
rename to scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/InplacesToFunctions.vm
index 257c76256..080da72c6 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/InplacesToFunctions.vm
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.functional;
+package org.scijava.ops.engine.adapt.functional;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.list b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/ComputerToArrays.list
similarity index 87%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.list
rename to scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/ComputerToArrays.list
index e95840833..efd5bd2c2 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.list
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/ComputerToArrays.list
@@ -1,4 +1,4 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
 arities = (1..maxArity).collect()
 
 [ComputerToArrays.java]
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.vm b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/ComputerToArrays.vm
similarity index 95%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.vm
rename to scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/ComputerToArrays.vm
index 262c6d05a..c975c4698 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/ComputerToArrays.vm
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.lift;
+package org.scijava.ops.engine.adapt.lift;
 
 import java.util.function.Function;
 
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.list b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/ComputerToIterables.list
similarity index 94%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.list
rename to scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/ComputerToIterables.list
index 998367017..d26205a6b 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.list
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/ComputerToIterables.list
@@ -1,4 +1,4 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
 arities = (1..maxArity).collect()
 
 [ComputerToIterables.java]
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/ComputerToIterables.vm
similarity index 98%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm
rename to scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/ComputerToIterables.vm
index 919be7fe8..87c9ab5b9 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/ComputerToIterables.vm
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.lift;
+package org.scijava.ops.engine.adapt.lift;
 
 import java.util.Iterator;
 import java.util.function.Function;
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.list b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/FunctionToArrays.list
similarity index 90%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.list
rename to scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/FunctionToArrays.list
index 71c946edb..a2c1e9a20 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.list
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/FunctionToArrays.list
@@ -1,4 +1,4 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
 arities = (1..maxArity).collect()
 
 [FunctionToArrays.java]
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.vm b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/FunctionToArrays.vm
similarity index 98%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.vm
rename to scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/FunctionToArrays.vm
index 0ac9af228..4267b8e78 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/FunctionToArrays.vm
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.lift;
+package org.scijava.ops.engine.adapt.lift;
 
 import java.lang.reflect.Array;
 import java.util.function.BiFunction;
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.list b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/FunctionToIterables.list
similarity index 92%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.list
rename to scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/FunctionToIterables.list
index 35233e15f..bd8ef86e0 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.list
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/FunctionToIterables.list
@@ -1,4 +1,4 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
 arities = (1..maxArity).collect()
 
 [FunctionToIterables.java]
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.vm b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/FunctionToIterables.vm
similarity index 99%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.vm
rename to scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/FunctionToIterables.vm
index b053b531c..fee5a9e48 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/FunctionToIterables.vm
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.lift;
+package org.scijava.ops.engine.adapt.lift;
 
 import java.util.Iterator;
 import java.util.function.BiFunction;
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.list b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/InplaceToArrays.list
similarity index 94%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.list
rename to scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/InplaceToArrays.list
index 4d87e613b..a51d8da30 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.list
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/InplaceToArrays.list
@@ -1,4 +1,4 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
 arities = (1..maxArity).collect()
 
 [InplaceToArrays.java]
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.vm b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/InplaceToArrays.vm
similarity index 95%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.vm
rename to scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/InplaceToArrays.vm
index 68192957a..fb3378d98 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/InplaceToArrays.vm
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.lift;
+package org.scijava.ops.engine.adapt.lift;
 
 import java.util.function.Function;
 
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/impl/OpWrappers.list b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/matcher/impl/OpWrappers.list
similarity index 96%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/impl/OpWrappers.list
rename to scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/matcher/impl/OpWrappers.list
index 1f84a9cc9..0b540bf29 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/impl/OpWrappers.list
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/matcher/impl/OpWrappers.list
@@ -1,4 +1,4 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
 arities = (0..maxArity).collect()
 
 [OpWrappers.java]
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/impl/OpWrappers.vm b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/matcher/impl/OpWrappers.vm
similarity index 93%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/impl/OpWrappers.vm
rename to scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/matcher/impl/OpWrappers.vm
index cf7559aad..a8aaec2c4 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/impl/OpWrappers.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/matcher/impl/OpWrappers.vm
@@ -3,7 +3,7 @@
  * corresponding template in templates/ and rerun bin/generate.groovy.
  */
 
-package org.scijava.ops.matcher.impl;
+package org.scijava.ops.engine.matcher.impl;
 
 import java.lang.reflect.Type;
 import java.util.UUID;
@@ -15,12 +15,12 @@ import org.scijava.function.Container;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.BaseOpHints.DependencyMatching;
-import org.scijava.ops.Hints;
-import org.scijava.ops.OpExecutionSummary;
-import org.scijava.ops.OpHistory;
-import org.scijava.ops.OpInfo;
-import org.scijava.ops.OpWrapper;
+import org.scijava.ops.engine.BaseOpHints.DependencyMatching;
+import org.scijava.ops.engine.Hints;
+import org.scijava.ops.engine.OpExecutionSummary;
+import org.scijava.ops.engine.OpHistory;
+import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.engine.OpWrapper;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.GenericTyped;
 
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.list b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/util/FunctionUtils.list
similarity index 100%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.list
rename to scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/util/FunctionUtils.list
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.vm b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/util/FunctionUtils.vm
similarity index 94%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.vm
rename to scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/util/FunctionUtils.vm
index d7248f865..72ca7baf4 100644
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/util/FunctionUtils.vm
@@ -3,7 +3,7 @@
  * corresponding template in templates/ and rerun bin/generate.groovy.
  */
 
-package org.scijava.ops.util;
+package org.scijava.ops.engine.util;
 
 import java.lang.reflect.Type;
 import java.util.Map;
@@ -12,8 +12,8 @@ import java.util.function.Function;
 
 import org.scijava.function.Functions;
 import org.scijava.function.Producer;
-import org.scijava.ops.OpEnvironment;
-import org.scijava.ops.Hints;
+import org.scijava.ops.engine.OpEnvironment;
+import org.scijava.ops.engine.Hints;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
 
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/Globals.list b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/util/Globals.list
similarity index 100%
rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/util/Globals.list
rename to scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/util/Globals.list
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTest.list b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpBuilderTest.list
similarity index 95%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTest.list
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpBuilderTest.list
index 78f0fb877..c09377f30 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTest.list
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpBuilderTest.list
@@ -1,4 +1,4 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
 arities = (0..maxArity).collect()
 
 inputDoubles = ```
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpBuilderTest.vm
similarity index 99%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTest.vm
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpBuilderTest.vm
index ddcb664f4..4f4f83ef9 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpBuilderTest.vm
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -41,7 +41,7 @@ import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.engine.AbstractTestEnvironment;
 
 /**
  * Tests {@link OpBuilder}. For each arity, we test the following matches and
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTestOps.list b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpBuilderTestOps.list
similarity index 100%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTestOps.list
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpBuilderTestOps.list
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTestOps.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpBuilderTestOps.vm
similarity index 99%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTestOps.vm
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpBuilderTestOps.vm
index 36b61877e..dc47593b1 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTestOps.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpBuilderTestOps.vm
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTest.list b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpMethodTest.list
similarity index 96%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTest.list
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpMethodTest.list
index b76b0a30d..a5df58eb5 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTest.list
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpMethodTest.list
@@ -1,4 +1,4 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
 arities = (0..maxArity).collect()
 
 inputDoubles = ```
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpMethodTest.vm
similarity index 99%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTest.vm
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpMethodTest.vm
index 0053bf02e..b86397ba3 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpMethodTest.vm
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTestOps.list b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpMethodTestOps.list
similarity index 93%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTestOps.list
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpMethodTestOps.list
index 57ee2eb1f..2b9e9fb67 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTestOps.list
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpMethodTestOps.list
@@ -1,4 +1,4 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
 
 argsList = ```
 {arity ->
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTestOps.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpMethodTestOps.vm
similarity index 97%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTestOps.vm
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpMethodTestOps.vm
index b8465805f..161005fc7 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTestOps.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpMethodTestOps.vm
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops;
+package org.scijava.ops.engine;
 
 import java.util.List;
 import java.util.function.BiFunction;
@@ -37,7 +37,9 @@ import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.api.OpField;
+import org.scijava.ops.api.OpMethod;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/complexLift/ComputerToFunctionIterablesTest.list b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/complexLift/ComputerToFunctionIterablesTest.list
similarity index 88%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/complexLift/ComputerToFunctionIterablesTest.list
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/complexLift/ComputerToFunctionIterablesTest.list
index 3781b2349..b3b578b6d 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/complexLift/ComputerToFunctionIterablesTest.list
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/complexLift/ComputerToFunctionIterablesTest.list
@@ -1,4 +1,4 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
 arities = (1..maxArity).collect()
 
 [ComputerToFunctionIterablesTest.java]
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/complexLift/ComputerToFunctionIterablesTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/complexLift/ComputerToFunctionIterablesTest.vm
similarity index 94%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/complexLift/ComputerToFunctionIterablesTest.vm
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/complexLift/ComputerToFunctionIterablesTest.vm
index 965ee580f..01f9d9727 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/complexLift/ComputerToFunctionIterablesTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/complexLift/ComputerToFunctionIterablesTest.vm
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.complexLift;
+package org.scijava.ops.engine.adapt.complexLift;
 
 import static org.junit.Assert.assertArrayEquals;
 
@@ -41,8 +41,8 @@ import java.util.List;
 
 import org.junit.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/complexLift/FunctionToComputerIterablesTest.list b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/complexLift/FunctionToComputerIterablesTest.list
similarity index 78%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/complexLift/FunctionToComputerIterablesTest.list
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/complexLift/FunctionToComputerIterablesTest.list
index d32317319..c8c042121 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/complexLift/FunctionToComputerIterablesTest.list
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/complexLift/FunctionToComputerIterablesTest.list
@@ -1,4 +1,4 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
 arities = (1..maxArity).collect()
 
 [FunctionToComputerIterablesTest.java]
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/complexLift/FunctionToComputerIterablesTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/complexLift/FunctionToComputerIterablesTest.vm
similarity index 93%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/complexLift/FunctionToComputerIterablesTest.vm
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/complexLift/FunctionToComputerIterablesTest.vm
index a2f7e80c4..dce5c8121 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/complexLift/FunctionToComputerIterablesTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/complexLift/FunctionToComputerIterablesTest.vm
@@ -32,15 +32,15 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.complexLift;
+package org.scijava.ops.engine.adapt.complexLift;
 
 import java.util.Arrays;
 import java.util.List;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.OpBuilder;
 
 public class FunctionToComputerIterablesTest extends AbstractTestEnvironment {
 #foreach($arity in [1..$maxArity])
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTest.list b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTest.list
similarity index 78%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTest.list
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTest.list
index b8cee8f8e..156ed5bae 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTest.list
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTest.list
@@ -1,4 +1,4 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
 arities = (1..maxArity).collect()
 
 [ComputerToFunctionAdaptTest.java]
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTest.vm
similarity index 93%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTest.vm
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTest.vm
index b37305228..8c0122c88 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTest.vm
@@ -32,13 +32,13 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.functional;
+package org.scijava.ops.engine.adapt.functional;
 
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.OpBuilder;
 
 public class ComputerToFunctionAdaptTest extends AbstractTestEnvironment {
 #foreach($arity in [1..$maxArity])
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.list b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTestOps.list
similarity index 84%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.list
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTestOps.list
index 002b9cd8b..10905acf2 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.list
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTestOps.list
@@ -1,4 +1,4 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
 arities = (1..maxArity).collect()
 
 [ComputerToFunctionAdaptTestOps.java]
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTestOps.vm
similarity index 97%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTestOps.vm
index d668f9d2e..85a60749c 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTestOps.vm
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.functional;
+package org.scijava.ops.engine.adapt.functional;
 
 import org.scijava.function.Computers;
 import org.scijava.ops.api.OpField;
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTest.list b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTest.list
similarity index 78%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTest.list
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTest.list
index 05f7f7cc4..20f2cc2e9 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTest.list
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTest.list
@@ -1,4 +1,4 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
 arities = (1..maxArity).collect()
 
 [FunctionToComputerAdaptTest.java]
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTest.vm
similarity index 93%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTest.vm
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTest.vm
index bc8298360..0c26f3219 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTest.vm
@@ -32,12 +32,12 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.functional;
+package org.scijava.ops.engine.adapt.functional;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.OpBuilder;
 
 public class FunctionToComputerAdaptTest extends AbstractTestEnvironment {
 #foreach($arity in [1..$maxArity])
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.list b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTestOps.list
similarity index 84%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.list
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTestOps.list
index 962a3d11e..91bbec8e0 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.list
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTestOps.list
@@ -1,4 +1,4 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
 arities = (1..maxArity).collect()
 
 [FunctionToComputerAdaptTestOps.java]
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTestOps.vm
similarity index 98%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.vm
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTestOps.vm
index a9574cde6..f150379e3 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTestOps.vm
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.functional;
+package org.scijava.ops.engine.adapt.functional;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/InplaceToFunctionAdaptTest.list b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/InplaceToFunctionAdaptTest.list
similarity index 86%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/InplaceToFunctionAdaptTest.list
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/InplaceToFunctionAdaptTest.list
index dbd9e56a1..1d4d27d1b 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/InplaceToFunctionAdaptTest.list
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/InplaceToFunctionAdaptTest.list
@@ -1,4 +1,4 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
 arities = (1..maxArity).collect()
 
 [InplaceToFunctionAdaptTest.java]
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/InplaceToFunctionAdaptTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/InplaceToFunctionAdaptTest.vm
similarity index 94%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/InplaceToFunctionAdaptTest.vm
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/InplaceToFunctionAdaptTest.vm
index 48df13f20..3de0da877 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/InplaceToFunctionAdaptTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/InplaceToFunctionAdaptTest.vm
@@ -32,15 +32,15 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.functional;
+package org.scijava.ops.engine.adapt.functional;
 
 import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;
 
 import org.junit.Test;
-import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 public class InplaceToFunctionAdaptTest extends AbstractTestEnvironment {
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.list b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/ComputerToArraysTest.list
similarity index 93%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.list
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/ComputerToArraysTest.list
index b964e3b7f..b53d60263 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.list
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/ComputerToArraysTest.list
@@ -1,4 +1,4 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
 arities = (1..maxArity).collect()
 
 [ComputerToArraysTest.java]
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/ComputerToArraysTest.vm
similarity index 95%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.vm
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/ComputerToArraysTest.vm
index 51ae3d2d2..a10f07ab0 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/ComputerToArraysTest.vm
@@ -32,16 +32,14 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.lift;
+package org.scijava.ops.engine.adapt.lift;
 
 import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Computers;
-import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.engine.AbstractTestEnvironment;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToIterablesTest.list b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/ComputerToIterablesTest.list
similarity index 88%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToIterablesTest.list
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/ComputerToIterablesTest.list
index 87b6590a9..9ecb10052 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToIterablesTest.list
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/ComputerToIterablesTest.list
@@ -1,4 +1,4 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
 arities = (1..maxArity).collect()
 
 [ComputerToIterablesTest.java]
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToIterablesTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/ComputerToIterablesTest.vm
similarity index 94%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToIterablesTest.vm
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/ComputerToIterablesTest.vm
index e0d7ae304..a8c7e9152 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToIterablesTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/ComputerToIterablesTest.vm
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.lift;
+package org.scijava.ops.engine.adapt.lift;
 
 import static org.junit.Assert.assertArrayEquals;
 
@@ -41,8 +41,8 @@ import java.util.List;
 
 import org.junit.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.OpBuilder;
 
 /**
  * Tests the adaptation of {@link Computers} running on a type into
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.list b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/FunctionToArraysTest.list
similarity index 93%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.list
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/FunctionToArraysTest.list
index 1fcf927cb..30d2a6433 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.list
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/FunctionToArraysTest.list
@@ -1,4 +1,4 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
 arities = (1..maxArity).collect()
 
 [FunctionToArraysTest.java]
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/FunctionToArraysTest.vm
similarity index 97%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.vm
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/FunctionToArraysTest.vm
index 1441671a3..a6d7f2bec 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/FunctionToArraysTest.vm
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.lift;
+package org.scijava.ops.engine.adapt.lift;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
@@ -40,7 +40,7 @@ import java.util.function.Function;
 import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Functions;
-import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.engine.AbstractTestEnvironment;
 import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpField;
 import org.scijava.ops.api.OpCollection;
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToIterablesTest.list b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/FunctionToIterablesTest.list
similarity index 88%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToIterablesTest.list
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/FunctionToIterablesTest.list
index a9fadf984..e15734e74 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToIterablesTest.list
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/FunctionToIterablesTest.list
@@ -1,4 +1,4 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
 arities = (1..maxArity).collect()
 
 [FunctionToIterablesTest.java]
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToIterablesTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/FunctionToIterablesTest.vm
similarity index 94%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToIterablesTest.vm
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/FunctionToIterablesTest.vm
index 2c79a9387..b37c1a342 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToIterablesTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/FunctionToIterablesTest.vm
@@ -32,15 +32,15 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.lift;
+package org.scijava.ops.engine.adapt.lift;
 
 import java.util.Arrays;
 import java.util.List;
 
 import org.junit.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.list b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/InplaceToArraysTest.list
similarity index 95%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.list
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/InplaceToArraysTest.list
index 4c247d5d9..965c980de 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.list
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/InplaceToArraysTest.list
@@ -1,4 +1,4 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
 arities = (1..maxArity).collect()
 
 [InplaceToArraysTest.java]
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/InplaceToArraysTest.vm
similarity index 95%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.vm
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/InplaceToArraysTest.vm
index a1a885eb6..349eb80bc 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/InplaceToArraysTest.vm
@@ -32,15 +32,13 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.adapt.lift;
+package org.scijava.ops.engine.adapt.lift;
 
 import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.AbstractTestEnvironment;
+import org.scijava.ops.engine.AbstractTestEnvironment;
 import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpCollection;
 import org.scijava.ops.api.OpCollection;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/matcher/OpWrappersTest.list b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/matcher/OpWrappersTest.list
similarity index 87%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/matcher/OpWrappersTest.list
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/matcher/OpWrappersTest.list
index bf49f4a14..a4c18976a 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/matcher/OpWrappersTest.list
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/matcher/OpWrappersTest.list
@@ -1,4 +1,4 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
+.include templates/main/java/org/scijava/ops/engine/util/Globals.list
 arities = (0..maxArity).collect()
 
 [OpWrappersTest.java]
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/matcher/OpWrappersTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/matcher/OpWrappersTest.vm
similarity index 93%
rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/matcher/OpWrappersTest.vm
rename to scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/matcher/OpWrappersTest.vm
index f5436ebed..51fc0d47d 100644
--- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/matcher/OpWrappersTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/matcher/OpWrappersTest.vm
@@ -3,7 +3,7 @@
  * corresponding template in templates/ and rerun bin/generate.groovy.
  */
 
-package org.scijava.ops.matcher;
+package org.scijava.ops.engine.matcher;
 
 import static org.junit.Assert.assertTrue;
 
@@ -15,8 +15,8 @@ import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.AbstractTestEnvironment;
-import org.scijava.ops.OpBuilder;
+import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.engine.OpBuilder;
 import org.scijava.types.GenericTyped;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops/.gitignore b/scijava/scijava-ops/.gitignore
deleted file mode 100644
index 00d2ab71d..000000000
--- a/scijava/scijava-ops/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/.apt_generated/
-/.apt_generated_tests/
diff --git a/scijava/scijava-ops/src/main/java/module-info.java b/scijava/scijava-ops/src/main/java/module-info.java
deleted file mode 100644
index 63846ed9a..000000000
--- a/scijava/scijava-ops/src/main/java/module-info.java
+++ /dev/null
@@ -1,52 +0,0 @@
-module org.scijava.ops {
-
-/*
- * This is autogenerated source code -- DO NOT EDIT. Instead, edit the
- * corresponding template in templates/ and rerun bin/generate.groovy.
- */
-
-	//TODO: rearrange packages to export only needed classes
-	exports org.scijava.ops; //contains OpDependency interface
-	exports org.scijava.ops.matcher;
-	exports org.scijava.ops.math;
-	exports org.scijava.ops.simplify;
-	exports org.scijava.ops.conversionLoss;
-	// TODO: move OpWrapper to its own package (org.scijava.ops.wrap??)
-	exports org.scijava.ops.util; // contains OpWrapper interface
-
-	opens org.scijava.ops.conversionLoss to therapi.runtime.javadoc;
-	opens org.scijava.ops.log to therapi.runtime.javadoc;
-	opens org.scijava.ops.matcher.impl to therapi.runtime.javadoc, org.scijava;
-	opens org.scijava.ops.copy to therapi.runtime.javadoc;
-	opens org.scijava.ops.hint to therapi.runtime.javadoc;
-	opens org.scijava.ops.adapt.complexLift to therapi.runtime.javadoc;
-	opens org.scijava.ops.math to therapi.runtime.javadoc;
-	opens org.scijava.ops.adapt.lift to therapi.runtime.javadoc;
-	opens org.scijava.ops.create to therapi.runtime.javadoc;
-	opens org.scijava.ops.impl to therapi.runtime.javadoc, org.scijava;
-	opens org.scijava.ops.monitor to therapi.runtime.javadoc;
-	opens org.scijava.ops.adapt.functional to therapi.runtime.javadoc;
-	opens org.scijava.ops to therapi.runtime.javadoc, org.scijava;
-	opens org.scijava.ops.util to therapi.runtime.javadoc;
-	opens org.scijava.ops.matcher to therapi.runtime.javadoc;
-	opens org.scijava.ops.struct to therapi.runtime.javadoc;
-	opens org.scijava.ops.simplify to therapi.runtime.javadoc;
-	opens org.scijava.ops.stats to therapi.runtime.javadoc;
-
-	// FIXME: This is a file name and is thus unstable
-	requires geantyref;
-
-	requires java.desktop;
-
-	requires org.scijava;
-	requires org.scijava.function;
-	requires org.scijava.struct;
-	requires org.scijava.ops.api;
-	requires org.scijava.ops.discovery;
-	requires org.scijava.types;
-	requires javassist;
-	requires java.compiler;
-	requires therapi.runtime.javadoc;
-
-	uses javax.annotation.processing.Processor;
-}
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.list b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.list
deleted file mode 100644
index 0aec8c9c2..000000000
--- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.list
+++ /dev/null
@@ -1,4 +0,0 @@
-.include templates/main/java/org/scijava/ops/util/Globals.list
-arities = (1..maxArity).collect()
-
-[FunctionsToComputers.java]

From ddc7ce2eb2e6fe1efe9bd42a9768b4117a7d5f0b Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Mon, 26 Jul 2021 09:23:31 -0500
Subject: [PATCH 82/91] Rename scijava-ops-api -> scijava-ops-spi

This is much closer to the actual spirit of the project. We are
declaring a set of service annotations/classes that the user may wish to
declare
---
 .../src/main/java/module-info.java            |  2 +-
 .../java/net/imagej/ops2/coloc/icq/LiICQ.java |  5 ++---
 .../coloc/kendallTau/KendallTauBRank.java     |  2 +-
 .../ops2/coloc/maxTKendallTau/MTKT.java       |  5 ++---
 .../ops2/coloc/pValue/DefaultPValue.java      |  5 ++---
 .../ops2/coloc/pearsons/DefaultPearsons.java  |  2 +-
 .../net/imagej/ops2/convert/ConvertTypes.java |  6 ++----
 .../net/imagej/ops2/convert/Converters.java   |  6 ++----
 .../ops2/convert/clip/ClipRealTypes.java      |  2 +-
 .../ops2/convert/copy/CopyRealTypes.java      |  2 +-
 .../net/imagej/ops2/copy/CopyArrayImg.java    |  5 ++---
 .../java/net/imagej/ops2/copy/CopyII.java     |  4 ++--
 .../java/net/imagej/ops2/copy/CopyImg.java    |  5 ++---
 .../net/imagej/ops2/copy/CopyImgLabeling.java |  5 ++---
 .../imagej/ops2/copy/CopyLabelingMapping.java |  2 +-
 .../java/net/imagej/ops2/copy/CopyRAI.java    |  5 ++---
 .../java/net/imagej/ops2/copy/CopyType.java   |  2 +-
 .../net/imagej/ops2/create/CreateTypes.java   |  6 ++----
 .../java/net/imagej/ops2/create/Creators.java |  6 ++----
 .../deconvolve/NonCirculantFirstGuess.java    |  5 ++---
 .../NonCirculantNormalizationFactor.java      |  5 ++---
 .../ops2/deconvolve/RichardsonLucyC.java      |  5 ++---
 .../deconvolve/RichardsonLucyCorrection.java  |  5 ++---
 .../ops2/deconvolve/RichardsonLucyF.java      |  5 ++---
 .../ops2/deconvolve/RichardsonLucyTVF.java    |  5 ++---
 .../deconvolve/RichardsonLucyTVUpdate.java    |  5 ++---
 .../ops2/deconvolve/RichardsonLucyUpdate.java |  5 ++---
 .../accelerate/VectorAccelerator.java         |  4 ++--
 .../net/imagej/ops2/eval/DefaultEval.java     |  2 +-
 .../net/imagej/ops2/eval/OpEvaluator.java     |  2 +-
 .../haralick/AbstractHaralickFeature.java     |  3 +--
 .../ops2/features/haralick/DefaultASM.java    |  2 +-
 .../haralick/DefaultClusterPromenence.java    |  5 ++---
 .../haralick/DefaultClusterShade.java         |  5 ++---
 .../features/haralick/DefaultContrast.java    |  5 ++---
 .../features/haralick/DefaultCorrelation.java |  5 ++---
 .../haralick/DefaultDifferenceEntropy.java    |  5 ++---
 .../haralick/DefaultDifferenceVariance.java   |  5 ++---
 .../features/haralick/DefaultEntropy.java     |  2 +-
 .../ops2/features/haralick/DefaultICM1.java   |  5 ++---
 .../ops2/features/haralick/DefaultICM2.java   |  5 ++---
 .../ops2/features/haralick/DefaultIFDM.java   |  2 +-
 .../haralick/DefaultMaxProbability.java       |  2 +-
 .../features/haralick/DefaultSumAverage.java  |  5 ++---
 .../features/haralick/DefaultSumEntropy.java  |  5 ++---
 .../features/haralick/DefaultSumVariance.java |  5 ++---
 .../haralick/DefaultTextureHomogeneity.java   |  2 +-
 .../features/haralick/DefaultVariance.java    |  2 +-
 .../features/haralick/helper/CoocHXY.java     |  5 ++---
 .../features/haralick/helper/CoocMeanX.java   |  5 ++---
 .../features/haralick/helper/CoocMeanY.java   |  5 ++---
 .../ops2/features/haralick/helper/CoocPX.java |  2 +-
 .../haralick/helper/CoocPXMinusY.java         |  2 +-
 .../features/haralick/helper/CoocPXPlusY.java |  2 +-
 .../ops2/features/haralick/helper/CoocPY.java |  2 +-
 .../features/haralick/helper/CoocStdX.java    |  5 ++---
 .../features/haralick/helper/CoocStdY.java    |  5 ++---
 .../hog/HistogramOfOrientedGradients2D.java   |  5 ++---
 .../ops2/features/lbp2d/DefaultLBP2D.java     |  5 ++---
 .../tamura2d/DefaultCoarsenessFeature.java    |  5 ++---
 .../tamura2d/DefaultContrastFeature.java      |  5 ++---
 .../DefaultDirectionalityFeature.java         |  5 ++---
 .../zernike/DefaultMagnitudeFeature.java      |  5 ++---
 .../features/zernike/DefaultPhaseFeature.java |  5 ++---
 .../features/zernike/ZernikeComputer.java     |  2 +-
 .../filter/FFTMethodsLinearFFTFilterC.java    |  5 ++---
 .../ops2/filter/addNoise/NoiseAdders.java     |  6 ++----
 .../filter/bilateral/DefaultBilateral.java    |  2 +-
 .../ops2/filter/convolve/ConvolveFFTC.java    |  5 ++---
 .../ops2/filter/convolve/ConvolveFFTF.java    |  5 ++---
 .../ops2/filter/convolve/ConvolveNaiveC.java  |  2 +-
 .../ops2/filter/convolve/ConvolveNaiveF.java  |  5 ++---
 .../ops2/filter/correlate/CorrelateFFTC.java  |  5 ++---
 .../ops2/filter/correlate/CorrelateFFTF.java  |  5 ++---
 .../derivative/PartialDerivativeRAI.java      |  5 ++---
 .../derivative/PartialDerivativesRAI.java     |  5 ++---
 .../DefaultDerivativeGauss.java               |  5 ++---
 .../imagej/ops2/filter/dog/DefaultDoG.java    |  5 ++---
 .../ops2/filter/dog/DoGVaryingSigmas.java     |  5 ++---
 .../filter/fft/CreateOutputFFTMethods.java    |  5 ++---
 .../imagej/ops2/filter/fft/FFTMethodsOpC.java |  2 +-
 .../imagej/ops2/filter/fft/FFTMethodsOpF.java |  5 ++---
 .../filter/fftSize/ComputeFFTMethodsSize.java |  2 +-
 .../ops2/filter/fftSize/ComputeFFTSize.java   |  2 +-
 .../filter/fftSize/DefaultComputeFFTSize.java |  2 +-
 .../imagej/ops2/filter/gauss/Gaussians.java   |  6 ++----
 .../ops2/filter/hessian/HessianRAI.java       |  5 ++---
 .../ops2/filter/ifft/IFFTMethodsOpC.java      |  5 ++---
 .../ops2/filter/ifft/IFFTMethodsOpI.java      |  2 +-
 .../ops2/filter/max/DefaultMaxFilter.java     |  5 ++---
 .../ops2/filter/mean/DefaultMeanFilter.java   |  5 ++---
 .../filter/median/DefaultMedianFilter.java    |  5 ++---
 .../ops2/filter/min/DefaultMinFilter.java     |  5 ++---
 .../ops2/filter/pad/DefaultPadInputFFT.java   |  5 ++---
 .../filter/pad/DefaultPadShiftKernelFFT.java  |  5 ++---
 .../net/imagej/ops2/filter/pad/PadInput.java  |  5 ++---
 .../imagej/ops2/filter/pad/PadInputFFT.java   |  3 +--
 .../ops2/filter/pad/PadInputFFTMethods.java   |  5 ++---
 .../ops2/filter/pad/PadShiftKernel.java       |  5 ++---
 .../filter/pad/PadShiftKernelFFTMethods.java  |  5 ++---
 .../filter/pad/PaddingIntervalCentered.java   |  2 +-
 .../filter/pad/PaddingIntervalOrigin.java     |  2 +-
 .../ops2/filter/sigma/DefaultSigmaFilter.java |  5 ++---
 .../imagej/ops2/filter/sobel/SobelRAI.java    |  5 ++---
 .../ops2/filter/tubeness/DefaultTubeness.java |  5 ++---
 .../variance/DefaultVarianceFilter.java       |  5 ++---
 .../ops2/filter/vesselness/DefaultFrangi.java |  2 +-
 .../geom/AbstractBoundarySizeConvexHull.java  |  3 +--
 .../imagej/ops2/geom/AbstractBoxivity.java    |  3 +--
 .../imagej/ops2/geom/AbstractConvexity.java   |  3 +--
 .../ops2/geom/AbstractSizeConvexHull.java     |  3 +--
 .../imagej/ops2/geom/AbstractSolidity.java    |  3 +--
 .../java/net/imagej/ops2/geom/CentroidII.java |  2 +-
 .../imagej/ops2/geom/CentroidLabelRegion.java |  2 +-
 .../net/imagej/ops2/geom/CentroidMesh.java    |  5 ++---
 .../net/imagej/ops2/geom/CentroidPolygon.java |  5 ++---
 .../ops2/geom/DefaultCenterOfGravity.java     |  2 +-
 .../java/net/imagej/ops2/geom/SizeII.java     |  2 +-
 .../DefaultBoundarySizeConvexHullPolygon.java |  2 +-
 .../ops2/geom/geom2d/DefaultBoundingBox.java  |  2 +-
 .../geom/geom2d/DefaultBoxivityPolygon.java   |  2 +-
 .../ops2/geom/geom2d/DefaultCircularity.java  |  5 ++---
 .../ops2/geom/geom2d/DefaultContour.java      |  2 +-
 .../ops2/geom/geom2d/DefaultConvexHull2D.java |  2 +-
 .../geom/geom2d/DefaultConvexityPolygon.java  |  2 +-
 .../ops2/geom/geom2d/DefaultEccentricity.java |  5 ++---
 .../ops2/geom/geom2d/DefaultElongation.java   |  5 ++---
 .../ops2/geom/geom2d/DefaultFeretsAngle.java  |  2 +-
 .../geom/geom2d/DefaultFeretsDiameter.java    |  2 +-
 .../geom2d/DefaultFeretsDiameterForAngle.java |  5 ++---
 .../ops2/geom/geom2d/DefaultMajorAxis.java    |  5 ++---
 .../ops2/geom/geom2d/DefaultMaximumFeret.java |  5 ++---
 .../geom/geom2d/DefaultMaximumFeretAngle.java |  5 ++---
 .../geom2d/DefaultMaximumFeretDiameter.java   |  5 ++---
 .../ops2/geom/geom2d/DefaultMinimumFeret.java |  5 ++---
 .../geom/geom2d/DefaultMinimumFeretAngle.java |  5 ++---
 .../geom2d/DefaultMinimumFeretDiameter.java   |  5 ++---
 .../ops2/geom/geom2d/DefaultMinorAxis.java    |  5 ++---
 .../geom/geom2d/DefaultMinorMajorAxis.java    |  2 +-
 .../geom/geom2d/DefaultPerimeterLength.java   |  2 +-
 .../ops2/geom/geom2d/DefaultRoundness.java    |  5 ++---
 .../geom2d/DefaultSizeConvexHullPolygon.java  |  2 +-
 .../ops2/geom/geom2d/DefaultSizePolygon.java  |  2 +-
 .../DefaultSmallestEnclosingRectangle.java    |  5 ++---
 .../geom/geom2d/DefaultSolidityPolygon.java   |  2 +-
 ...DefaultVerticesCountConvexHullPolygon.java |  5 ++---
 .../geom2d/DefaultVerticesCountPolygon.java   |  2 +-
 .../ops2/geom/geom3d/DefaultBoxivityMesh.java |  2 +-
 .../ops2/geom/geom3d/DefaultCompactness.java  |  5 ++---
 .../ops2/geom/geom3d/DefaultConvexHull3D.java |  2 +-
 .../geom/geom3d/DefaultConvexityMesh.java     |  2 +-
 .../geom/geom3d/DefaultInertiaTensor3D.java   |  5 ++---
 .../geom3d/DefaultInertiaTensor3DMesh.java    |  5 ++---
 .../geom/geom3d/DefaultMainElongation.java    |  5 ++---
 .../geom/geom3d/DefaultMarchingCubes.java     |  5 ++---
 .../geom/geom3d/DefaultMedianElongation.java  |  5 ++---
 .../ops2/geom/geom3d/DefaultSolidityMesh.java |  2 +-
 .../geom/geom3d/DefaultSparenessMesh.java     |  5 ++---
 .../ops2/geom/geom3d/DefaultSphericity.java   |  5 ++---
 .../ops2/geom/geom3d/DefaultSurfaceArea.java  |  2 +-
 .../DefaultSurfaceAreaConvexHullMesh.java     |  2 +-
 .../DefaultVerticesCountConvexHullMesh.java   |  5 ++---
 .../geom/geom3d/DefaultVerticesCountMesh.java |  2 +-
 .../geom3d/DefaultVolumeConvexHullMesh.java   |  2 +-
 .../ops2/geom/geom3d/DefaultVolumeMesh.java   |  2 +-
 .../geom/geom3d/DefaultVoxelization3D.java    |  5 ++---
 .../net/imagej/ops2/help/HelpForName.java     |  2 +-
 .../imagej/ops2/identity/DefaultIdentity.java |  2 +-
 .../imagej/ops2/image/ascii/DefaultASCII.java |  5 ++---
 .../CooccurrenceMatrix.java                   |  5 ++---
 .../CalibratedDistanceTransformer.java        |  2 +-
 .../DefaultDistanceTransformCalibration.java  |  2 +-
 .../DistanceTransformer.java                  |  2 +-
 .../equation/DefaultCoordinatesEquation.java  |  2 +-
 .../ops2/image/equation/DefaultEquation.java  |  2 +-
 .../imagej/ops2/image/fill/DefaultFill.java   |  2 +-
 .../net/imagej/ops2/image/fill/FillRAI.java   |  2 +-
 .../ops2/image/histogram/HistogramCreate.java |  5 ++---
 .../image/integral/AbstractIntegralImg.java   |  3 +--
 .../image/integral/DefaultIntegralImg.java    |  2 +-
 .../image/integral/SquareIntegralImg.java     |  2 +-
 .../image/integral/WrappedIntegralImg.java    |  2 +-
 .../imagej/ops2/image/invert/InvertII.java    |  4 ++--
 .../ops2/image/invert/InvertIIInteger.java    |  4 ++--
 .../imagej/ops2/image/invert/Inverters.java   |  6 ++----
 .../image/normalize/NormalizeIIComputer.java  |  5 ++---
 .../image/normalize/NormalizeIIFunction.java  |  5 ++---
 .../ops2/image/normalize/NormalizeIILazy.java |  5 ++---
 .../normalize/NormalizeIILazyFunction.java    |  5 ++---
 .../ops2/image/watershed/Watershed.java       |  5 ++---
 .../ops2/image/watershed/WatershedBinary.java |  5 ++---
 .../watershed/WatershedBinarySingleSigma.java |  5 ++---
 .../ops2/image/watershed/WatershedSeeded.java |  5 ++---
 .../DefaultCentralMoment00.java               |  5 ++---
 .../DefaultCentralMoment01.java               |  2 +-
 .../DefaultCentralMoment02.java               |  5 ++---
 .../DefaultCentralMoment03.java               |  5 ++---
 .../DefaultCentralMoment10.java               |  2 +-
 .../DefaultCentralMoment11.java               |  5 ++---
 .../DefaultCentralMoment12.java               |  5 ++---
 .../DefaultCentralMoment20.java               |  5 ++---
 .../DefaultCentralMoment21.java               |  5 ++---
 .../DefaultCentralMoment30.java               |  5 ++---
 .../IterableCentralMoment00.java              |  2 +-
 .../IterableCentralMoment11.java              |  2 +-
 .../imagemoments/hu/DefaultHuMoment1.java     |  5 ++---
 .../imagemoments/hu/DefaultHuMoment2.java     |  5 ++---
 .../imagemoments/hu/DefaultHuMoment3.java     |  5 ++---
 .../imagemoments/hu/DefaultHuMoment4.java     |  5 ++---
 .../imagemoments/hu/DefaultHuMoment5.java     |  5 ++---
 .../imagemoments/hu/DefaultHuMoment6.java     |  5 ++---
 .../imagemoments/hu/DefaultHuMoment7.java     |  5 ++---
 .../imagemoments/moments/DefaultMoment00.java |  2 +-
 .../imagemoments/moments/DefaultMoment01.java |  2 +-
 .../imagemoments/moments/DefaultMoment10.java |  2 +-
 .../imagemoments/moments/DefaultMoment11.java |  2 +-
 .../DefaultNormalizedCentralMoment02.java     |  5 ++---
 .../DefaultNormalizedCentralMoment03.java     |  5 ++---
 .../DefaultNormalizedCentralMoment11.java     |  5 ++---
 .../DefaultNormalizedCentralMoment12.java     |  5 ++---
 .../DefaultNormalizedCentralMoment20.java     |  5 ++---
 .../DefaultNormalizedCentralMoment21.java     |  5 ++---
 .../DefaultNormalizedCentralMoment30.java     |  5 ++---
 .../imagej/ops2/labeling/MergeLabeling.java   |  5 ++---
 .../imagej/ops2/labeling/cca/DefaultCCA.java  |  5 ++---
 .../imagej/ops2/linalg/rotate/Rotations.java  |  6 ++----
 .../imagej/ops2/logic/BooleanTypeLogic.java   |  6 ++----
 .../java/net/imagej/ops2/logic/Default.java   |  2 +-
 .../java/net/imagej/ops2/logic/Ternary.java   |  2 +-
 .../neighborhood/DefaultMapNeighborhood.java  |  2 +-
 .../MapNeighborhoodWithCenter.java            |  2 +-
 .../ops2/math/BinaryNumericTypeMath.java      |  6 ++----
 .../imagej/ops2/math/BinaryRealTypeMath.java  |  6 ++----
 .../ops2/math/NullaryNumericTypeMath.java     |  6 ++----
 .../imagej/ops2/math/UnaryRealTypeMath.java   |  6 ++----
 .../multiply/ComplexConjugateMultiplyOp.java  |  2 +-
 .../imagej/ops2/morphology/BlackTopHats.java  |  6 ++----
 .../net/imagej/ops2/morphology/Closes.java    |  6 ++----
 .../net/imagej/ops2/morphology/Dilations.java |  6 ++----
 .../ops2/morphology/DistanceTransforms.java   |  6 ++----
 .../net/imagej/ops2/morphology/Erosions.java  |  6 ++----
 .../imagej/ops2/morphology/ExtractHoles.java  |  5 ++---
 .../net/imagej/ops2/morphology/FillHoles.java |  5 ++---
 .../imagej/ops2/morphology/FloodFills.java    |  6 ++----
 .../net/imagej/ops2/morphology/Opens.java     |  6 ++----
 .../net/imagej/ops2/morphology/Outline.java   |  2 +-
 .../net/imagej/ops2/morphology/Table2Ds.java  |  6 ++----
 .../imagej/ops2/morphology/WhiteTopHats.java  |  6 ++----
 .../ops2/morphology/thin/AbstractThin.java    |  3 +--
 .../ops2/morphology/thin/ThinGuoHall.java     |  2 +-
 .../ops2/morphology/thin/ThinHilditch.java    |  2 +-
 .../morphology/thin/ThinMorphological.java    |  2 +-
 .../ops2/morphology/thin/ThinZhangSuen.java   |  2 +-
 .../ops2/project/DefaultProjectParallel.java  |  2 +-
 .../project/ProjectRAIToIterableInterval.java |  2 +-
 .../DefaultDetectJunctions.java               |  5 ++---
 .../detectRidges/DefaultDetectRidges.java     |  5 ++---
 .../net/imagej/ops2/slice/SliceRAI2RAI.java   |  2 +-
 .../ops2/stats/DefaultGeometricMean.java      |  5 ++---
 .../ops2/stats/DefaultHarmonicMean.java       |  5 ++---
 .../imagej/ops2/stats/DefaultKurtosis.java    |  5 ++---
 .../net/imagej/ops2/stats/DefaultMax.java     |  5 ++---
 .../net/imagej/ops2/stats/DefaultMean.java    |  5 ++---
 .../net/imagej/ops2/stats/DefaultMedian.java  |  5 ++---
 .../net/imagej/ops2/stats/DefaultMin.java     |  5 ++---
 .../net/imagej/ops2/stats/DefaultMinMax.java  |  2 +-
 .../ops2/stats/DefaultMoment1AboutMean.java   |  5 ++---
 .../ops2/stats/DefaultMoment2AboutMean.java   |  5 ++---
 .../ops2/stats/DefaultMoment3AboutMean.java   |  5 ++---
 .../ops2/stats/DefaultMoment4AboutMean.java   |  5 ++---
 .../ops2/stats/DefaultMomentNAboutMean.java   |  5 ++---
 .../imagej/ops2/stats/DefaultPercentile.java  |  5 ++---
 .../imagej/ops2/stats/DefaultQuantile.java    |  2 +-
 .../net/imagej/ops2/stats/DefaultSize.java    |  2 +-
 .../imagej/ops2/stats/DefaultSkewness.java    |  5 ++---
 .../ops2/stats/DefaultStandardDeviation.java  |  5 ++---
 .../net/imagej/ops2/stats/DefaultSum.java     |  2 +-
 .../ops2/stats/DefaultSumOfInverses.java      |  5 ++---
 .../imagej/ops2/stats/DefaultSumOfLogs.java   |  5 ++---
 .../ops2/stats/DefaultSumOfSquares.java       |  5 ++---
 .../imagej/ops2/stats/DefaultVariance.java    |  5 ++---
 .../net/imagej/ops2/stats/IntegralMean.java   |  2 +-
 .../net/imagej/ops2/stats/IntegralSum.java    |  2 +-
 .../imagej/ops2/stats/IntegralVariance.java   |  2 +-
 .../ops2/stats/IterableGeometricMean.java     |  2 +-
 .../ops2/stats/IterableHarmonicMean.java      |  2 +-
 .../net/imagej/ops2/stats/IterableMax.java    |  2 +-
 .../net/imagej/ops2/stats/IterableMean.java   |  2 +-
 .../net/imagej/ops2/stats/IterableMin.java    |  2 +-
 .../net/imagej/ops2/stats/IterableMinMax.java |  2 +-
 .../ops2/stats/IterableMoment3AboutMean.java  |  5 ++---
 .../ops2/stats/IterableMoment4AboutMean.java  |  5 ++---
 .../net/imagej/ops2/stats/IterableSize.java   |  2 +-
 .../ops2/stats/IterableStandardDeviation.java |  2 +-
 .../net/imagej/ops2/stats/IterableSum.java    |  2 +-
 .../ops2/stats/IterableSumOfInverses.java     |  2 +-
 .../imagej/ops2/stats/IterableSumOfLogs.java  |  2 +-
 .../ops2/stats/IterableSumOfSquares.java      |  2 +-
 .../imagej/ops2/stats/IterableVariance.java   |  2 +-
 .../regression/leastSquares/Quadric.java      |  2 +-
 .../thread/chunker/ChunkerInterleaved.java    |  2 +-
 .../ops2/thread/chunker/DefaultChunker.java   |  2 +-
 .../threshold/AbstractApplyThresholdImg.java  |  3 +--
 .../AbstractApplyThresholdIterable.java       |  3 +--
 .../ApplyLocalThresholdIntegral.java          |  3 +--
 .../ops2/threshold/ApplyThresholdMethod.java  |  5 ++---
 .../threshold/ApplyThresholdMethodLocal.java  |  5 ++---
 .../apply/ApplyConstantThreshold.java         |  5 ++---
 .../apply/ApplyThresholdComparable.java       |  2 +-
 .../apply/ApplyThresholdComparator.java       |  2 +-
 .../huang/ComputeHuangThreshold.java          |  2 +-
 .../threshold/ij1/ComputeIJ1Threshold.java    |  2 +-
 .../ComputeIntermodesThreshold.java           |  2 +-
 .../isoData/ComputeIsoDataThreshold.java      |  2 +-
 .../ops2/threshold/li/ComputeLiThreshold.java |  2 +-
 .../ComputeLocalBernsenThreshold.java         |  5 ++---
 .../localBernsen/LocalBernsenThreshold.java   |  5 ++---
 .../ComputeLocalContrastThreshold.java        |  5 ++---
 .../localContrast/LocalContrastThreshold.java |  5 ++---
 .../localMean/ComputeLocalMeanThreshold.java  |  5 ++---
 .../ComputeLocalMeanThresholdIntegral.java    |  5 ++---
 .../localMean/LocalMeanThreshold.java         |  5 ++---
 .../ComputeLocalMedianThreshold.java          |  5 ++---
 .../localMedian/LocalMedianThreshold.java     |  5 ++---
 .../ComputeLocalMidGreyThreshold.java         |  5 ++---
 .../localMidGrey/LocalMidGreyThreshold.java   |  5 ++---
 .../ComputeLocalNiblackThreshold.java         |  5 ++---
 .../ComputeLocalNiblackThresholdIntegral.java |  5 ++---
 .../localNiblack/LocalNiblackThreshold.java   |  5 ++---
 .../ComputeLocalPhansalkarThreshold.java      |  5 ++---
 ...mputeLocalPhansalkarThresholdIntegral.java |  5 ++---
 .../LocalPhansalkarThreshold.java             |  5 ++---
 .../ComputeLocalSauvolaThreshold.java         |  5 ++---
 .../ComputeLocalSauvolaThresholdIntegral.java |  5 ++---
 .../localSauvola/LocalSauvolaThreshold.java   |  5 ++---
 .../ComputeMaxEntropyThreshold.java           |  2 +-
 .../ComputeMaxLikelihoodThreshold.java        |  2 +-
 .../threshold/mean/ComputeMeanThreshold.java  |  2 +-
 .../minError/ComputeMinErrorThreshold.java    |  2 +-
 .../minimum/ComputeMinimumThreshold.java      |  2 +-
 .../moments/ComputeMomentsThreshold.java      |  2 +-
 .../threshold/otsu/ComputeOtsuThreshold.java  |  2 +-
 .../ComputePercentileThreshold.java           |  2 +-
 .../ComputeRenyiEntropyThreshold.java         |  2 +-
 .../rosin/ComputeRosinThreshold.java          |  2 +-
 .../shanbhag/ComputeShanbhagThreshold.java    |  2 +-
 .../triangle/ComputeTriangleThreshold.java    |  2 +-
 .../threshold/yen/ComputeYenThreshold.java    |  2 +-
 .../net/imagej/ops2/topology/BoxCount.java    |  2 +-
 .../EulerCharacteristic26N.java               |  2 +-
 .../EulerCharacteristic26NFloating.java       |  2 +-
 .../eulerCharacteristic/EulerCorrection.java  |  2 +-
 .../net/imagej/ops2/transform/Transforms.java |  8 +++-----
 .../ops2/types/adapt/LiftComputersToRAI.java  |  6 ++----
 .../ops2/types/adapt/LiftFunctionsToRAI.java  |  6 ++----
 .../imagej/ops2/types/adapt/RAIToIIOps.java   |  6 ++----
 .../types/maxValue/MaxValueRealTypes.java     |  6 ++----
 .../types/minValue/MinValueRealTypes.java     |  6 ++----
 .../java/net/imagej/ops2/AbstractOpTest.java  |  2 +-
 .../java/net/imagej/ops2/slice/SliceTest.java |  3 +--
 .../imagej/ops2/types/TypeExtractorTests.java |  6 ++----
 .../types/adapt/LiftComputersToRAITest.java   |  6 ++----
 .../types/adapt/LiftFunctionsToRAITest.java   |  6 ++----
 scijava/scijava-ops-api/pom.xml               | 20 +++++++++----------
 .../src/main/java/module-info.java            |  4 ++--
 .../java/org/scijava/ops/{api => spi}/Op.java |  2 +-
 .../ops/{api => spi}/OpCollection.java        |  2 +-
 .../ops/{api => spi}/OpDependency.java        |  2 +-
 .../org/scijava/ops/{api => spi}/OpField.java |  2 +-
 .../scijava/ops/{api => spi}/OpMethod.java    |  2 +-
 scijava/scijava-ops-engine/pom.xml            |  2 +-
 .../src/main/java/module-info.java            |  2 +-
 .../engine/AnnotatedOpDependencyMember.java   |  2 +-
 .../ops/engine/FieldOpDependencyMember.java   |  2 +-
 .../MethodParameterOpDependencyMember.java    |  2 +-
 .../scijava/ops/engine/OpDependencies.java    |  2 +-
 .../ComputersToFunctionsAndLift.java          |  6 +++---
 .../FunctionsToComputersAndLift.java          |  6 +++---
 .../ComputersToFunctionsViaFunction.java      |  6 +++---
 .../ComputersToFunctionsViaSource.java        |  6 +++---
 .../functional/FunctionsToComputers.java      |  6 +++---
 .../adapt/functional/InplacesToFunctions.java | 10 +++++-----
 .../engine/adapt/lift/ComputerToArrays.java   |  8 ++++----
 .../adapt/lift/ComputerToIterables.java       |  8 ++++----
 .../engine/adapt/lift/FunctionToArrays.java   |  8 ++++----
 .../adapt/lift/FunctionToIterables.java       |  8 ++++----
 .../engine/adapt/lift/InplaceToArrays.java    |  8 ++++----
 .../conversionLoss/IdentityLossReporter.java  |  2 +-
 .../PrimitiveArrayLossReporters.java          |  6 ++----
 .../PrimitiveLossReporters.java               |  6 ++----
 .../ops/engine/copy/CopyOpCollection.java     |  6 ++----
 .../ops/engine/create/CreateOpCollection.java |  6 ++----
 .../ops/engine/impl/DefaultOpEnvironment.java |  4 ++--
 .../ops/engine/impl/DefaultOpHistory.java     |  2 +-
 .../impl/PluginBasedClassOpInfoGenerator.java |  2 +-
 .../PluginBasedOpCollectionInfoGenerator.java |  6 +++---
 .../ops/engine/matcher/impl/DefaultOpRef.java |  2 +-
 .../ops/engine/matcher/impl/OpFieldInfo.java  |  3 +--
 .../ops/engine/matcher/impl/OpMethodInfo.java |  6 ++----
 .../java/org/scijava/ops/engine/math/Add.java |  6 ++----
 .../ops/engine/math/MathOpCollection.java     |  6 ++----
 .../scijava/ops/engine/math/Normalize.java    |  2 +-
 .../org/scijava/ops/engine/math/Power.java    |  6 ++----
 .../org/scijava/ops/engine/math/Sqrt.java     |  6 ++----
 .../org/scijava/ops/engine/math/Zero.java     |  6 ++----
 .../scijava/ops/engine/simplify/Identity.java |  2 +-
 .../simplify/PrimitiveArraySimplifiers.java   |  6 ++----
 .../simplify/PrimitiveListSimplifier.java     |  2 +-
 .../engine/simplify/PrimitiveSimplifiers.java |  6 ++----
 .../ops/engine/simplify/SimplifiedOpInfo.java |  2 +-
 .../org/scijava/ops/engine/stats/Mean.java    |  5 ++---
 .../org/scijava/ops/engine/stats/Size.java    |  2 +-
 .../struct/ClassOpDependencyMemberParser.java |  3 +--
 .../engine/struct/JavadocParameterData.java   |  3 +--
 .../MethodOpDependencyMemberParser.java       |  2 +-
 .../struct/MethodParameterMemberParser.java   |  3 +--
 .../org/scijava/ops/engine/util/Adapt.java    |  2 +-
 .../ops/engine/util/OpMethodUtils.java        |  3 +--
 .../ops/engine/JavadocParameterTest.java      | 10 +++++-----
 .../ops/engine/OpBuilderNoOutputTest.java     |  6 ++----
 .../scijava/ops/engine/OpBuilderTestOps.java  |  8 ++++----
 .../OpMethodDependencyPositionTest.java       |  8 ++++----
 .../org/scijava/ops/engine/OpMethodTest.java  |  4 ++--
 .../scijava/ops/engine/OpMethodTestOps.java   |  8 ++++----
 .../scijava/ops/engine/OpPriorityTest.java    |  2 +-
 .../java/org/scijava/ops/engine/TestOps.java  |  2 +-
 .../adapt/OpAdaptationPriorityTest.java       |  6 ++----
 .../ComputerToFunctionAdaptTestOps.java       |  8 ++++----
 .../FunctionToComputerAdaptTestOps.java       |  8 ++++----
 .../adapt/lift/ComputerToArraysTest.java      |  4 ++--
 .../adapt/lift/FunctionToArraysTest.java      |  8 ++++----
 .../adapt/lift/InplaceToArraysTest.java       |  4 ++--
 .../ops/engine/hints/AdaptationHintTest.java  |  6 ++----
 .../engine/hints/SimplificationHintTest.java  |  6 ++----
 .../ops/engine/impl/OpCachingTest.java        |  8 ++++----
 .../ops/engine/impl/ProvenanceTest.java       |  8 ++++----
 .../matcher/DefaultMatchingErrorTest.java     |  8 ++++----
 .../engine/matcher/MatchingWithAnyTest.java   |  2 +-
 .../engine/matcher/MatchingWithGCSTTest.java  |  6 ++----
 .../ops/engine/monitor/OpMonitorTest.java     |  2 +-
 .../SimplificationAdaptationTest.java         |  6 ++----
 .../simplify/SimplificationPriorityTest.java  |  6 ++----
 .../ops/engine/simplify/SimplifyIOTest.java   |  6 ++----
 .../ops/engine/simplify/SimplifyTest.java     |  6 ++----
 .../ops/engine/util/OpsAsParametersTest.java  |  8 +++-----
 .../templates/main/java/module-info.vm        |  2 +-
 .../ComputersToFunctionsAndLift.vm            |  6 +++---
 .../FunctionsToComputersAndLift.vm            |  6 +++---
 .../ComputersToFunctionsViaFunction.vm        |  6 +++---
 .../ComputersToFunctionsViaSource.vm          |  6 +++---
 .../adapt/functional/FunctionsToComputers.vm  |  6 +++---
 .../adapt/functional/InplacesToFunctions.vm   | 10 +++++-----
 .../ops/engine/adapt/lift/ComputerToArrays.vm |  8 ++++----
 .../engine/adapt/lift/ComputerToIterables.vm  |  8 ++++----
 .../ops/engine/adapt/lift/FunctionToArrays.vm |  8 ++++----
 .../engine/adapt/lift/FunctionToIterables.vm  |  8 ++++----
 .../ops/engine/adapt/lift/InplaceToArrays.vm  |  8 ++++----
 .../scijava/ops/engine/OpBuilderTestOps.vm    |  8 ++++----
 .../org/scijava/ops/engine/OpMethodTest.vm    |  4 ++--
 .../org/scijava/ops/engine/OpMethodTestOps.vm |  8 ++++----
 .../ComputerToFunctionAdaptTestOps.vm         |  8 ++++----
 .../FunctionToComputerAdaptTestOps.vm         |  8 ++++----
 .../engine/adapt/lift/ComputerToArraysTest.vm |  4 ++--
 .../engine/adapt/lift/FunctionToArraysTest.vm |  8 ++++----
 .../engine/adapt/lift/InplaceToArraysTest.vm  |  4 ++--
 465 files changed, 825 insertions(+), 1127 deletions(-)
 rename scijava/scijava-ops-api/src/main/java/org/scijava/ops/{api => spi}/Op.java (79%)
 rename scijava/scijava-ops-api/src/main/java/org/scijava/ops/{api => spi}/OpCollection.java (86%)
 rename scijava/scijava-ops-api/src/main/java/org/scijava/ops/{api => spi}/OpDependency.java (94%)
 rename scijava/scijava-ops-api/src/main/java/org/scijava/ops/{api => spi}/OpField.java (95%)
 rename scijava/scijava-ops-api/src/main/java/org/scijava/ops/{api => spi}/OpMethod.java (95%)

diff --git a/imagej/imagej-ops2/src/main/java/module-info.java b/imagej/imagej-ops2/src/main/java/module-info.java
index 62479af5f..6a6607470 100644
--- a/imagej/imagej-ops2/src/main/java/module-info.java
+++ b/imagej/imagej-ops2/src/main/java/module-info.java
@@ -136,6 +136,6 @@
 	requires imglib2.algorithm.fft;
 	requires mines.jtk;
 	requires org.scijava.function;
-	requires org.scijava.ops.api;
+	requires org.scijava.ops.spi;
 
 }
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java
index 375a72498..432a4a14d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java
@@ -38,9 +38,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java
index f0a2c0d26..feabd2a6e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java
@@ -38,7 +38,7 @@
 import net.imglib2.util.IterablePair;
 import net.imglib2.util.Pair;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java
index 484b0b05a..bffdc2a8c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java
@@ -49,9 +49,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 import org.scijava.util.IntArray;
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java
index 07c74f9d1..cd91e8f9a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java
@@ -48,9 +48,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java
index d4c211451..721c851f3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java
@@ -35,7 +35,7 @@
 import net.imglib2.util.IterablePair;
 import net.imglib2.util.Pair;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java
index 2c8e07b44..c5927c551 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java
@@ -52,10 +52,8 @@
 import net.imglib2.type.numeric.real.FloatType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java
index f6539e34f..19f5f8e75 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java
@@ -6,10 +6,8 @@
 import net.imglib2.type.Type;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java
index 78a12381e..88354ef31 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java
@@ -32,7 +32,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java
index 122effeb7..0185f6300 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java
@@ -32,7 +32,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java
index 4c924df4c..47b5789c5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java
@@ -39,9 +39,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java
index 634e619a4..937519f6c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java
@@ -36,9 +36,9 @@
 import net.imglib2.IterableInterval;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.engine.util.Maps;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java
index 4435a680d..72ae90b20 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java
@@ -35,9 +35,8 @@
 import net.imglib2.type.NativeType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java
index 51a453247..d314183ec 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java
@@ -38,9 +38,8 @@
 import net.imglib2.util.Util;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java
index ee4060eb7..c9ff90b42 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java
@@ -37,7 +37,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java
index 1a05fb37c..69ad36566 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java
@@ -35,9 +35,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java
index 03ba2033c..a1f37fec3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java
@@ -32,7 +32,7 @@
 import net.imglib2.type.Type;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java
index 164ef6d94..40ea1adfd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java
@@ -19,10 +19,8 @@
 import net.imglib2.type.numeric.real.FloatType;
 
 import org.scijava.function.Producer;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java
index 2db685f4c..cb2fdb56b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java
@@ -42,10 +42,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Functions;
 import org.scijava.function.Producer;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java
index 2a3acb14b..6dcdb1e99 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java
@@ -42,9 +42,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java
index 998b5365e..b4aa48903 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java
@@ -50,9 +50,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java
index ae8575909..0dbe2ab9f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java
@@ -45,9 +45,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java
index 624414fe8..dce9f4dc0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java
@@ -44,9 +44,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java
index 91a3e170e..13e2a8dcd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java
@@ -47,9 +47,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java
index 84deddd49..b5f5124bd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java
@@ -48,9 +48,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java
index 6064adee7..24c131a49 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java
@@ -45,9 +45,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java
index 320466b7e..fa9eb8679 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java
@@ -34,9 +34,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java
index 7b28ad496..ac3c8b533 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java
@@ -46,9 +46,9 @@
 import org.scijava.Priority;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.engine.util.Adapt;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java
index 23bfe31c8..8c40a9565 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java
@@ -32,8 +32,8 @@
 import java.util.Map;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
 import org.scijava.ops.engine.OpService;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/OpEvaluator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/OpEvaluator.java
index 241e4e223..5b764c333 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/OpEvaluator.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/OpEvaluator.java
@@ -37,9 +37,9 @@
 import java.util.Map;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
 import org.scijava.ops.engine.OpService;
 import org.scijava.ops.engine.util.FunctionUtils;
+import org.scijava.ops.spi.Op;
 import org.scijava.parsington.Operator;
 import org.scijava.parsington.Operators;
 import org.scijava.parsington.Variable;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/AbstractHaralickFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/AbstractHaralickFeature.java
index bc9466597..ccdfa4c8d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/AbstractHaralickFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/AbstractHaralickFeature.java
@@ -36,8 +36,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.OpDependency;
 
 /**
  * Abstract class for HaralickFeatures.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java
index 3cdfc0db7..c408d96f5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java
index 752d69563..639403e9d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java
@@ -35,9 +35,8 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java
index 8fd64f3f4..96d61f691 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java
@@ -35,9 +35,8 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java
index ae40dd4d3..1769caa73 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java
@@ -35,9 +35,8 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java
index a9a61c679..14ac6d80b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java
@@ -35,9 +35,8 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java
index dd67160f0..31ae51a83 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java
@@ -35,9 +35,8 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java
index 6cac3860e..dca184413 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java
@@ -35,9 +35,8 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java
index c4966cff9..0dd1461b6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java
index 3323e91d3..2c6d839fe 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java
@@ -37,9 +37,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java
index 195fab579..3e092bc4a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java
@@ -37,9 +37,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java
index 699459a29..e203b48cb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java
index 0fb3a1d81..998dc8bec 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java
index bdbea044d..790f2bbc4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java
@@ -36,9 +36,8 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java
index 30e029911..cc84b5f95 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java
@@ -35,9 +35,8 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java
index b0e5bd0b1..4f1778948 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java
@@ -37,9 +37,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java
index f9ad577cf..2e1b480f9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java
index 7fe5bb88e..d8ec3e214 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java
index 31033ff5b..f1ae7a9ae 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java
@@ -31,9 +31,8 @@
 
 import java.util.function.Function;
 
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java
index 9c8c3a83b..e89452cdd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java
@@ -32,9 +32,8 @@
 
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java
index e73da2b1b..d5d67f251 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java
@@ -33,9 +33,8 @@
 
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java
index ba542aef2..6979cfb5b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java
@@ -30,7 +30,7 @@
 
 import java.util.function.Function;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java
index de4bc75b7..871140aa7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java
@@ -30,7 +30,7 @@
 
 import java.util.function.Function;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java
index 096c79b18..31e434453 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java
@@ -30,7 +30,7 @@
 
 import java.util.function.Function;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java
index 71511c03a..a2706df8c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java
@@ -30,7 +30,7 @@
 
 import java.util.function.Function;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java
index c722fea64..f18bc7fe6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java
@@ -32,9 +32,8 @@
 
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java
index ff54c4ec2..31715b382 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java
@@ -33,9 +33,8 @@
 
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java
index 11683da13..0343cc0c0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java
@@ -59,9 +59,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java
index 19f632a4b..2e4cdc533 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java
@@ -43,9 +43,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java
index bec3d0b07..66c1ba012 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java
@@ -48,9 +48,8 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java
index 3569747a2..340f612c2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java
@@ -34,9 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java
index 76591884b..12b01d909 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java
@@ -45,9 +45,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java
index aa188be3b..554480e07 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java
@@ -34,9 +34,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java
index 05b18c8a5..482bf6e59 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java
@@ -34,9 +34,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/ZernikeComputer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/ZernikeComputer.java
index 0a4dc0c38..bb204bd96 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/ZernikeComputer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/ZernikeComputer.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java
index af85a9309..91965bf33 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java
@@ -40,9 +40,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java
index 13ba51311..728f9018a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java
@@ -37,10 +37,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java
index 6e858642d..15f4947a8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java
@@ -41,7 +41,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java
index 5afeedf8a..df00b0e52 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java
@@ -37,9 +37,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java
index 172efc196..14ca4e3e7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java
@@ -47,9 +47,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java
index aa33cc1c6..96a14142b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java
@@ -39,7 +39,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java
index d74eef54b..2c3bbf6f8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java
@@ -45,9 +45,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java
index c35f4579c..c6404ecb2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java
@@ -36,9 +36,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java
index fd839404e..23262a689 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java
@@ -44,9 +44,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java
index e3730226d..7afd45eb1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java
@@ -41,9 +41,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java
index 384d62d69..f539a8a5c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java
@@ -39,9 +39,8 @@
 import net.imglib2.view.composite.RealComposite;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java
index 37936f77c..f94224126 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java
@@ -42,9 +42,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java
index 9328ce2e6..e36bdbbe2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java
@@ -39,9 +39,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java
index adad42320..8cb391b08 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java
@@ -37,9 +37,8 @@
 import net.imglib2.type.numeric.NumericType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java
index 57acf6634..96803afd6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java
@@ -35,9 +35,8 @@
 import net.imglib2.img.Img;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java
index 4c79b19d6..197f0aba9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java
@@ -38,7 +38,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java
index 7255913fb..db51050d9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java
@@ -41,9 +41,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java
index d433def2e..215d9a299 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java
@@ -33,7 +33,7 @@
 import net.imglib2.algorithm.fft2.FFTMethods;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java
index e7f4ffefd..1e99b6a63 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java
@@ -37,7 +37,7 @@
 import net.imglib2.util.ValuePair;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java
index 2b09acbfa..3cab630f1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java
@@ -33,7 +33,7 @@
 
 import net.imglib2.Dimensions;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java
index b0eee806b..d50fbab61 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java
@@ -47,10 +47,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java
index 200333e1e..af3098ab6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java
@@ -39,9 +39,8 @@
 import net.imglib2.view.composite.RealComposite;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java
index 2e2fc966e..472bb4311 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java
@@ -38,9 +38,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java
index 3d9994abe..81cd2fc25 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java
@@ -36,7 +36,7 @@
 import net.imglib2.type.numeric.ComplexType;
 
 import org.scijava.function.Inplaces;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java
index b5ca96592..b7bb2f157 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java
@@ -36,9 +36,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java
index bc543cc75..d09826505 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java
@@ -36,9 +36,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java
index baaa327b6..fe57f7154 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java
@@ -35,9 +35,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java
index bdc194468..1df004451 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java
@@ -35,9 +35,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java
index 894c31484..ac7407b5d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java
@@ -37,10 +37,9 @@
 import net.imglib2.type.numeric.ComplexType;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.engine.util.Adapt;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java
index 402d2e3c5..19219157f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java
@@ -37,10 +37,9 @@
 import net.imglib2.type.numeric.ComplexType;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.engine.util.Adapt;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java
index 96e70ae49..f99d011e1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java
@@ -42,9 +42,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFT.java
index 797807f62..a22e20b2d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFT.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFT.java
@@ -43,8 +43,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.OpDependency;
 
 /**
  * Abstract Op used to pad the image by extending the borders optionally using
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java
index 8aed42165..0b1527133 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java
@@ -37,10 +37,9 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.engine.util.Adapt;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java
index 4ca93ccca..feeebecf8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java
@@ -40,9 +40,8 @@
 import net.imglib2.util.Util;
 import net.imglib2.view.Views;
 
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java
index 6997a228d..b244b17f0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java
@@ -37,10 +37,9 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.engine.util.Adapt;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java
index 2b743ba54..99375adcc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java
@@ -39,7 +39,7 @@
 import net.imglib2.type.numeric.ComplexType;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java
index c33f664f6..74a441ce6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java
@@ -37,7 +37,7 @@
 import net.imglib2.type.numeric.ComplexType;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java
index 61ad04a7e..4d01b6f09 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java
@@ -38,9 +38,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java
index 3048edb38..04caa761b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java
@@ -34,9 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java
index b6b6cf120..35c72c254 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java
@@ -50,9 +50,8 @@
 
 import org.scijava.Cancelable;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java
index 4b5e6811f..8ebc46764 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java
@@ -36,9 +36,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java
index 0301409c4..2cad0c3df 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java
@@ -42,7 +42,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 import Jama.EigenvalueDecomposition;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractBoundarySizeConvexHull.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractBoundarySizeConvexHull.java
index 6bbf8e88f..671b8a0d1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractBoundarySizeConvexHull.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractBoundarySizeConvexHull.java
@@ -34,8 +34,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.OpDependency;
 
 /**
  * Generic implementation of
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractBoxivity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractBoxivity.java
index eb19e4c69..7b2c6c9ba 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractBoxivity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractBoxivity.java
@@ -34,8 +34,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.OpDependency;
 
 /**
  * Generic implementation of {@link net.imagej.ops2.Ops.Geometric.Boxivity}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractConvexity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractConvexity.java
index f726fb14a..835c534e2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractConvexity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractConvexity.java
@@ -34,8 +34,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.OpDependency;
 
 /**
  * Generic implementation of {@link net.imagej.ops2.Ops.Geometric.Convexity}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractSizeConvexHull.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractSizeConvexHull.java
index 65bbc7777..bed78d32e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractSizeConvexHull.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractSizeConvexHull.java
@@ -34,8 +34,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.OpDependency;
 
 /**
  * Generic implementation of {@link net.imagej.ops2.Ops.Geometric.SizeConvexHull}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractSolidity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractSolidity.java
index 63085e230..0d8676b5f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractSolidity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/AbstractSolidity.java
@@ -34,8 +34,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.OpDependency;
 
 /**
  * Generic implementation of {@link net.imagej.ops2.Ops.Geometric.Solidity}.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java
index ab3a990eb..2849c8945 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java
@@ -36,7 +36,7 @@
 import net.imglib2.RealPoint;
 import net.imglib2.roi.IterableRegion;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java
index 06201bff6..23cbad356 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java
@@ -36,7 +36,7 @@
 import net.imglib2.roi.IterableRegion;
 import net.imglib2.roi.labeling.LabelRegion;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java
index 186f92a88..01cee9376 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java
@@ -36,9 +36,8 @@
 import net.imglib2.RealPoint;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java
index 4c71e51ce..db83cd663 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java
@@ -36,9 +36,8 @@
 import net.imglib2.roi.geom.real.Polygon2D;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java
index c2c3da402..3110d17bb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java
@@ -38,7 +38,7 @@
 import net.imglib2.roi.IterableRegion;
 import net.imglib2.type.numeric.RealType;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java
index 30cfe9439..48687d701 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java
@@ -35,7 +35,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java
index 4e36fae8d..8ba0b458c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java
@@ -33,7 +33,7 @@
 import net.imglib2.roi.geom.real.Polygon2D;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java
index 318b9e502..9365cf640 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java
@@ -39,7 +39,7 @@
 import net.imglib2.roi.geom.real.DefaultWritablePolygon2D;
 import net.imglib2.roi.geom.real.Polygon2D;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java
index 67e4c3d66..8f3059f09 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java
@@ -33,7 +33,7 @@
 import net.imglib2.roi.geom.real.Polygon2D;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java
index ede783b2d..9030f1ad3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java
@@ -35,9 +35,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java
index bc0491dc0..8e948c8d4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java
@@ -44,7 +44,7 @@
 import net.imglib2.util.Util;
 import net.imglib2.view.Views;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java
index b808c30a3..c12f3d170 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java
@@ -40,7 +40,7 @@
 import net.imglib2.roi.geom.real.DefaultWritablePolygon2D;
 import net.imglib2.roi.geom.real.Polygon2D;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java
index 73432d9e3..77c0d2e50 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java
@@ -32,7 +32,7 @@
 import net.imglib2.roi.geom.real.Polygon2D;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java
index 2432a139e..9222b465b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java
@@ -35,9 +35,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java
index 51c9106c4..ad264c898 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java
@@ -38,9 +38,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java
index a35d772b9..a1eb93cbe 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java
@@ -34,7 +34,7 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java
index 8a3411238..f0618dd4c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java
@@ -34,7 +34,7 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java
index 5e8adc487..c58b8e005 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java
@@ -38,9 +38,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java
index b8951a2b0..8a4b2d566 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java
@@ -36,9 +36,8 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java
index caf252a33..30bc07bcb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java
@@ -38,9 +38,8 @@
 import net.imglib2.util.Pair;
 import net.imglib2.util.ValuePair;
 
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java
index 57670f877..b142ca803 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java
@@ -36,9 +36,8 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "geom.maximumFeretsAngle")
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java
index fb909ec6c..c5716a579 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java
@@ -36,9 +36,8 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "geom.maximumFeretsDiameter")
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java
index 4047042e9..32020eeec 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java
@@ -41,9 +41,8 @@
 
 import org.apache.commons.math3.geometry.euclidean.twod.Line;
 import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java
index 63fa18c3a..2a72eec09 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java
@@ -36,9 +36,8 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "geom.minimumFeretsAngle")
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java
index fd267b2ae..fe6fb5afc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java
@@ -36,9 +36,8 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "geom.minimumFeretsDiameter")
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java
index ace34706e..f1b9523ee 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java
@@ -36,9 +36,8 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java
index b9d3507fc..52911be17 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java
@@ -42,7 +42,7 @@
 import net.imglib2.util.Pair;
 import net.imglib2.util.ValuePair;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java
index c43e529be..decc35cab 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java
@@ -37,7 +37,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java
index 64fcebd17..a22cc2b38 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java
@@ -35,9 +35,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java
index c78fa0a2c..35f917f01 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java
@@ -33,7 +33,7 @@
 import net.imglib2.roi.geom.real.Polygon2D;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java
index f0deda47b..d7a4347c9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java
@@ -37,7 +37,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java
index 5fcab8b1c..106a1c3b4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java
@@ -40,9 +40,8 @@
 import net.imglib2.roi.geom.real.Polygon2D;
 import net.imglib2.type.numeric.real.DoubleType;
 
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java
index 4a7db78a6..082f7bd6f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java
@@ -33,7 +33,7 @@
 import net.imglib2.roi.geom.real.Polygon2D;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java
index 4c59a807c..812f1f456 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java
@@ -36,9 +36,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java
index 55d90a4b3..943e51fe3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java
@@ -34,7 +34,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java
index c5da84f3c..5d779052a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java
@@ -33,7 +33,7 @@
 import net.imagej.ops2.geom.AbstractBoxivity;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java
index 4b959cea7..b9757b111 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java
@@ -36,9 +36,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java
index 884ebb11f..eaf1a8b5a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java
@@ -44,7 +44,7 @@
 import net.imglib2.util.ValuePair;
 
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java
index a0960f89f..cda31fd22 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java
@@ -33,7 +33,7 @@
 import net.imagej.ops2.geom.AbstractConvexity;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java
index d97daa276..618911174 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java
@@ -38,9 +38,8 @@
 
 import org.apache.commons.math3.linear.BlockRealMatrix;
 import org.apache.commons.math3.linear.RealMatrix;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java
index 492ed25f4..31cbcefc6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java
@@ -38,9 +38,8 @@
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
 import org.apache.commons.math3.linear.BlockRealMatrix;
 import org.apache.commons.math3.linear.RealMatrix;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java
index 4c2110b65..89ff3626b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java
@@ -38,9 +38,8 @@
 import org.apache.commons.math3.linear.RealMatrix;
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java
index e20055b6d..fda0aee1d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java
@@ -43,9 +43,8 @@
 
 import org.apache.commons.math3.util.MathArrays;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java
index 6d560a266..564eef299 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java
@@ -38,9 +38,8 @@
 import org.apache.commons.math3.linear.RealMatrix;
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java
index 34451abca..086a6fab9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java
@@ -33,7 +33,7 @@
 import net.imagej.ops2.geom.AbstractSolidity;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java
index c900348d8..27c27d8df 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java
@@ -38,9 +38,8 @@
 import org.apache.commons.math3.linear.RealMatrix;
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java
index edb832f4b..f331ba2b5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java
@@ -36,9 +36,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java
index 6071541a3..6ba7b3fdd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java
@@ -36,7 +36,7 @@
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java
index 1319f6009..e9f941383 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java
@@ -33,7 +33,7 @@
 import net.imagej.ops2.geom.AbstractBoundarySizeConvexHull;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java
index d307543f8..fff895062 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java
@@ -36,9 +36,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java
index d524f597d..7caf0b72a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java
@@ -34,7 +34,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java
index 802ab93f4..43ead00cf 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java
@@ -33,7 +33,7 @@
 import net.imagej.ops2.geom.AbstractSizeConvexHull;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java
index 764562c5d..4cb2f699d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java
@@ -36,7 +36,7 @@
 
 import org.apache.commons.math3.util.MathArrays;
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java
index a29fda656..dc89c8734 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java
@@ -44,9 +44,8 @@
 
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java
index 3dec2c2b7..3b4375298 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java
@@ -32,9 +32,9 @@
 import java.util.function.BiFunction;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
 import org.scijava.ops.engine.OpInfo;
 import org.scijava.ops.engine.OpService;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java
index 957c9268b..53aac4f16 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java
@@ -30,7 +30,7 @@
 package net.imagej.ops2.identity;
 
 import org.scijava.function.Inplaces;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java
index af4b6d06f..f466c3f47 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java
@@ -37,9 +37,8 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java
index c72f7b6b4..068ca578d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java
@@ -7,9 +7,8 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java
index bd2ad7675..de8411889 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java
@@ -36,7 +36,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java
index 7ec38908f..ce505ca16 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java
@@ -42,7 +42,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java
index e54d1e0a4..13a67b635 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java
@@ -36,7 +36,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java
index 4df6a5f0e..a16214a3b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java
@@ -36,7 +36,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java
index d6cef59cb..d740c4875 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java
@@ -41,8 +41,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
 import org.scijava.ops.engine.OpExecutionException;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 import org.scijava.script.ScriptLanguage;
 import org.scijava.script.ScriptService;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java
index 781ea28ca..9eb6282ee 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java
@@ -35,7 +35,7 @@
 import net.imglib2.type.Type;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java
index 0280e30b5..8cea990b2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java
@@ -35,7 +35,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java
index f9a4f8ddc..82e58c144 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java
@@ -37,9 +37,8 @@
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.util.Pair;
 
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/AbstractIntegralImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/AbstractIntegralImg.java
index 163f27fc8..ec50b2eff 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/AbstractIntegralImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/AbstractIntegralImg.java
@@ -37,8 +37,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java
index 5eddc412c..d280e458d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java
@@ -36,7 +36,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java
index 6672bdb87..76b9aa809 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java
@@ -36,7 +36,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java
index 504d292d7..1fcdd4183 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java
@@ -38,7 +38,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertII.java
index a4dc24a6b..d15efa397 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertII.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertII.java
@@ -36,8 +36,8 @@
 //import net.imglib2.type.numeric.RealType;
 //import net.imglib2.type.numeric.integer.UnsignedVariableBitLengthType;
 //
-//import org.scijava.ops.api.OpDependency;
-//import org.scijava.ops.api.OpDependency;
+//import org.scijava.ops.spi.OpDependency;
+//import org.scijava.ops.spi.OpDependency;
 //import org.scijava.ops.core.Op;
 //import org.scijava.functions.Computers;
 //import org.scijava.functions.Computers;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertIIInteger.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertIIInteger.java
index 585429045..e8614d028 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertIIInteger.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertIIInteger.java
@@ -39,8 +39,8 @@
 //import net.imglib2.type.numeric.integer.UnsignedLongType;
 //
 //import org.scijava.Priority;
-//import org.scijava.ops.api.OpDependency;
-//import org.scijava.ops.api.OpDependency;
+//import org.scijava.ops.spi.OpDependency;
+//import org.scijava.ops.spi.OpDependency;
 //import org.scijava.ops.core.Op;
 //import org.scijava.functions.Computers;
 //import org.scijava.functions.Computers;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/Inverters.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/Inverters.java
index 60ea60569..1ee2ecfea 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/Inverters.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/Inverters.java
@@ -13,10 +13,8 @@
 import net.imglib2.util.Util;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java
index 5956d47ee..745531551 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java
@@ -39,9 +39,8 @@
 import net.imglib2.util.Util;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java
index dfec740a9..74b80cf9a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java
@@ -37,9 +37,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java
index d380236d0..7a052aa94 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java
@@ -37,9 +37,8 @@
 import net.imglib2.util.Util;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java
index b344f6f43..52833ed41 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java
@@ -35,9 +35,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java
index 9d3a7f57d..944119a2d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java
@@ -56,9 +56,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java
index 05682eaa5..55543239f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java
@@ -43,9 +43,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java
index 42a6399ed..925b715f1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java
@@ -44,9 +44,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java
index 8f8af7581..217f90b73 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java
@@ -66,9 +66,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java
index 4dabcf711..bfe0f9cb8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java
@@ -34,9 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment01.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment01.java
index 6db6cc574..389fc0253 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment01.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment01.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java
index 25b4f6d80..e06b1e8d4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java
@@ -39,9 +39,8 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java
index 96c796f63..5221fda93 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java
@@ -39,9 +39,8 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment10.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment10.java
index f3d452a02..2b637c3b9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment10.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment10.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java
index 8cc1eece1..0945fe35f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java
@@ -35,9 +35,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java
index 3e342d433..eb7576974 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java
@@ -39,9 +39,8 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java
index 3ba0a7055..e3a0cb401 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java
@@ -38,9 +38,8 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java
index 5e7052fc3..eb7f25d2a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java
@@ -39,9 +39,8 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java
index 80950a972..1d08fdd55 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java
@@ -39,9 +39,8 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java
index e27476468..2b42fba69 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java
@@ -35,7 +35,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java
index 9db3b3b30..660ed9762 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java
@@ -35,7 +35,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java
index 345e5118f..daf998ce6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java
@@ -34,9 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java
index aa0129147..b90bf9f70 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java
@@ -34,9 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java
index ed3b2c180..0b9745ae1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java
@@ -34,9 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java
index f089a4877..d029989fd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java
@@ -34,9 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java
index 007915075..610b5118e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java
@@ -34,9 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java
index 17beb1d70..eded13aa2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java
@@ -34,9 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java
index 411eff74d..e4e7a0f1e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java
@@ -34,9 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment00.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment00.java
index ae4577707..cffd8aa26 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment00.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment00.java
@@ -39,7 +39,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment01.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment01.java
index 9ddb88c2f..cd263b607 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment01.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment01.java
@@ -39,7 +39,7 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment10.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment10.java
index c144c3b32..08d718111 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment10.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment10.java
@@ -39,7 +39,7 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment11.java
index 6e72144c6..ee4d060f1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment11.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment11.java
@@ -39,7 +39,7 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java
index 2874f952e..cb11611ca 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java
@@ -34,9 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java
index 892d90b48..fcad70d6b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java
@@ -34,9 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java
index 14956f0d0..279eecfec 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java
@@ -34,9 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java
index 7241a1028..05febca3a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java
@@ -34,9 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java
index d935f09ed..aa97c7c30 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java
@@ -34,9 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java
index 0b3d0eec7..704cb5f94 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java
@@ -34,9 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java
index 5453992e9..c888953a7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java
@@ -34,9 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java
index 209d2c0d8..4ed101e0e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java
@@ -47,9 +47,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java
index edf3cb581..8d8ae700e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java
@@ -42,9 +42,8 @@
 import net.imglib2.type.numeric.integer.IntType;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java
index 815a544ae..5bdec2e76 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java
@@ -37,10 +37,8 @@
 import org.joml.Vector3d;
 import org.joml.Vector3f;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java
index 7eed6be46..45f8e68af 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java
@@ -32,10 +32,8 @@
 import net.imglib2.type.BooleanType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java
index 1513228de..8af633849 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.Type;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java
index 347b98026..99a41078b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.Type;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java
index c23ba6b60..5a6429a25 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java
@@ -39,7 +39,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java
index 0e17cd45a..37111495e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java
@@ -40,8 +40,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
 import org.scijava.ops.engine.OpEnvironment;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java
index b8f21462d..49564870b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java
@@ -34,10 +34,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java
index b60d68b31..925f446e1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java
@@ -32,10 +32,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java
index c03d5724c..21e723cf8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java
@@ -33,10 +33,8 @@
 import net.imglib2.type.numeric.NumericType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/UnaryRealTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/UnaryRealTypeMath.java
index 7ad05b16a..725900903 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/UnaryRealTypeMath.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/UnaryRealTypeMath.java
@@ -36,10 +36,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java
index a43018d33..e0d150920 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "math.complexConjugateMultiply", priority = Priority.LOW)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/BlackTopHats.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/BlackTopHats.java
index 0db474517..c5a0fb769 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/BlackTopHats.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/BlackTopHats.java
@@ -14,10 +14,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Closes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Closes.java
index 4d8075d1e..400dc9e72 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Closes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Closes.java
@@ -14,10 +14,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Dilations.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Dilations.java
index e259435c8..20b097d17 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Dilations.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Dilations.java
@@ -14,10 +14,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java
index d062aa346..72e7c06e5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java
@@ -11,10 +11,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.engine.ExceptionUtils;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Erosions.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Erosions.java
index 0bc9340cb..1f61e775c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Erosions.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Erosions.java
@@ -14,10 +14,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java
index 5de813cde..8e4433e97 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java
@@ -38,9 +38,8 @@
 import net.imglib2.type.BooleanType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java
index 67e785a4a..f835c4b5d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java
@@ -38,9 +38,8 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java
index c1ea6ead8..239438fc6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java
@@ -14,10 +14,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Opens.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Opens.java
index 8bb60ff1f..02d25c8df 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Opens.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Opens.java
@@ -14,10 +14,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java
index 5d334759b..68a199cdc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java
@@ -45,7 +45,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java
index 4c6d6ee74..5edfeaca0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java
@@ -21,10 +21,8 @@
 import net.imglib2.type.BooleanType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/WhiteTopHats.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/WhiteTopHats.java
index d770df04d..b5811ac37 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/WhiteTopHats.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/WhiteTopHats.java
@@ -14,10 +14,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/AbstractThin.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/AbstractThin.java
index 65877ad46..f100fc233 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/AbstractThin.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/AbstractThin.java
@@ -43,8 +43,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.OpDependency;
 
 /**
  * Thinning Operation
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java
index 8acebce49..19c615821 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java
@@ -32,7 +32,7 @@
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.type.logic.BitType;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java
index 1c8f692f2..8d1e8d119 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java
@@ -32,7 +32,7 @@
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.type.logic.BitType;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java
index 91afbccc0..ef9a4c4c3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java
@@ -32,7 +32,7 @@
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.type.logic.BitType;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java
index 8a72de92d..7e10a9dd3 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java
@@ -32,7 +32,7 @@
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.type.logic.BitType;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java
index 6d5241730..e6b784ae1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java
@@ -38,7 +38,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "project",
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java
index 9b20810d9..1ad2fb758 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java
@@ -38,7 +38,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "project", priority = Priority.LOW)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java
index cc4dda2fd..b7f99a98b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java
@@ -44,9 +44,8 @@
 import net.imglib2.roi.util.RealLocalizableRealPositionable;
 import net.imglib2.util.Intervals;
 
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java
index 42b0a9d62..f7b5c8084 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java
@@ -48,9 +48,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java
index c4afdcffe..115b38038 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java
@@ -34,7 +34,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java
index c902f45e3..f81bc519f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java
@@ -33,9 +33,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java
index 01b59edd2..f0bbc2532 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java
@@ -33,9 +33,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java
index 501949ede..d5edc2cd9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java
@@ -33,9 +33,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java
index b9c7cb2b3..9c849f7f7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java
@@ -37,9 +37,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java
index 1880216ce..5ab59d340 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java
@@ -34,9 +34,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java
index d4ed3370b..f695ccdd9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java
@@ -34,9 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java
index 8ccf5afe4..90af396e4 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java
@@ -37,9 +37,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java
index 93c4dafc9..156b78345 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java
@@ -40,7 +40,7 @@
 import net.imglib2.util.ValuePair;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java
index a538bf3d2..0ea32f4da 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java
@@ -34,9 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java
index e6a30a91a..c5ce2e98f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java
@@ -34,9 +34,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java
index 36238bbbd..3e32e3b4d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java
@@ -34,9 +34,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java
index f76c2d7fc..1c295f21e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java
@@ -34,9 +34,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java
index aa1f768b5..89b5949df 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java
@@ -38,9 +38,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java
index eebcc4675..b47077d56 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java
@@ -32,9 +32,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java
index 3000726c5..e3f57f079 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java
@@ -37,7 +37,7 @@
 import net.imglib2.util.Intervals;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 import org.scijava.util.ArrayUtils;
 import org.scijava.util.DoubleArray;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java
index 99a209690..d41258d67 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java
index 88229a4e6..a091108eb 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java
@@ -33,9 +33,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java
index e21e4fa5b..8dbad8d8f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java
@@ -34,9 +34,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java
index 25b13ade8..371d4bdfe 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java
@@ -37,7 +37,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java
index 3cc8b420c..40e87d93b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java
@@ -38,9 +38,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java
index 8ad309257..821676178 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java
@@ -39,9 +39,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java
index 1d9df75d7..667fa72a5 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java
@@ -37,9 +37,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java
index b549d3e38..e27a6f62a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java
@@ -40,9 +40,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java
index 49490dca7..7b64e2e1b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java
@@ -39,7 +39,7 @@
 import net.imglib2.view.composite.Composite;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java
index 435206e9d..9b2d02075 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java
@@ -37,7 +37,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java
index 5ac4a986e..582b1b91e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java
@@ -39,7 +39,7 @@
 import net.imglib2.view.composite.Composite;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java
index dc0472b7d..6de6324bf 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java
index ad539a9cc..f1a4bf83b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java
index 91762e55b..cc41b34a1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java
index dbf42154b..ec2d57993 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java
index 9b05338aa..af2e5550e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java
index 424448db5..63c0f6ca1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java
@@ -36,7 +36,7 @@
 import net.imglib2.util.Pair;
 import net.imglib2.util.ValuePair;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java
index 39cfac291..c198b116b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java
@@ -32,9 +32,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java
index 41373db64..26b3a18fa 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java
@@ -32,9 +32,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java
index b125ded24..13d6bd1ae 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java
index 0cf9add86..cb424919e 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java
index b6f828a36..67236bca6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java
@@ -32,7 +32,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java
index cf2ff9554..dfdec7c46 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java
@@ -32,7 +32,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java
index fcde9f155..d3ed3a29f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java
@@ -32,7 +32,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java
index 382259b41..b21f25719 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java
@@ -32,7 +32,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java
index ba06e6a07..8cc3aa571 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java
index e18fa8181..24a0d9496 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java
@@ -38,7 +38,7 @@
 import org.ojalgo.matrix.BasicMatrix;
 import org.ojalgo.matrix.PrimitiveMatrix;
 import org.ojalgo.random.Deterministic;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java
index ad7d31e92..d0e91e132 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java
@@ -35,7 +35,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java
index 1e6fca657..1d9f58f8d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java
@@ -35,7 +35,7 @@
 import java.util.concurrent.Future;
 
 import org.scijava.function.Inplaces;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/AbstractApplyThresholdImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/AbstractApplyThresholdImg.java
index ffb637e7f..f54a68fa0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/AbstractApplyThresholdImg.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/AbstractApplyThresholdImg.java
@@ -36,8 +36,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.OpDependency;
 
 /**
  * @author Curtis Rueden
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/AbstractApplyThresholdIterable.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/AbstractApplyThresholdIterable.java
index e04d12c64..e717568cc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/AbstractApplyThresholdIterable.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/AbstractApplyThresholdIterable.java
@@ -32,8 +32,7 @@
 import net.imglib2.type.logic.BitType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.OpDependency;
 
 /**
  * @author Curtis Rueden
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyLocalThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyLocalThresholdIntegral.java
index 7c0a4f60e..ba2c5ea89 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyLocalThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyLocalThresholdIntegral.java
@@ -53,9 +53,8 @@
 import net.imglib2.view.composite.GenericComposite;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.engine.OpExecutionException;
+import org.scijava.ops.spi.OpDependency;
 
 /**
  * Apply a local thresholding method to an image using integral images for speed
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethod.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethod.java
index 9239ca464..777342632 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethod.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethod.java
@@ -34,9 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java
index 7e8844582..0a35ded60 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java
@@ -42,9 +42,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java
index ca71393d4..9e82e43b8 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java
@@ -35,11 +35,10 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.engine.util.Adapt;
 import org.scijava.ops.engine.util.Maps;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java
index 40cdbb297..5244adf79 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java
@@ -32,7 +32,7 @@
 import net.imglib2.type.logic.BitType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java
index 8d0fbd552..5d5d48be0 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.logic.BitType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java
index abca95672..a72b3e25b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java
@@ -33,7 +33,7 @@
 import net.imglib2.histogram.Histogram1d;
 import net.imglib2.type.numeric.RealType;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 //NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java
index 746b3045e..7ad516b58 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java
index 0904ca989..9da08967b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java
@@ -35,8 +35,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
 import org.scijava.ops.engine.OpExecutionException;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java
index 82798a27a..49758da71 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java
@@ -34,8 +34,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
 import org.scijava.ops.engine.OpExecutionException;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java
index 0f68be40a..833e52034 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java
index 4edf2f2cc..63975d86b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java
@@ -37,9 +37,8 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java
index 69348f6fc..2c0b8835a 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java
@@ -38,9 +38,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java
index c511bab8a..c3c89b948 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java
@@ -36,9 +36,8 @@
 import net.imglib2.util.Pair;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java
index d94f3bf5a..979e6365b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java
@@ -38,9 +38,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java
index a80863f8d..68ca211cf 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java
@@ -35,9 +35,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java
index 5e73012e0..be1a5a0ee 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java
@@ -39,9 +39,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java
index b9104b9aa..120178927 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java
@@ -48,9 +48,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java
index 1191335fd..d540630a9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java
@@ -34,9 +34,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java
index 261856689..ef6baee98 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java
@@ -38,9 +38,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java
index bb0035e34..edbd13459 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java
@@ -37,9 +37,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java
index a940a40e5..d3dc1220c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java
@@ -39,9 +39,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java
index 337726619..717ddbb2f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java
@@ -35,9 +35,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java
index b7b428315..0a77d03b9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java
@@ -40,9 +40,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java
index 5463413c9..b7d31fd17 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java
@@ -47,9 +47,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "threshold.localNiblack",
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java
index 92b827019..2bc936525 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java
@@ -35,9 +35,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java
index 5d3a23962..4a053a70d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java
@@ -40,9 +40,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java
index 55921eabc..5ded94ce9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java
@@ -47,9 +47,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "threshold.localPhansalkar",
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java
index b5e87e053..85e029a38 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java
@@ -35,9 +35,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java
index d4b87bb89..c840ce57d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java
@@ -40,9 +40,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java
index abeadd05d..757c47ef6 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java
@@ -47,9 +47,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = Op.class, name = "threshold.localSauvola",
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java
index d9416e1ba..dff6ee314 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java
index 3ee001340..eff8a1281 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java
@@ -35,7 +35,7 @@
 import net.imglib2.histogram.Histogram1d;
 import net.imglib2.type.numeric.RealType;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 // This plugin code ported from the original MatLab code of the max likelihood
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java
index 85a58be77..5fb97a6f9 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java
@@ -33,7 +33,7 @@
 import net.imglib2.histogram.Histogram1d;
 import net.imglib2.type.numeric.RealType;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java
index ae3360e31..077f8aec2 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java
@@ -36,8 +36,8 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
 import org.scijava.ops.engine.OpExecutionException;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java
index b0715d932..6c7172b62 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java
@@ -35,7 +35,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java
index d3762aa18..6c4be612c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java
index b8e1a6397..ba7b64a70 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/percentile/ComputePercentileThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/percentile/ComputePercentileThreshold.java
index d4f70db60..a7ea2c27b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/percentile/ComputePercentileThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/percentile/ComputePercentileThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java
index d3c34b778..89beb257b 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java
index 9ad1ce023..7d970a4cd 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java
index b0c601b06..84d97e6da 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java
index 249518b18..8e31b1bb1 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java
index 1cf3ff24c..a7c2bb948 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java
index 472d6726e..130c31f10 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java
@@ -47,7 +47,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java
index fc32ef115..66e1fc4d7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java
@@ -34,7 +34,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java
index 7d72862d4..544d9b95c 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java
@@ -33,7 +33,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java
index b3048a118..5d9676729 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java
@@ -37,7 +37,7 @@
 import net.imglib2.view.Views;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java
index 37047b504..21f1f4e90 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java
@@ -34,11 +34,9 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java
index 1228068f9..6bdc3cb01 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java
@@ -8,10 +8,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java
index c5eb23099..eb60d4a65 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java
@@ -14,10 +14,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/RAIToIIOps.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/RAIToIIOps.java
index 4d7d7885c..6d4230caa 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/RAIToIIOps.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/RAIToIIOps.java
@@ -6,10 +6,8 @@
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.view.Views;
 
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/maxValue/MaxValueRealTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/maxValue/MaxValueRealTypes.java
index d50ed11a5..2797e6d5f 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/maxValue/MaxValueRealTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/maxValue/MaxValueRealTypes.java
@@ -24,10 +24,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 import net.imglib2.type.numeric.real.FloatType;
 
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/minValue/MinValueRealTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/minValue/MinValueRealTypes.java
index 6f83e7da9..fe1766360 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/minValue/MinValueRealTypes.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/minValue/MinValueRealTypes.java
@@ -24,10 +24,8 @@
 import net.imglib2.type.numeric.real.DoubleType;
 import net.imglib2.type.numeric.real.FloatType;
 
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java
index 06891c1cf..f7ddc5b8a 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java
@@ -50,9 +50,9 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.scijava.Context;
 import org.scijava.cache.CacheService;
-import org.scijava.ops.api.Op;
 import org.scijava.ops.engine.OpHistoryService;
 import org.scijava.ops.engine.OpService;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.PluginService;
 import org.scijava.thread.ThreadService;
 import org.scijava.types.TypeService;
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/slice/SliceTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/slice/SliceTest.java
index 0bd6dbf89..e9eb72265 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/slice/SliceTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/slice/SliceTest.java
@@ -51,8 +51,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/TypeExtractorTests.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/TypeExtractorTests.java
index 82219abf6..f9326b5d3 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/TypeExtractorTests.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/TypeExtractorTests.java
@@ -13,10 +13,8 @@
 import net.imglib2.type.numeric.integer.UnsignedByteType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.TypeExtractor;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftComputersToRAITest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftComputersToRAITest.java
index d4cf60043..8b49dcd4f 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftComputersToRAITest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftComputersToRAITest.java
@@ -11,10 +11,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.types.Nil;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAITest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAITest.java
index 21caabd2e..cf612122b 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAITest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAITest.java
@@ -15,10 +15,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops-api/pom.xml b/scijava/scijava-ops-api/pom.xml
index f0b2e7eeb..999e8478b 100644
--- a/scijava/scijava-ops-api/pom.xml
+++ b/scijava/scijava-ops-api/pom.xml
@@ -11,11 +11,11 @@
 		<relativePath>../..</relativePath>
 	</parent>
 
-	<artifactId>scijava-ops-api</artifactId>
+	<artifactId>scijava-ops-spi</artifactId>
 
-	<name>SciJava Ops API</name>
-	<description>SciJava Operations API: annotations used by the SciJava Operations framework.</description>
-	<url>https://github.com/scijava/scijava-ops-api</url>
+	<name>SciJava Ops SPI</name>
+	<description>SciJava Operations SPI: service descriptors used by the SciJava Operations framework.</description>
+	<url>https://github.com/scijava/scijava-ops-spi</url>
 	<inceptionYear>2021</inceptionYear>
 	<organization>
 		<name>SciJava</name>
@@ -78,7 +78,7 @@
 	<mailingLists>
 		<mailingList>
 			<name>Image.sc Forum</name>
-			<archive>https://forum.image.sc/tags/scijava-ops-api</archive>
+			<archive>https://forum.image.sc/tags/scijava-ops-spi</archive>
 		</mailingList>
 	</mailingLists>
 
@@ -90,7 +90,7 @@
 	</scm>
 	<issueManagement>
 		<system>GitHub Issues</system>
-		<url>https://github.com/scijava/scijava-ops-api/issues</url>
+		<url>https://github.com/scijava/scijava-ops-spi/issues</url>
 	</issueManagement>
 	<ciManagement>
 		<system>Travis CI</system>
@@ -98,14 +98,14 @@
 	</ciManagement>
 
 	<properties>
-		<main-class>org.scijava.ops.api.Main</main-class>
-		<package-name>org.scijava.ops.api</package-name>
+		<main-class>org.scijava.ops.spi.Main</main-class>
+		<package-name>org.scijava.ops.spi</package-name>
 
 		<license.licenseName>bsd_2</license.licenseName>
 		<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
 		<!--  <enforcer.skip>true</enforcer.skip>-->
-		<scijava-ops-api.allowedDuplicateClasses>${scijava.allowedDuplicateClasses},com.github.therapi.runtimejavadoc.repack.com.eclipsesource.json.*</scijava-ops-api.allowedDuplicateClasses>
-		<allowedDuplicateClasses>${scijava-ops-api.allowedDuplicateClasses}</allowedDuplicateClasses>
+		<scijava-ops-spi.allowedDuplicateClasses>${scijava.allowedDuplicateClasses},com.github.therapi.runtimejavadoc.repack.com.eclipsesource.json.*</scijava-ops-spi.allowedDuplicateClasses>
+		<allowedDuplicateClasses>${scijava-ops-spi.allowedDuplicateClasses}</allowedDuplicateClasses>
 	</properties>
 	<dependencies>
 		<!-- SciJava dependencies -->
diff --git a/scijava/scijava-ops-api/src/main/java/module-info.java b/scijava/scijava-ops-api/src/main/java/module-info.java
index 5f402635c..bca1c6d6f 100644
--- a/scijava/scijava-ops-api/src/main/java/module-info.java
+++ b/scijava/scijava-ops-api/src/main/java/module-info.java
@@ -1,6 +1,6 @@
-module org.scijava.ops.api {
+module org.scijava.ops.spi {
 
-	exports org.scijava.ops.api;
+	exports org.scijava.ops.spi;
 
 	requires org.scijava;
 
diff --git a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/Op.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/spi/Op.java
similarity index 79%
rename from scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/Op.java
rename to scijava/scijava-ops-api/src/main/java/org/scijava/ops/spi/Op.java
index 99bf90292..8cca2cdf3 100644
--- a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/Op.java
+++ b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/spi/Op.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.api;
+package org.scijava.ops.spi;
 
 import org.scijava.plugin.SciJavaPlugin;
 
diff --git a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpCollection.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/spi/OpCollection.java
similarity index 86%
rename from scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpCollection.java
rename to scijava/scijava-ops-api/src/main/java/org/scijava/ops/spi/OpCollection.java
index 8053cdd53..5389ff057 100644
--- a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpCollection.java
+++ b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/spi/OpCollection.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.api;
+package org.scijava.ops.spi;
 
 import org.scijava.plugin.SciJavaPlugin;
 
diff --git a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpDependency.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/spi/OpDependency.java
similarity index 94%
rename from scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpDependency.java
rename to scijava/scijava-ops-api/src/main/java/org/scijava/ops/spi/OpDependency.java
index 07155e640..f08a23ae6 100644
--- a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpDependency.java
+++ b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/spi/OpDependency.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.api;
+package org.scijava.ops.spi;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpField.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/spi/OpField.java
similarity index 95%
rename from scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpField.java
rename to scijava/scijava-ops-api/src/main/java/org/scijava/ops/spi/OpField.java
index cbf15ac46..fc7f824c2 100644
--- a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpField.java
+++ b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/spi/OpField.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.api;
+package org.scijava.ops.spi;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpMethod.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/spi/OpMethod.java
similarity index 95%
rename from scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpMethod.java
rename to scijava/scijava-ops-api/src/main/java/org/scijava/ops/spi/OpMethod.java
index d01ac1d4f..dc0d08d70 100644
--- a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpMethod.java
+++ b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/spi/OpMethod.java
@@ -28,7 +28,7 @@
  * #L%
  */
 
-package org.scijava.ops.api;
+package org.scijava.ops.spi;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/scijava/scijava-ops-engine/pom.xml b/scijava/scijava-ops-engine/pom.xml
index 3e9cad365..7a132c32e 100644
--- a/scijava/scijava-ops-engine/pom.xml
+++ b/scijava/scijava-ops-engine/pom.xml
@@ -125,7 +125,7 @@
 		-->
 		<dependency>
 			<groupId>org.scijava</groupId>
-			<artifactId>scijava-ops-api</artifactId>
+			<artifactId>scijava-ops-spi</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/scijava/scijava-ops-engine/src/main/java/module-info.java b/scijava/scijava-ops-engine/src/main/java/module-info.java
index dc940ceef..b41fdc6d6 100644
--- a/scijava/scijava-ops-engine/src/main/java/module-info.java
+++ b/scijava/scijava-ops-engine/src/main/java/module-info.java
@@ -41,7 +41,7 @@
 	requires org.scijava;
 	requires org.scijava.function;
 	requires org.scijava.struct;
-	requires org.scijava.ops.api;
+	requires org.scijava.ops.spi;
 	requires org.scijava.ops.discovery;
 	requires org.scijava.types;
 	requires javassist;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/AnnotatedOpDependencyMember.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/AnnotatedOpDependencyMember.java
index 7483a6dad..911ec0d3b 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/AnnotatedOpDependencyMember.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/AnnotatedOpDependencyMember.java
@@ -32,7 +32,7 @@
 
 import java.lang.reflect.Type;
 
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.OpDependency;
 
 /**
  * @author Marcel Wiedenmann
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/FieldOpDependencyMember.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/FieldOpDependencyMember.java
index b2ac0c98a..f2a86a32e 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/FieldOpDependencyMember.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/FieldOpDependencyMember.java
@@ -32,7 +32,7 @@
 
 import java.lang.reflect.Field;
 
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.struct.MemberInstance;
 import org.scijava.struct.ValueAccessible;
 import org.scijava.struct.ValueAccessibleMemberInstance;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/MethodParameterOpDependencyMember.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/MethodParameterOpDependencyMember.java
index baa005d60..871231968 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/MethodParameterOpDependencyMember.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/MethodParameterOpDependencyMember.java
@@ -33,7 +33,7 @@
 import java.lang.reflect.Parameter;
 import java.lang.reflect.Type;
 
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.OpDependency;
 
 /**
  * @author Marcel Wiedenmann
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpDependencies.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpDependencies.java
index d706303ad..842a7f400 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpDependencies.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpDependencies.java
@@ -35,7 +35,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.OpDependency;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/complexLift/ComputersToFunctionsAndLift.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/complexLift/ComputersToFunctionsAndLift.java
index 4cc7fbe3f..12ab0d16a 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/complexLift/ComputersToFunctionsAndLift.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/complexLift/ComputersToFunctionsAndLift.java
@@ -74,9 +74,9 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/complexLift/FunctionsToComputersAndLift.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/complexLift/FunctionsToComputersAndLift.java
index 168776960..b44b16657 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/complexLift/FunctionsToComputersAndLift.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/complexLift/FunctionsToComputersAndLift.java
@@ -40,9 +40,9 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaFunction.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaFunction.java
index fb09d9b14..2a1911fa1 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaFunction.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaFunction.java
@@ -39,9 +39,9 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaSource.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaSource.java
index d82031b74..dda01ba59 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaSource.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaSource.java
@@ -41,9 +41,9 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Producer;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/functional/FunctionsToComputers.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/functional/FunctionsToComputers.java
index bb5e792b5..9e029b654 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/functional/FunctionsToComputers.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/functional/FunctionsToComputers.java
@@ -40,9 +40,9 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Producer;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/functional/InplacesToFunctions.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/functional/InplacesToFunctions.java
index cc18ab11a..e97a194e1 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/functional/InplacesToFunctions.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/functional/InplacesToFunctions.java
@@ -40,11 +40,11 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/ComputerToArrays.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/ComputerToArrays.java
index cc65e5226..bf4185998 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/ComputerToArrays.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/ComputerToArrays.java
@@ -37,10 +37,10 @@
 import java.util.function.Function;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/ComputerToIterables.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/ComputerToIterables.java
index c8cfadea6..75f6f0ec1 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/ComputerToIterables.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/ComputerToIterables.java
@@ -38,10 +38,10 @@
 import java.util.function.Function;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/FunctionToArrays.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/FunctionToArrays.java
index a0047106c..bc0ea45ea 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/FunctionToArrays.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/FunctionToArrays.java
@@ -39,10 +39,10 @@
 import java.util.function.Function;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/FunctionToIterables.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/FunctionToIterables.java
index 5e913b0e9..f945a6c8b 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/FunctionToIterables.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/FunctionToIterables.java
@@ -39,10 +39,10 @@
 import java.util.function.Function;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/InplaceToArrays.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/InplaceToArrays.java
index 14a8dfa07..0aa712412 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/InplaceToArrays.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/adapt/lift/InplaceToArrays.java
@@ -37,10 +37,10 @@
 import java.util.function.Function;
 
 import org.scijava.function.Inplaces;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/IdentityLossReporter.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/IdentityLossReporter.java
index c497d4bc2..e4166030f 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/IdentityLossReporter.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/IdentityLossReporter.java
@@ -1,9 +1,9 @@
 
 package org.scijava.ops.engine.conversionLoss;
 
-import org.scijava.ops.api.Op;
 import org.scijava.ops.engine.OpHints;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/PrimitiveArrayLossReporters.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/PrimitiveArrayLossReporters.java
index 5491e3d1b..d321f121c 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/PrimitiveArrayLossReporters.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/PrimitiveArrayLossReporters.java
@@ -1,11 +1,9 @@
 package org.scijava.ops.engine.conversionLoss;
 
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
 import org.scijava.ops.engine.OpHints;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/PrimitiveLossReporters.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/PrimitiveLossReporters.java
index 2ac7a7090..3a898c851 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/PrimitiveLossReporters.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/PrimitiveLossReporters.java
@@ -1,12 +1,10 @@
 
 package org.scijava.ops.engine.conversionLoss;
 
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
 import org.scijava.ops.engine.OpHints;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/copy/CopyOpCollection.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/copy/CopyOpCollection.java
index 3e408b00a..ed692dd1c 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/copy/CopyOpCollection.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/copy/CopyOpCollection.java
@@ -2,10 +2,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/create/CreateOpCollection.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/create/CreateOpCollection.java
index d70e40d89..c931c7c30 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/create/CreateOpCollection.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/create/CreateOpCollection.java
@@ -5,10 +5,8 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Producer;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpEnvironment.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpEnvironment.java
index 7a0b6b6d2..ab9282192 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpEnvironment.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpEnvironment.java
@@ -48,8 +48,6 @@
 
 import org.scijava.Priority;
 import org.scijava.log.LogService;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.discovery.Discoverer;
 import org.scijava.ops.engine.BaseOpHints.Adaptation;
 import org.scijava.ops.engine.BaseOpHints.DependencyMatching;
@@ -77,6 +75,8 @@
 import org.scijava.ops.engine.matcher.impl.OpClassInfo;
 import org.scijava.ops.engine.simplify.SimplifiedOpInfo;
 import org.scijava.ops.engine.struct.FunctionalParameters;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.struct.FunctionalMethodType;
 import org.scijava.struct.ItemIO;
 import org.scijava.types.Nil;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpHistory.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpHistory.java
index 3ee4a2f69..cd5ca2740 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpHistory.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpHistory.java
@@ -13,10 +13,10 @@
 import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.stream.Collectors;
 
-import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.engine.OpExecutionSummary;
 import org.scijava.ops.engine.OpHistory;
 import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 import org.scijava.service.AbstractService;
 import org.scijava.service.Service;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedClassOpInfoGenerator.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedClassOpInfoGenerator.java
index 05195d7f2..83e1e4fbb 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedClassOpInfoGenerator.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedClassOpInfoGenerator.java
@@ -4,11 +4,11 @@
 import java.util.List;
 
 import org.scijava.InstantiableException;
-import org.scijava.ops.api.Op;
 import org.scijava.ops.engine.OpInfo;
 import org.scijava.ops.engine.OpInfoGenerator;
 import org.scijava.ops.engine.OpUtils;
 import org.scijava.ops.engine.matcher.impl.OpClassInfo;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.PluginInfo;
 import org.scijava.plugin.PluginService;
 
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedOpCollectionInfoGenerator.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedOpCollectionInfoGenerator.java
index 3b7deed1e..1768cd49c 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedOpCollectionInfoGenerator.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedOpCollectionInfoGenerator.java
@@ -7,14 +7,14 @@
 import java.util.List;
 
 import org.scijava.InstantiableException;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpMethod;
 import org.scijava.ops.engine.OpInfo;
 import org.scijava.ops.engine.OpInfoGenerator;
 import org.scijava.ops.engine.OpUtils;
 import org.scijava.ops.engine.matcher.impl.OpFieldInfo;
 import org.scijava.ops.engine.matcher.impl.OpMethodInfo;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpMethod;
 import org.scijava.plugin.PluginInfo;
 import org.scijava.plugin.PluginService;
 import org.scijava.util.ClassUtils;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/DefaultOpRef.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/DefaultOpRef.java
index 7c8e0d235..e531fb421 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/DefaultOpRef.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/DefaultOpRef.java
@@ -35,9 +35,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.scijava.ops.api.Op;
 import org.scijava.ops.engine.OpRef;
 import org.scijava.ops.engine.matcher.OpMatcher;
+import org.scijava.ops.spi.Op;
 import org.scijava.types.Types;
 import org.scijava.types.inference.GenericAssignability;
 
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpFieldInfo.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpFieldInfo.java
index b8fc0ec63..34d26eef2 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpFieldInfo.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpFieldInfo.java
@@ -39,14 +39,13 @@
 
 import org.scijava.Priority;
 import org.scijava.ValidityProblem;
-import org.scijava.ops.api.OpField;
 import org.scijava.ops.engine.Hints;
 import org.scijava.ops.engine.OpHints;
 import org.scijava.ops.engine.OpInfo;
 import org.scijava.ops.engine.OpUtils;
 import org.scijava.ops.engine.hint.ImmutableHints;
 import org.scijava.ops.engine.struct.FieldParameterMemberParser;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpField;
 import org.scijava.struct.Struct;
 import org.scijava.struct.StructInstance;
 import org.scijava.struct.Structs;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpMethodInfo.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpMethodInfo.java
index b862005b1..64e16d1a0 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpMethodInfo.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpMethodInfo.java
@@ -45,9 +45,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ValidityProblem;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpMethod;
 import org.scijava.ops.engine.Hints;
 import org.scijava.ops.engine.OpDependencyMember;
 import org.scijava.ops.engine.OpHints;
@@ -58,7 +55,8 @@
 import org.scijava.ops.engine.struct.MethodParameterMemberParser;
 import org.scijava.ops.engine.util.Adapt;
 import org.scijava.ops.engine.util.OpMethodUtils;
-import org.scijava.ops.api.OpMethod;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.OpMethod;
 import org.scijava.struct.Member;
 import org.scijava.struct.Struct;
 import org.scijava.struct.StructInstance;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Add.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Add.java
index 7652c4c7f..9eec60338 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Add.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Add.java
@@ -11,10 +11,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/MathOpCollection.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/MathOpCollection.java
index 57eb7b898..1d0ff8f95 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/MathOpCollection.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/MathOpCollection.java
@@ -4,10 +4,8 @@
 import java.util.function.BinaryOperator;
 
 import org.scijava.Priority;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Normalize.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Normalize.java
index ba8255b42..79d755b75 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Normalize.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Normalize.java
@@ -3,7 +3,7 @@
 import java.util.Arrays;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 public class Normalize {
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Power.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Power.java
index f16cef033..c6b4b9698 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Power.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Power.java
@@ -3,10 +3,8 @@
 import java.util.function.BiFunction;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Sqrt.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Sqrt.java
index 41f1ba308..333840e76 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Sqrt.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Sqrt.java
@@ -4,10 +4,8 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Zero.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Zero.java
index f40fa22a4..43291c1ae 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Zero.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/math/Zero.java
@@ -3,10 +3,8 @@
 import java.util.stream.IntStream;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/Identity.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/Identity.java
index e18778caf..bac41f7a7 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/Identity.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/Identity.java
@@ -3,9 +3,9 @@
 
 import java.util.function.Function;
 
-import org.scijava.ops.api.Op;
 import org.scijava.ops.engine.OpHints;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 @OpHints(hints = { Simplification.FORBIDDEN })
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveArraySimplifiers.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveArraySimplifiers.java
index 735e5de59..69e071573 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveArraySimplifiers.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveArraySimplifiers.java
@@ -3,12 +3,10 @@
 
 import java.util.function.Function;
 
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
 import org.scijava.ops.engine.OpHints;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 import org.scijava.util.ObjectArray;
 
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveListSimplifier.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveListSimplifier.java
index be7210ed8..a9595f265 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveListSimplifier.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveListSimplifier.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import java.util.function.Function;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveSimplifiers.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveSimplifiers.java
index 8f84fb171..197765f95 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveSimplifiers.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveSimplifiers.java
@@ -3,12 +3,10 @@
 
 import java.util.function.Function;
 
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
 import org.scijava.ops.engine.OpHints;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedOpInfo.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedOpInfo.java
index 684d5c76e..56b3ec805 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedOpInfo.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedOpInfo.java
@@ -8,7 +8,6 @@
 
 import org.scijava.Priority;
 import org.scijava.ValidityProblem;
-import org.scijava.ops.api.Op;
 import org.scijava.ops.engine.Hints;
 import org.scijava.ops.engine.OpEnvironment;
 import org.scijava.ops.engine.OpInfo;
@@ -19,6 +18,7 @@
 import org.scijava.ops.engine.matcher.OpMatchingException;
 import org.scijava.ops.engine.struct.OpRetypingMemberParser;
 import org.scijava.ops.engine.struct.RetypingRequest;
+import org.scijava.ops.spi.Op;
 import org.scijava.struct.FunctionalMethodType;
 import org.scijava.struct.ItemIO;
 import org.scijava.struct.Member;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/stats/Mean.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/stats/Mean.java
index b03f9daf8..a6a304e96 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/stats/Mean.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/stats/Mean.java
@@ -3,9 +3,8 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 
 public class Mean {
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/stats/Size.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/stats/Size.java
index 4d431f3cc..0f3aaac02 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/stats/Size.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/stats/Size.java
@@ -4,7 +4,7 @@
 import java.util.function.Function;
 import java.util.stream.StreamSupport;
 
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 public class Size {
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ClassOpDependencyMemberParser.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ClassOpDependencyMemberParser.java
index f3b0a2306..db23a22b4 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ClassOpDependencyMemberParser.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ClassOpDependencyMemberParser.java
@@ -7,9 +7,8 @@
 import java.util.List;
 
 import org.scijava.ValidityProblem;
-import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.engine.FieldOpDependencyMember;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.struct.MemberParser;
 import org.scijava.struct.ValidityException;
 import org.scijava.util.ClassUtils;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/JavadocParameterData.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/JavadocParameterData.java
index de690e3aa..b83376a07 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/JavadocParameterData.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/JavadocParameterData.java
@@ -17,10 +17,9 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.engine.OpInfo;
 import org.scijava.ops.engine.OpUtils;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.struct.FunctionalMethodType;
 import org.scijava.struct.Member;
 import org.scijava.types.Types;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/MethodOpDependencyMemberParser.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/MethodOpDependencyMemberParser.java
index dec5e80d2..781a0944e 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/MethodOpDependencyMemberParser.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/MethodOpDependencyMemberParser.java
@@ -8,8 +8,8 @@
 import java.util.List;
 
 import org.scijava.ValidityProblem;
-import org.scijava.ops.api.OpDependency;
 import org.scijava.ops.engine.MethodParameterOpDependencyMember;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.struct.MemberParser;
 import org.scijava.struct.ValidityException;
 
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/MethodParameterMemberParser.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/MethodParameterMemberParser.java
index 2ffc81018..d17934a2d 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/MethodParameterMemberParser.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/MethodParameterMemberParser.java
@@ -9,9 +9,8 @@
 import java.util.Set;
 
 import org.scijava.ValidityProblem;
-import org.scijava.ops.api.OpMethod;
 import org.scijava.ops.engine.util.OpMethodUtils;
-import org.scijava.ops.api.OpMethod;
+import org.scijava.ops.spi.OpMethod;
 import org.scijava.struct.MemberParser;
 import org.scijava.struct.ValidityException;
 import org.scijava.types.Types;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/Adapt.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/Adapt.java
index cfc606873..84a1a0d6c 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/Adapt.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/Adapt.java
@@ -14,7 +14,7 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 
 /**
  * Utility providing adaptation between {@link Op} types.
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/OpMethodUtils.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/OpMethodUtils.java
index f95d5d185..b28d51e8c 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/OpMethodUtils.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/OpMethodUtils.java
@@ -7,8 +7,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
+import org.scijava.ops.spi.OpDependency;
 import org.scijava.types.Types;
 import org.scijava.types.inference.GenericAssignability;
 import org.scijava.types.inference.InterfaceInference;
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/JavadocParameterTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/JavadocParameterTest.java
index be751c60c..ba4175b13 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/JavadocParameterTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/JavadocParameterTest.java
@@ -15,13 +15,13 @@
 import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpMethod;
 import org.scijava.ops.engine.OpInfo;
 import org.scijava.ops.engine.OpUtils;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpMethod;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpBuilderNoOutputTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpBuilderNoOutputTest.java
index a1c1f4519..a14527afc 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpBuilderNoOutputTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpBuilderNoOutputTest.java
@@ -7,11 +7,9 @@
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
 import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
 import org.scijava.types.Nil;
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpBuilderTestOps.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpBuilderTestOps.java
index d4ef624fb..be46a099a 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpBuilderTestOps.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpBuilderTestOps.java
@@ -36,10 +36,10 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpMethodDependencyPositionTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpMethodDependencyPositionTest.java
index 5edbe29c6..1cf77b459 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpMethodDependencyPositionTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpMethodDependencyPositionTest.java
@@ -8,10 +8,10 @@
 
 import org.junit.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpMethod;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpMethod;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpMethodTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpMethodTest.java
index d2f327acd..0eb380626 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpMethodTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpMethodTest.java
@@ -42,8 +42,8 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpMethodTestOps.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpMethodTestOps.java
index 4e03479f4..967875a10 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpMethodTestOps.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpMethodTestOps.java
@@ -37,10 +37,10 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpMethod;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpMethod;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpPriorityTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpPriorityTest.java
index 0bdf85770..178075d03 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpPriorityTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpPriorityTest.java
@@ -33,7 +33,7 @@
 import org.junit.Test;
 import org.scijava.Priority;
 import org.scijava.function.Producer;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/TestOps.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/TestOps.java
index 781f233fe..8a5433a52 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/TestOps.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/TestOps.java
@@ -5,7 +5,7 @@
 import java.util.function.Function;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/OpAdaptationPriorityTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/OpAdaptationPriorityTest.java
index 6df880951..337096092 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/OpAdaptationPriorityTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/OpAdaptationPriorityTest.java
@@ -37,14 +37,12 @@
 import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.function.Producer;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
 import org.scijava.ops.engine.AbstractTestEnvironment;
 import org.scijava.ops.engine.OpBuilder;
 import org.scijava.ops.engine.adapt.functional.ComputersToFunctionsViaFunction;
 import org.scijava.ops.engine.adapt.functional.ComputersToFunctionsViaSource;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTestOps.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTestOps.java
index ada24df50..a8e4c881e 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTestOps.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTestOps.java
@@ -35,10 +35,10 @@
 package org.scijava.ops.engine.adapt.functional;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTestOps.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTestOps.java
index 1ffb9ce12..9cccb6951 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTestOps.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTestOps.java
@@ -38,10 +38,10 @@
 import java.util.function.Function;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/ComputerToArraysTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/ComputerToArraysTest.java
index 0bae9f25e..c89a763a1 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/ComputerToArraysTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/ComputerToArraysTest.java
@@ -37,8 +37,8 @@
 import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.ops.engine.AbstractTestEnvironment;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/FunctionToArraysTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/FunctionToArraysTest.java
index 0d4ada99c..97a8e95ee 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/FunctionToArraysTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/FunctionToArraysTest.java
@@ -41,10 +41,10 @@
 import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Functions;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/InplaceToArraysTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/InplaceToArraysTest.java
index dd6fd3ea8..9d7dc65f5 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/InplaceToArraysTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/InplaceToArraysTest.java
@@ -38,8 +38,8 @@
 import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/AdaptationHintTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/AdaptationHintTest.java
index cfb5f3364..2e435ec1c 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/AdaptationHintTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/AdaptationHintTest.java
@@ -5,16 +5,14 @@
 import java.util.function.Function;
 
 import org.junit.Test;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
 import org.scijava.ops.engine.AbstractTestEnvironment;
 import org.scijava.ops.engine.Hints;
 import org.scijava.ops.engine.OpHints;
 import org.scijava.ops.engine.BaseOpHints.Adaptation;
 import org.scijava.ops.engine.hint.DefaultHints;
 import org.scijava.ops.engine.matcher.OpMatchingException;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.function.Computers;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/SimplificationHintTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/SimplificationHintTest.java
index 2de1494d7..e88768866 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/SimplificationHintTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/SimplificationHintTest.java
@@ -6,9 +6,6 @@
 import java.util.function.Function;
 
 import org.junit.Test;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
 import org.scijava.ops.engine.AbstractTestEnvironment;
 import org.scijava.ops.engine.Hints;
 import org.scijava.ops.engine.OpHints;
@@ -16,7 +13,8 @@
 import org.scijava.ops.engine.BaseOpHints.Simplification;
 import org.scijava.ops.engine.hint.DefaultHints;
 import org.scijava.ops.engine.matcher.OpMatchingException;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/OpCachingTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/OpCachingTest.java
index 57d52869e..d49f99e3f 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/OpCachingTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/OpCachingTest.java
@@ -40,15 +40,15 @@
 import org.junit.jupiter.api.Assertions;
 import org.scijava.Context;
 import org.scijava.function.Producer;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpField;
 import org.scijava.ops.engine.AbstractTestEnvironment;
 import org.scijava.ops.engine.OpEnvironment;
 import org.scijava.ops.engine.OpHistoryService;
 import org.scijava.ops.engine.OpInstance;
 import org.scijava.ops.engine.OpService;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 import org.scijava.plugin.PluginService;
 import org.scijava.types.TypeService;
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/ProvenanceTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/ProvenanceTest.java
index 2f34c95c1..484187fc4 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/ProvenanceTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/ProvenanceTest.java
@@ -12,16 +12,16 @@
 import org.junit.Test;
 import org.scijava.Priority;
 import org.scijava.function.Producer;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpMethod;
 import org.scijava.ops.engine.AbstractTestEnvironment;
 import org.scijava.ops.engine.Hints;
 import org.scijava.ops.engine.OpExecutionSummary;
 import org.scijava.ops.engine.OpHistoryService;
 import org.scijava.ops.engine.OpInfo;
 import org.scijava.ops.engine.hint.DefaultHints;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpMethod;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/DefaultMatchingErrorTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/DefaultMatchingErrorTest.java
index 4e2260ada..3e8b1d9b5 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/DefaultMatchingErrorTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/DefaultMatchingErrorTest.java
@@ -6,11 +6,11 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpField;
 import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingWithAnyTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingWithAnyTest.java
index b474ee4b4..b9c0831c1 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingWithAnyTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingWithAnyTest.java
@@ -10,8 +10,8 @@
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Producer;
-import org.scijava.ops.api.Op;
 import org.scijava.ops.engine.AbstractTestEnvironment;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Any;
 import org.scijava.types.TypeExtractor;
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingWithGCSTTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingWithGCSTTest.java
index b4447f95a..0a45aca85 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingWithGCSTTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingWithGCSTTest.java
@@ -7,12 +7,10 @@
 import java.util.function.Function;
 
 import org.junit.Test;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
 import org.scijava.ops.engine.AbstractTestEnvironment;
 import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/monitor/OpMonitorTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/monitor/OpMonitorTest.java
index 2803f15ad..a7da8cf03 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/monitor/OpMonitorTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/monitor/OpMonitorTest.java
@@ -10,11 +10,11 @@
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.scijava.ops.api.Op;
 import org.scijava.ops.engine.AbstractTestEnvironment;
 import org.scijava.ops.engine.OpBuilder;
 import org.scijava.ops.engine.monitor.DefaultOpMonitor;
 import org.scijava.ops.engine.monitor.OpMonitor;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplificationAdaptationTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplificationAdaptationTest.java
index 4e99d24f5..82a0d5afb 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplificationAdaptationTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplificationAdaptationTest.java
@@ -3,11 +3,9 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplificationPriorityTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplificationPriorityTest.java
index 508410954..56fde2e46 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplificationPriorityTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplificationPriorityTest.java
@@ -7,14 +7,12 @@
 import java.util.function.Function;
 
 import org.junit.Test;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
 import org.scijava.ops.engine.AbstractTestEnvironment;
 import org.scijava.ops.engine.OpHints;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
 import org.scijava.ops.engine.conversionLoss.LossReporter;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplifyIOTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplifyIOTest.java
index 1f625c062..b1941f0c2 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplifyIOTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplifyIOTest.java
@@ -8,11 +8,9 @@
 import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplifyTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplifyTest.java
index a01f56dc2..fb111762b 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplifyTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplifyTest.java
@@ -6,11 +6,9 @@
 import java.util.function.BiFunction;
 
 import org.junit.Test;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/OpsAsParametersTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/OpsAsParametersTest.java
index 387952e36..9d80f33f9 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/OpsAsParametersTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/OpsAsParametersTest.java
@@ -6,13 +6,11 @@
 import java.util.function.Function;
 
 import org.junit.Test;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpField;
 import org.scijava.ops.engine.AbstractTestEnvironment;
 import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.api.OpField;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops-engine/templates/main/java/module-info.vm b/scijava/scijava-ops-engine/templates/main/java/module-info.vm
index fc3bb3425..80c1b0a9f 100644
--- a/scijava/scijava-ops-engine/templates/main/java/module-info.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/module-info.vm
@@ -32,7 +32,7 @@ module org.scijava.ops.engine {
 	requires org.scijava;
 	requires org.scijava.function;
 	requires org.scijava.struct;
-	requires org.scijava.ops.api;
+	requires org.scijava.ops.spi;
 	requires org.scijava.ops.discovery;
 	requires org.scijava.types;
 	requires javassist;
diff --git a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/complexLift/ComputersToFunctionsAndLift.vm b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/complexLift/ComputersToFunctionsAndLift.vm
index d6f68eaeb..16abc7012 100644
--- a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/complexLift/ComputersToFunctionsAndLift.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/complexLift/ComputersToFunctionsAndLift.vm
@@ -74,9 +74,9 @@ import java.util.function.Function;
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/complexLift/FunctionsToComputersAndLift.vm b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/complexLift/FunctionsToComputersAndLift.vm
index ff83be5dc..f0391ed15 100644
--- a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/complexLift/FunctionsToComputersAndLift.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/complexLift/FunctionsToComputersAndLift.vm
@@ -40,9 +40,9 @@ import java.util.function.Function;
 import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaFunction.vm b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaFunction.vm
index 30aff0c80..18b74e3a3 100644
--- a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaFunction.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaFunction.vm
@@ -39,9 +39,9 @@ import java.util.function.Function;
 
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaSource.vm b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaSource.vm
index 2e61dcbd1..b7a94614d 100644
--- a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaSource.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/ComputersToFunctionsViaSource.vm
@@ -41,9 +41,9 @@ import org.scijava.Priority;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Producer;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/FunctionsToComputers.vm b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/FunctionsToComputers.vm
index d96d5753e..a2f01bbe2 100644
--- a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/FunctionsToComputers.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/FunctionsToComputers.vm
@@ -40,9 +40,9 @@ import java.util.function.Function;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Producer;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.Op;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/InplacesToFunctions.vm b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/InplacesToFunctions.vm
index 080da72c6..8a18e8521 100644
--- a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/InplacesToFunctions.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/functional/InplacesToFunctions.vm
@@ -40,11 +40,11 @@ import java.util.function.Function;
 import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.Op;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.Op;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.plugin.Plugin;
 
 #set($classArity = $maxArity + 1)
diff --git a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/ComputerToArrays.vm b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/ComputerToArrays.vm
index c975c4698..b4a60d2d6 100644
--- a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/ComputerToArrays.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/ComputerToArrays.vm
@@ -37,10 +37,10 @@ package org.scijava.ops.engine.adapt.lift;
 import java.util.function.Function;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/ComputerToIterables.vm b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/ComputerToIterables.vm
index 87c9ab5b9..5e35f4804 100644
--- a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/ComputerToIterables.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/ComputerToIterables.vm
@@ -38,10 +38,10 @@ import java.util.Iterator;
 import java.util.function.Function;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/FunctionToArrays.vm b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/FunctionToArrays.vm
index 4267b8e78..8ff22b9b5 100644
--- a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/FunctionToArrays.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/FunctionToArrays.vm
@@ -39,10 +39,10 @@ import java.util.function.BiFunction;
 import java.util.function.Function;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/FunctionToIterables.vm b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/FunctionToIterables.vm
index fee5a9e48..edc36df89 100644
--- a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/FunctionToIterables.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/FunctionToIterables.vm
@@ -39,10 +39,10 @@ import java.util.function.BiFunction;
 import java.util.function.Function;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/InplaceToArrays.vm b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/InplaceToArrays.vm
index fb3378d98..16f4b5be2 100644
--- a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/InplaceToArrays.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/adapt/lift/InplaceToArrays.vm
@@ -37,10 +37,10 @@ package org.scijava.ops.engine.adapt.lift;
 import java.util.function.Function;
 
 import org.scijava.function.Inplaces;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpBuilderTestOps.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpBuilderTestOps.vm
index dc47593b1..7cd485890 100644
--- a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpBuilderTestOps.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpBuilderTestOps.vm
@@ -36,10 +36,10 @@ import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpMethodTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpMethodTest.vm
index b86397ba3..7210e6a7f 100644
--- a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpMethodTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpMethodTest.vm
@@ -42,8 +42,8 @@ import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpMethodTestOps.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpMethodTestOps.vm
index 161005fc7..695402590 100644
--- a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpMethodTestOps.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpMethodTestOps.vm
@@ -37,10 +37,10 @@ import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.api.OpDependency;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpMethod;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpDependency;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpMethod;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTestOps.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTestOps.vm
index 85a60749c..45c91561e 100644
--- a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTestOps.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTestOps.vm
@@ -35,10 +35,10 @@
 package org.scijava.ops.engine.adapt.functional;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTestOps.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTestOps.vm
index f150379e3..959e10115 100644
--- a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTestOps.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTestOps.vm
@@ -38,10 +38,10 @@ import java.util.function.BiFunction;
 import java.util.function.Function;
 
 import org.scijava.function.Functions;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/ComputerToArraysTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/ComputerToArraysTest.vm
index a10f07ab0..97cbaf3a2 100644
--- a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/ComputerToArraysTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/ComputerToArraysTest.vm
@@ -37,8 +37,8 @@ package org.scijava.ops.engine.adapt.lift;
 import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Computers;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.ops.engine.AbstractTestEnvironment;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/FunctionToArraysTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/FunctionToArraysTest.vm
index a6d7f2bec..440146c29 100644
--- a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/FunctionToArraysTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/FunctionToArraysTest.vm
@@ -41,10 +41,10 @@ import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Functions;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpCollection;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpCollection;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/InplaceToArraysTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/InplaceToArraysTest.vm
index 349eb80bc..2a8c871e1 100644
--- a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/InplaceToArraysTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/InplaceToArraysTest.vm
@@ -38,8 +38,8 @@ import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.api.OpField;
-import org.scijava.ops.api.OpCollection;
+import org.scijava.ops.spi.OpField;
+import org.scijava.ops.spi.OpCollection;
 import org.scijava.plugin.Plugin;
 
 /**

From 2d59eb15b8143b595ddfb4264127ef1a39d90033 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Mon, 26 Jul 2021 11:44:25 -0500
Subject: [PATCH 83/91] WIP: Partition scijava-ops-api

---
 .../geom2d/LabelRegionToPolygonConverter.java |   2 +-
 .../ops2/geom/geom3d/RAIToMeshConverter.java  |   2 +-
 .../net/imagej/ops2/help/AbstractHelp.java    |   2 +-
 .../net/imagej/ops2/help/HelpForName.java     |   2 +-
 .../MapNeighborhoodWithCenter.java            |   2 +-
 .../net/imagej/ops2/coloc/icq/LiICQTest.java  |   2 +-
 .../coloc/kendallTau/KendallTauBRankTest.java |   2 +-
 .../ops2/coloc/maxTKendallTau/MTKTTest.java   |   2 +-
 .../coloc/pearsons/DefaultPearsonsTest.java   |   2 +-
 .../imagej/ops2/convert/ConvertMapTest.java   |   2 +-
 .../net/imagej/ops2/copy/CopyRAITest.java     |   2 +-
 .../imagej/ops2/create/CreateImgPlusTest.java |   2 +-
 .../net/imagej/ops2/create/CreateImgTest.java |   2 +-
 .../ops2/create/CreateKernelGaborTest.java    |   2 +-
 .../ops2/create/CreateKernelGaussTest.java    |   2 +-
 .../ops2/create/CreateKernelLogTest.java      |   2 +-
 .../ops2/create/CreateLabelingTest.java       |   2 +-
 .../PartialDerivativeFilterTest.java          |   4 +-
 .../filter/hessian/HessianFilterTest.java     |   4 +-
 .../ops2/filter/mean/MeanFilterTest.java      |   4 +-
 .../ops2/filter/sobel/SobelFilterTest.java    |   4 +-
 .../ops2/geom/geom3d/QuickHull3DTest.java     |   4 +-
 .../imagej/ops2/image/ascii/ASCIITest.java    |   4 +-
 .../DefaultDistanceTransformTest.java         |   4 +-
 .../DistanceTransform3DTest.java              |   4 +-
 .../image/histogram/DefaultHistogramTest.java |   4 +-
 .../ops2/image/integral/IntegralImgTest.java  |   4 +-
 .../ops2/image/normalize/NormalizeTest.java   |   4 +-
 .../image/watershed/WatershedBinaryTest.java  |   4 +-
 .../ops2/image/watershed/WatershedTest.java   |   4 +-
 .../ops2/linalg/rotate/Rotate3dTest.java      |   4 +-
 .../ops2/linalg/rotate/Rotate3fTest.java      |   4 +-
 .../ops2/logic/BooleanTypeLogicTest.java      |   4 +-
 .../imagej/ops2/logic/ConditionalTest.java    |   4 +-
 .../ops2/math/UnaryRealTypeMathTest.java      |   4 +-
 .../net/imagej/ops2/project/ProjectTest.java  |   4 +-
 .../ops2/threshold/AbstractThresholdTest.java |   4 +-
 .../ops2/threshold/ComputeThresholdTest.java  |   4 +-
 .../apply/ApplyManualThresholdTest.java       |   4 +-
 .../threshold/apply/LocalThresholdTest.java   |   4 +-
 .../CollapseNumericViewTest.java              |   4 +-
 .../CollapseRealViewTest.java                 |   4 +-
 .../collapseView/CollapseViewTest.java        |   4 +-
 .../concatenateView/ConcatenateViewTest.java  |   4 +-
 .../DropSingletonDimensionsViewTest.java      |   4 +-
 .../ExtendBorderViewTest.java                 |   4 +-
 .../ExtendMirrorDoubleViewTest.java           |   4 +-
 .../ExtendMirrorSingleViewTest.java           |   4 +-
 .../ExtendPeriodicViewTest.java               |   4 +-
 .../ExtendRandomViewTest.java                 |   4 +-
 .../extendValueView/ExtendValueViewTest.java  |   4 +-
 .../transform/extendView/ExtendViewTest.java  |   4 +-
 .../extendZeroView/ExtendZeroViewTest.java    |   4 +-
 .../FlatIterableViewTest.java                 |   4 +-
 .../hyperSliceView/HyperSliceViewTest.java    |   4 +-
 .../interpolateView/InterpolateViewTest.java  |   4 +-
 .../intervalView/IntervalViewTest.java        |   4 +-
 .../invertAxisView/InvertAxisViewTest.java    |   4 +-
 .../transform/offsetView/OffsetViewTest.java  |   4 +-
 .../permuteView/PermuteViewTest.java          |   4 +-
 .../transform/rasterView/RasterViewTest.java  |   4 +-
 .../transform/rotateView/RotateViewTest.java  |   4 +-
 .../transform/shearView/ShearViewTest.java    |   4 +-
 .../transform/stackView/StackViewTest.java    |   4 +-
 .../subsampleView/SubsampleViewTest.java      |   4 +-
 .../translateView/TranslateViewTest.java      |   4 +-
 .../unshearView/UnshearViewTest.java          |   4 +-
 .../zeroMinView/ZeroMinViewTest.java          |   4 +-
 pom.xml                                       |   1 +
 scijava/scijava-ops-api/pom.xml               |  33 +-
 .../src/main/java/module-info.java            |   8 +-
 .../main/java/org/scijava/ops/api}/Hints.java |   4 +-
 .../java/org/scijava/ops/api}/OpBuilder.java  |   4 +-
 .../org/scijava/ops/api}/OpEnvironment.java   |   2 +-
 .../java/org/scijava/ops/api}/OpInfo.java     |   2 +-
 .../main/java/org/scijava/ops/api}/OpRef.java |   3 +-
 scijava/scijava-ops-engine/pom.xml            |   5 +
 .../src/main/java/module-info.java            |   3 +-
 .../org/scijava/ops/engine/OpCandidate.java   |   3 +
 .../scijava/ops/engine/OpInfoGenerator.java   |   2 +
 .../org/scijava/ops/engine/OpService.java     |   2 +
 .../java/org/scijava/ops/engine/OpUtils.java  |   2 +
 .../ops/engine/hint/AbstractHints.java        |   2 +-
 .../ops/engine/hint/AdaptationHints.java      |   2 +-
 .../scijava/ops/engine/hint/DefaultHints.java |   2 +-
 .../ops/engine/hint/ImmutableHints.java       |   2 +-
 .../ops/engine/hint/SimplificationHints.java  |   2 +-
 .../ops/engine/impl/DefaultOpEnvironment.java |   8 +-
 .../ops/engine/impl/DefaultOpService.java     |   4 +-
 .../ops/engine/impl/MatchingConditions.java   |   4 +-
 .../impl/PluginBasedClassOpInfoGenerator.java |   2 +-
 .../PluginBasedOpCollectionInfoGenerator.java |   2 +-
 .../matcher/DependencyMatchingException.java  |   2 +-
 .../ops/engine/matcher/MatchingResult.java    |   2 +-
 .../scijava/ops/engine/matcher/OpMatcher.java |   6 +-
 .../engine/matcher/OpMatchingException.java   |   2 +-
 .../engine/matcher/impl/DefaultOpMatcher.java |   8 +-
 .../ops/engine/matcher/impl/DefaultOpRef.java |   2 +-
 .../engine/matcher/impl/OpAdaptationInfo.java |   4 +-
 .../ops/engine/matcher/impl/OpClassInfo.java  |   4 +-
 .../ops/engine/matcher/impl/OpFieldInfo.java  |   4 +-
 .../ops/engine/matcher/impl/OpMethodInfo.java |   4 +-
 .../ops/engine/simplify/ChainCluster.java     |   2 +-
 .../simplify/InfoSimplificationGenerator.java |   8 +-
 .../ops/engine/simplify/MutatorChain.java     |   2 +-
 .../simplify/SimplificationMetadata.java      |   4 +-
 .../engine/simplify/SimplificationUtils.java  |   6 +-
 .../ops/engine/simplify/SimplifiedOpInfo.java |   6 +-
 .../ops/engine/simplify/SimplifiedOpRef.java  |   9 +
 .../engine/struct/JavadocParameterData.java   |   2 +-
 .../ops/engine/JavadocParameterTest.java      |   2 +-
 .../ops/engine/OpBuilderNoOutputTest.java     |   2 +-
 .../scijava/ops/engine/OpEnvironmentTest.java |   4 +-
 .../adapt/OpAdaptationPriorityTest.java       |   2 +-
 .../ComputerToFunctionIterablesTest.java      |   2 +-
 .../FunctionToComputerIterablesTest.java      |   2 +-
 .../ComputerToFunctionAdaptTest.java          |   2 +-
 .../FunctionToComputerAdaptTest.java          |   2 +-
 .../InplaceToFunctionAdaptTest.java           |   2 +-
 .../adapt/lift/ComputerToIterablesTest.java   |   2 +-
 .../adapt/lift/FunctionToIterablesTest.java   |   2 +-
 .../ops/engine/hints/AdaptationHintTest.java  |   2 +-
 .../engine/hints/SimplificationHintTest.java  |   2 +-
 .../ops/engine/impl/OpCachingTest.java        |   4 +
 .../engine/matcher/MatchingWithGCSTTest.java  |   2 +-
 .../ops/engine/matcher/OpWrappersTest.java    |   2 +-
 .../ops/engine/monitor/OpMonitorTest.java     |   2 +-
 .../scijava/ops/engine/stats/MeanTest.java    |   2 +-
 .../ops/engine/util/ComputersTest.java        |   2 +-
 .../ops/engine/util/FunctionsTest.java        |   2 +-
 .../scijava/ops/engine/util/InplacesTest.java |   2 +-
 .../org/scijava/ops/engine/util/LiftTest.java |   2 +-
 .../ops/engine/util/OpsAsParametersTest.java  |   2 +-
 .../templates/main/java/module-info.vm        |   3 +-
 .../org/scijava/ops/engine/OpBuilder.list     | 131 ----
 .../java/org/scijava/ops/engine/OpBuilder.vm  | 676 ------------------
 .../ComputerToFunctionIterablesTest.vm        |   2 +-
 .../FunctionToComputerIterablesTest.vm        |   2 +-
 .../functional/ComputerToFunctionAdaptTest.vm |   2 +-
 .../functional/FunctionToComputerAdaptTest.vm |   2 +-
 .../functional/InplaceToFunctionAdaptTest.vm  |   2 +-
 .../adapt/lift/ComputerToIterablesTest.vm     |   2 +-
 .../adapt/lift/FunctionToIterablesTest.vm     |   2 +-
 .../ops/engine/matcher/OpWrappersTest.vm      |   2 +-
 scijava/scijava-ops-spi/.gitignore            |   2 +
 scijava/scijava-ops-spi/LICENSE.txt           |  24 +
 scijava/scijava-ops-spi/README.md             |  12 +
 scijava/scijava-ops-spi/bin/generate.groovy   | 238 ++++++
 scijava/scijava-ops-spi/pom.xml               | 119 +++
 .../src/main/java/module-info.java            |   7 +
 .../src/main/java/org/scijava/ops/spi/Op.java |   0
 .../org/scijava/ops/spi/OpCollection.java     |   0
 .../org/scijava/ops/spi/OpDependency.java     |   0
 .../java/org/scijava/ops/spi/OpField.java     |   0
 .../java/org/scijava/ops/spi/OpMethod.java    |   0
 155 files changed, 667 insertions(+), 1030 deletions(-)
 rename scijava/{scijava-ops-engine/src/main/java/org/scijava/ops/engine => scijava-ops-api/src/main/java/org/scijava/ops/api}/Hints.java (91%)
 rename scijava/{scijava-ops-engine/src/main/java/org/scijava/ops/engine => scijava-ops-api/src/main/java/org/scijava/ops/api}/OpBuilder.java (99%)
 rename scijava/{scijava-ops-engine/src/main/java/org/scijava/ops/engine => scijava-ops-api/src/main/java/org/scijava/ops/api}/OpEnvironment.java (99%)
 rename scijava/{scijava-ops-engine/src/main/java/org/scijava/ops/engine => scijava-ops-api/src/main/java/org/scijava/ops/api}/OpInfo.java (98%)
 rename scijava/{scijava-ops-engine/src/main/java/org/scijava/ops/engine => scijava-ops-api/src/main/java/org/scijava/ops/api}/OpRef.java (98%)
 delete mode 100644 scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/OpBuilder.list
 delete mode 100644 scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/OpBuilder.vm
 create mode 100644 scijava/scijava-ops-spi/.gitignore
 create mode 100644 scijava/scijava-ops-spi/LICENSE.txt
 create mode 100644 scijava/scijava-ops-spi/README.md
 create mode 100644 scijava/scijava-ops-spi/bin/generate.groovy
 create mode 100644 scijava/scijava-ops-spi/pom.xml
 create mode 100644 scijava/scijava-ops-spi/src/main/java/module-info.java
 rename scijava/{scijava-ops-api => scijava-ops-spi}/src/main/java/org/scijava/ops/spi/Op.java (100%)
 rename scijava/{scijava-ops-api => scijava-ops-spi}/src/main/java/org/scijava/ops/spi/OpCollection.java (100%)
 rename scijava/{scijava-ops-api => scijava-ops-spi}/src/main/java/org/scijava/ops/spi/OpDependency.java (100%)
 rename scijava/{scijava-ops-api => scijava-ops-spi}/src/main/java/org/scijava/ops/spi/OpField.java (100%)
 rename scijava/{scijava-ops-api => scijava-ops-spi}/src/main/java/org/scijava/ops/spi/OpMethod.java (100%)

diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/LabelRegionToPolygonConverter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/LabelRegionToPolygonConverter.java
index 5eb7dbf4e..3b1321122 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/LabelRegionToPolygonConverter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/LabelRegionToPolygonConverter.java
@@ -41,7 +41,7 @@
 import org.scijava.convert.AbstractConverter;
 import org.scijava.convert.ConversionRequest;
 import org.scijava.convert.Converter;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.ops.engine.OpService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/RAIToMeshConverter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/RAIToMeshConverter.java
index a63fad96a..51e79aeca 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/RAIToMeshConverter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/RAIToMeshConverter.java
@@ -41,7 +41,7 @@
 import org.scijava.convert.AbstractConverter;
 import org.scijava.convert.ConversionRequest;
 import org.scijava.convert.Converter;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.ops.engine.OpService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/AbstractHelp.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/AbstractHelp.java
index c3f637192..67bfc9f49 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/AbstractHelp.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/AbstractHelp.java
@@ -33,8 +33,8 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.scijava.ops.api.OpInfo;
 import org.scijava.ops.engine.OpCandidate;
-import org.scijava.ops.engine.OpInfo;
 import org.scijava.ops.engine.OpUtils;
 
 /**
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java
index 3b4375298..34d664e0d 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java
@@ -32,7 +32,7 @@
 import java.util.function.BiFunction;
 
 import org.scijava.Priority;
-import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.api.OpInfo;
 import org.scijava.ops.engine.OpService;
 import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java
index 37111495e..aab5d22a7 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java
@@ -40,7 +40,7 @@
 
 import org.scijava.Priority;
 import org.scijava.function.Computers;
-import org.scijava.ops.engine.OpEnvironment;
+import org.scijava.ops.api.OpEnvironment;
 import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/icq/LiICQTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/icq/LiICQTest.java
index 2f2247ff2..290e88c79 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/icq/LiICQTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/icq/LiICQTest.java
@@ -44,7 +44,7 @@
 import net.imglib2.type.numeric.real.FloatType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.thread.ThreadService;
 import org.scijava.types.Nil;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRankTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRankTest.java
index 7d583d51d..59e04b20b 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRankTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRankTest.java
@@ -50,7 +50,7 @@
 import net.imglib2.util.Pair;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.thread.ThreadService;
 import org.scijava.types.Nil;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/maxTKendallTau/MTKTTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/maxTKendallTau/MTKTTest.java
index be038ccdf..4ff2c3792 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/maxTKendallTau/MTKTTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/maxTKendallTau/MTKTTest.java
@@ -47,7 +47,7 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.thread.ThreadService;
 import org.scijava.types.Nil;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/pearsons/DefaultPearsonsTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/pearsons/DefaultPearsonsTest.java
index b16b80eed..5f349990e 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/pearsons/DefaultPearsonsTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/pearsons/DefaultPearsonsTest.java
@@ -40,7 +40,7 @@
 import net.imglib2.type.numeric.real.FloatType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.thread.ThreadService;
 import org.scijava.types.Nil;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/convert/ConvertMapTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/convert/ConvertMapTest.java
index f1b5d6d60..f67f239d0 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/convert/ConvertMapTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/convert/ConvertMapTest.java
@@ -42,7 +42,7 @@
 import net.imglib2.util.Intervals;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 
 /**
  * Tests that the {@code convert} ops work on {@link Img} objects via
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyRAITest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyRAITest.java
index 601323602..7e88574f2 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyRAITest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyRAITest.java
@@ -49,7 +49,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.util.MersenneTwisterFast;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgPlusTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgPlusTest.java
index 351f3289e..d75113a8f 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgPlusTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgPlusTest.java
@@ -42,7 +42,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgTest.java
index 26db2a63b..33f60b3ef 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgTest.java
@@ -59,7 +59,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.util.MersenneTwisterFast;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaborTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaborTest.java
index f17979b9b..5e373c5fc 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaborTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaborTest.java
@@ -43,7 +43,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaussTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaussTest.java
index e3fc0b385..09cb326aa 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaussTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaussTest.java
@@ -39,7 +39,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelLogTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelLogTest.java
index fbeb2e5a8..7c8b78837 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelLogTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelLogTest.java
@@ -39,7 +39,7 @@
 import net.imglib2.type.numeric.real.DoubleType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateLabelingTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateLabelingTest.java
index 1c78e4954..6450e284c 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateLabelingTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateLabelingTest.java
@@ -47,7 +47,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.util.MersenneTwisterFast;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/derivative/PartialDerivativeFilterTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/derivative/PartialDerivativeFilterTest.java
index fc184a5a9..0be80d2b0 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/derivative/PartialDerivativeFilterTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/derivative/PartialDerivativeFilterTest.java
@@ -43,8 +43,8 @@
 import net.imglib2.view.composite.RealComposite;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/hessian/HessianFilterTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/hessian/HessianFilterTest.java
index f376db930..a355312b0 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/hessian/HessianFilterTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/hessian/HessianFilterTest.java
@@ -42,8 +42,8 @@
 import net.imglib2.view.composite.RealComposite;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/mean/MeanFilterTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/mean/MeanFilterTest.java
index be73bb674..4ed1cd1bf 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/mean/MeanFilterTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/mean/MeanFilterTest.java
@@ -10,8 +10,8 @@
 import net.imglib2.type.numeric.integer.ByteType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 public class MeanFilterTest extends AbstractOpTest{
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/sobel/SobelFilterTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/sobel/SobelFilterTest.java
index 7a4089b35..7fe3b7c11 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/sobel/SobelFilterTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/sobel/SobelFilterTest.java
@@ -40,8 +40,8 @@
 import net.imglib2.util.Util;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/geom3d/QuickHull3DTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/geom3d/QuickHull3DTest.java
index c39726e68..24906e8cd 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/geom3d/QuickHull3DTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/geom3d/QuickHull3DTest.java
@@ -44,8 +44,8 @@
 
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 
 /**
  * This class tests the {@link DefaultConvexHull3D} implementation. The number
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/ascii/ASCIITest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/ascii/ASCIITest.java
index 6eec972b3..074c49439 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/ascii/ASCIITest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/ascii/ASCIITest.java
@@ -38,8 +38,8 @@
 import net.imglib2.util.Pair;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformTest.java
index 8d7384038..6d40405f8 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformTest.java
@@ -39,8 +39,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.types.Nil;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.thread.ThreadService;
 import org.scijava.util.MersenneTwisterFast;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DistanceTransform3DTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DistanceTransform3DTest.java
index eb203ee43..fabb7f56a 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DistanceTransform3DTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DistanceTransform3DTest.java
@@ -39,8 +39,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.types.Nil;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.thread.ThreadService;
 import org.scijava.util.MersenneTwisterFast;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/histogram/DefaultHistogramTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/histogram/DefaultHistogramTest.java
index 34b90813c..ae0342efb 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/histogram/DefaultHistogramTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/histogram/DefaultHistogramTest.java
@@ -9,8 +9,8 @@
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/integral/IntegralImgTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/integral/IntegralImgTest.java
index 6e6cdafc0..3f0b270d5 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/integral/IntegralImgTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/integral/IntegralImgTest.java
@@ -49,8 +49,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/normalize/NormalizeTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/normalize/NormalizeTest.java
index 590120fea..dd635f0c0 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/normalize/NormalizeTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/normalize/NormalizeTest.java
@@ -41,8 +41,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedBinaryTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedBinaryTest.java
index e80d0dd31..dab997b8d 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedBinaryTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedBinaryTest.java
@@ -46,8 +46,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.types.Nil;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.thread.ThreadService;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedTest.java
index f546c871c..07a10506e 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedTest.java
@@ -51,8 +51,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.thread.ThreadService;
 import org.scijava.types.Nil;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3dTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3dTest.java
index e236e3226..68272d780 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3dTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3dTest.java
@@ -39,8 +39,8 @@
 import org.joml.Quaterniondc;
 import org.joml.Vector3d;
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 
 /**
  * Tests for {@link Rotate3d}.
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3fTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3fTest.java
index 302e07b8e..2a568624a 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3fTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3fTest.java
@@ -39,8 +39,8 @@
 import org.joml.Quaternionfc;
 import org.joml.Vector3f;
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 
 /**
  * Tests for {@link Rotate3f}.
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/BooleanTypeLogicTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/BooleanTypeLogicTest.java
index ecc7e7090..127d92c48 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/BooleanTypeLogicTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/BooleanTypeLogicTest.java
@@ -36,8 +36,8 @@
 import net.imglib2.type.logic.BitType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 
 /**
  * Tests {@link BooleanTypeLogic}.
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/ConditionalTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/ConditionalTest.java
index 3428022b7..a51f4dac9 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/ConditionalTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/ConditionalTest.java
@@ -36,8 +36,8 @@
 import net.imglib2.type.numeric.integer.ByteType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 
 /**
  * Tests {@link Ternary} and {@link Default}.
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/math/UnaryRealTypeMathTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/math/UnaryRealTypeMathTest.java
index 52623a98a..a341d608a 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/math/UnaryRealTypeMathTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/math/UnaryRealTypeMathTest.java
@@ -41,8 +41,8 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/project/ProjectTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/project/ProjectTest.java
index 54800651a..6c730ef0f 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/project/ProjectTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/project/ProjectTest.java
@@ -40,8 +40,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 public class ProjectTest extends AbstractOpTest {
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/AbstractThresholdTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/AbstractThresholdTest.java
index ba3a2f485..02a247ab8 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/AbstractThresholdTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/AbstractThresholdTest.java
@@ -46,8 +46,8 @@
 import net.imglib2.type.numeric.integer.UnsignedShortType;
 
 import org.junit.jupiter.api.BeforeEach;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.util.ListUtils;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/ComputeThresholdTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/ComputeThresholdTest.java
index b091feb70..4ff98080e 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/ComputeThresholdTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/ComputeThresholdTest.java
@@ -35,8 +35,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/ApplyManualThresholdTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/ApplyManualThresholdTest.java
index e7d2a9450..eadcd1f17 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/ApplyManualThresholdTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/ApplyManualThresholdTest.java
@@ -39,8 +39,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/LocalThresholdTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/LocalThresholdTest.java
index 6974e6a74..4169517f2 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/LocalThresholdTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/LocalThresholdTest.java
@@ -77,8 +77,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Computers;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseNumericView/CollapseNumericViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseNumericView/CollapseNumericViewTest.java
index 3565f9064..30af059ea 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseNumericView/CollapseNumericViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseNumericView/CollapseNumericViewTest.java
@@ -45,8 +45,8 @@
 import net.imglib2.view.composite.NumericComposite;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseRealView/CollapseRealViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseRealView/CollapseRealViewTest.java
index 0ce2b333d..315625585 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseRealView/CollapseRealViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseRealView/CollapseRealViewTest.java
@@ -45,8 +45,8 @@
 import net.imglib2.view.composite.RealComposite;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseView/CollapseViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseView/CollapseViewTest.java
index fd5d3ee57..40ee07c8e 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseView/CollapseViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseView/CollapseViewTest.java
@@ -44,8 +44,8 @@
 import net.imglib2.view.composite.GenericComposite;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/concatenateView/ConcatenateViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/concatenateView/ConcatenateViewTest.java
index 4b6449988..60f7b55ce 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/concatenateView/ConcatenateViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/concatenateView/ConcatenateViewTest.java
@@ -49,8 +49,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.util.MersenneTwisterFast;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/dropSingleDimensionsView/DropSingletonDimensionsViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/dropSingleDimensionsView/DropSingletonDimensionsViewTest.java
index 8f5a4518d..7a100109f 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/dropSingleDimensionsView/DropSingletonDimensionsViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/dropSingleDimensionsView/DropSingletonDimensionsViewTest.java
@@ -40,8 +40,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendBorderView/ExtendBorderViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendBorderView/ExtendBorderViewTest.java
index 842d00181..131b3562f 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendBorderView/ExtendBorderViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendBorderView/ExtendBorderViewTest.java
@@ -42,8 +42,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorDoubleView/ExtendMirrorDoubleViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorDoubleView/ExtendMirrorDoubleViewTest.java
index 0bad3642c..e5ea1b32d 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorDoubleView/ExtendMirrorDoubleViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorDoubleView/ExtendMirrorDoubleViewTest.java
@@ -42,8 +42,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorSingleView/ExtendMirrorSingleViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorSingleView/ExtendMirrorSingleViewTest.java
index dc390b8fc..58e0c49c0 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorSingleView/ExtendMirrorSingleViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorSingleView/ExtendMirrorSingleViewTest.java
@@ -42,8 +42,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendPeriodicView/ExtendPeriodicViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendPeriodicView/ExtendPeriodicViewTest.java
index 69c51bd45..6c4805709 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendPeriodicView/ExtendPeriodicViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendPeriodicView/ExtendPeriodicViewTest.java
@@ -42,8 +42,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendRandomView/ExtendRandomViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendRandomView/ExtendRandomViewTest.java
index c6ba76881..e74904f7a 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendRandomView/ExtendRandomViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendRandomView/ExtendRandomViewTest.java
@@ -41,8 +41,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendValueView/ExtendValueViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendValueView/ExtendValueViewTest.java
index fea9fc72e..af1f21c35 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendValueView/ExtendValueViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendValueView/ExtendValueViewTest.java
@@ -42,8 +42,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendView/ExtendViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendView/ExtendViewTest.java
index 5080e83ef..c413d9d78 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendView/ExtendViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendView/ExtendViewTest.java
@@ -44,8 +44,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendZeroView/ExtendZeroViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendZeroView/ExtendZeroViewTest.java
index 5b21b898d..788dbd3eb 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendZeroView/ExtendZeroViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendZeroView/ExtendZeroViewTest.java
@@ -42,8 +42,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/flatIterableView/FlatIterableViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/flatIterableView/FlatIterableViewTest.java
index 08a6f2c3d..50d6c32cb 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/flatIterableView/FlatIterableViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/flatIterableView/FlatIterableViewTest.java
@@ -42,8 +42,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/hyperSliceView/HyperSliceViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/hyperSliceView/HyperSliceViewTest.java
index 856bfaa1f..aabdfdcb7 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/hyperSliceView/HyperSliceViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/hyperSliceView/HyperSliceViewTest.java
@@ -42,8 +42,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/interpolateView/InterpolateViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/interpolateView/InterpolateViewTest.java
index 6f2ee32b6..99c987506 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/interpolateView/InterpolateViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/interpolateView/InterpolateViewTest.java
@@ -43,8 +43,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.util.MersenneTwisterFast;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/intervalView/IntervalViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/intervalView/IntervalViewTest.java
index cce68c444..25975fec5 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/intervalView/IntervalViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/intervalView/IntervalViewTest.java
@@ -45,8 +45,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.util.MersenneTwisterFast;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/invertAxisView/InvertAxisViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/invertAxisView/InvertAxisViewTest.java
index 0ca8f4f7e..26e537d1b 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/invertAxisView/InvertAxisViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/invertAxisView/InvertAxisViewTest.java
@@ -43,8 +43,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/offsetView/OffsetViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/offsetView/OffsetViewTest.java
index a07bae50f..af4ff90ad 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/offsetView/OffsetViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/offsetView/OffsetViewTest.java
@@ -46,8 +46,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/permuteView/PermuteViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/permuteView/PermuteViewTest.java
index 728e81251..dfa16188e 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/permuteView/PermuteViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/permuteView/PermuteViewTest.java
@@ -49,8 +49,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.util.MersenneTwisterFast;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rasterView/RasterViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rasterView/RasterViewTest.java
index 5f21a2469..6a45bfcfd 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rasterView/RasterViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rasterView/RasterViewTest.java
@@ -44,8 +44,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.util.MersenneTwisterFast;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rotateView/RotateViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rotateView/RotateViewTest.java
index 63ffcc8fb..81129ed46 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rotateView/RotateViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rotateView/RotateViewTest.java
@@ -43,8 +43,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/shearView/ShearViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/shearView/ShearViewTest.java
index 94145d598..fb6e341a5 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/shearView/ShearViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/shearView/ShearViewTest.java
@@ -45,8 +45,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/stackView/StackViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/stackView/StackViewTest.java
index dbac38ba0..c023e7950 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/stackView/StackViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/stackView/StackViewTest.java
@@ -44,8 +44,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/subsampleView/SubsampleViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/subsampleView/SubsampleViewTest.java
index 011e28827..bc8500026 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/subsampleView/SubsampleViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/subsampleView/SubsampleViewTest.java
@@ -48,8 +48,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 import org.scijava.util.MersenneTwisterFast;
 
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/translateView/TranslateViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/translateView/TranslateViewTest.java
index c9bc51d93..d1e94e33f 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/translateView/TranslateViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/translateView/TranslateViewTest.java
@@ -46,8 +46,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/unshearView/UnshearViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/unshearView/UnshearViewTest.java
index c9db839f8..e8f680ee1 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/unshearView/UnshearViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/unshearView/UnshearViewTest.java
@@ -45,8 +45,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Functions;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/zeroMinView/ZeroMinViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/zeroMinView/ZeroMinViewTest.java
index 72e1b21db..a6f00b768 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/zeroMinView/ZeroMinViewTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/zeroMinView/ZeroMinViewTest.java
@@ -41,8 +41,8 @@
 import net.imglib2.view.Views;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/pom.xml b/pom.xml
index 2e1b84818..644d5e889 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,7 @@
 		<module>scijava/scijava-ops-api</module>
 		<module>scijava/scijava-ops-discovery</module>
 		<module>scijava/scijava-ops-engine</module>
+		<module>scijava/scijava-ops-spi</module>
 		<module>scijava/scijava-struct</module>
 		<module>scijava/scijava-taglets</module>
 		<module>scijava/scijava-testutil</module>
diff --git a/scijava/scijava-ops-api/pom.xml b/scijava/scijava-ops-api/pom.xml
index 999e8478b..a2dcc7d9e 100644
--- a/scijava/scijava-ops-api/pom.xml
+++ b/scijava/scijava-ops-api/pom.xml
@@ -11,11 +11,11 @@
 		<relativePath>../..</relativePath>
 	</parent>
 
-	<artifactId>scijava-ops-spi</artifactId>
+	<artifactId>scijava-ops-api</artifactId>
 
-	<name>SciJava Ops SPI</name>
-	<description>SciJava Operations SPI: service descriptors used by the SciJava Operations framework.</description>
-	<url>https://github.com/scijava/scijava-ops-spi</url>
+	<name>SciJava Ops API</name>
+	<description>SciJava Operations API: Outward-facing Interfaces used by the SciJava Operations framework.</description>
+	<url>https://github.com/scijava/scijava-ops-api</url>
 	<inceptionYear>2021</inceptionYear>
 	<organization>
 		<name>SciJava</name>
@@ -78,7 +78,7 @@
 	<mailingLists>
 		<mailingList>
 			<name>Image.sc Forum</name>
-			<archive>https://forum.image.sc/tags/scijava-ops-spi</archive>
+			<archive>https://forum.image.sc/tags/scijava-ops-api</archive>
 		</mailingList>
 	</mailingLists>
 
@@ -90,7 +90,7 @@
 	</scm>
 	<issueManagement>
 		<system>GitHub Issues</system>
-		<url>https://github.com/scijava/scijava-ops-spi/issues</url>
+		<url>https://github.com/scijava/scijava-ops-api/issues</url>
 	</issueManagement>
 	<ciManagement>
 		<system>Travis CI</system>
@@ -98,20 +98,31 @@
 	</ciManagement>
 
 	<properties>
-		<main-class>org.scijava.ops.spi.Main</main-class>
-		<package-name>org.scijava.ops.spi</package-name>
+		<main-class>org.scijava.ops.api.Main</main-class>
+		<package-name>org.scijava.ops.api</package-name>
 
 		<license.licenseName>bsd_2</license.licenseName>
 		<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
 		<!--  <enforcer.skip>true</enforcer.skip>-->
-		<scijava-ops-spi.allowedDuplicateClasses>${scijava.allowedDuplicateClasses},com.github.therapi.runtimejavadoc.repack.com.eclipsesource.json.*</scijava-ops-spi.allowedDuplicateClasses>
-		<allowedDuplicateClasses>${scijava-ops-spi.allowedDuplicateClasses}</allowedDuplicateClasses>
+		<scijava-ops-api.allowedDuplicateClasses>${scijava.allowedDuplicateClasses},com.github.therapi.runtimejavadoc.repack.com.eclipsesource.json.*</scijava-ops-api.allowedDuplicateClasses>
+		<allowedDuplicateClasses>${scijava-ops-api.allowedDuplicateClasses}</allowedDuplicateClasses>
 	</properties>
 	<dependencies>
 		<!-- SciJava dependencies -->
 		<dependency>
 			<groupId>org.scijava</groupId>
-			<artifactId>scijava-common</artifactId>
+			<artifactId>scijava-function</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.scijava</groupId>
+			<artifactId>scijava-struct</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.scijava</groupId>
+			<artifactId>scijava-types</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 
 		<!-- Test scope dependencies -->
diff --git a/scijava/scijava-ops-api/src/main/java/module-info.java b/scijava/scijava-ops-api/src/main/java/module-info.java
index bca1c6d6f..be84f06f5 100644
--- a/scijava/scijava-ops-api/src/main/java/module-info.java
+++ b/scijava/scijava-ops-api/src/main/java/module-info.java
@@ -1,7 +1,9 @@
-module org.scijava.ops.spi {
+module org.scijava.ops.api {
 
-	exports org.scijava.ops.spi;
+	exports org.scijava.ops.api;
 
-	requires org.scijava;
+	requires org.scijava.function;
+	requires org.scijava.struct;
+	requires org.scijava.types;
 
 }
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/Hints.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/Hints.java
similarity index 91%
rename from scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/Hints.java
rename to scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/Hints.java
index 01a38c8e9..25df129df 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/Hints.java
+++ b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/Hints.java
@@ -1,12 +1,10 @@
 
-package org.scijava.ops.engine;
+package org.scijava.ops.api;
 
 import java.util.Deque;
 import java.util.Map;
 import java.util.UUID;
 
-import org.scijava.ops.engine.BaseOpHints.Simplification;
-
 /**
  * A basic interface for storing and accessing Hints. The general structure for a Hint is
  * <p>
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpBuilder.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpBuilder.java
similarity index 99%
rename from scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpBuilder.java
rename to scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpBuilder.java
index e895c59db..a4fed7a1b 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpBuilder.java
+++ b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpBuilder.java
@@ -32,7 +32,7 @@
 * corresponding template in templates/ and rerun bin/generate.groovy.
 */
 
-package org.scijava.ops.engine;
+package org.scijava.ops.api;
 
 import java.lang.reflect.Type;
 import java.util.function.BiFunction;
@@ -42,6 +42,8 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
+import org.scijava.ops.api.Hints;
+import org.scijava.ops.api.OpEnvironment;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
 
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpEnvironment.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpEnvironment.java
similarity index 99%
rename from scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpEnvironment.java
rename to scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpEnvironment.java
index 101fe0d40..c19c785e3 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpEnvironment.java
+++ b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpEnvironment.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops.engine;
+package org.scijava.ops.api;
 
 import java.lang.reflect.Type;
 
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpInfo.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpInfo.java
similarity index 98%
rename from scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpInfo.java
rename to scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpInfo.java
index fe609b5de..bce57d2e5 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpInfo.java
+++ b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpInfo.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops.engine;
+package org.scijava.ops.api;
 
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Type;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpRef.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpRef.java
similarity index 98%
rename from scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpRef.java
rename to scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpRef.java
index 71d958c65..941e024c5 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpRef.java
+++ b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpRef.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops.engine;
+package org.scijava.ops.api;
 
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
@@ -35,7 +35,6 @@
 import java.util.Map;
 import java.util.Objects;
 
-import org.scijava.ops.engine.matcher.OpMatcher;
 import org.scijava.types.Types;
 
 /**
diff --git a/scijava/scijava-ops-engine/pom.xml b/scijava/scijava-ops-engine/pom.xml
index 7a132c32e..e75637771 100644
--- a/scijava/scijava-ops-engine/pom.xml
+++ b/scijava/scijava-ops-engine/pom.xml
@@ -123,6 +123,11 @@
 			<artifactId>scijava-common</artifactId>
 		</dependency>
 		-->
+		<dependency>
+			<groupId>org.scijava</groupId>
+			<artifactId>scijava-ops-api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.scijava</groupId>
 			<artifactId>scijava-ops-spi</artifactId>
diff --git a/scijava/scijava-ops-engine/src/main/java/module-info.java b/scijava/scijava-ops-engine/src/main/java/module-info.java
index b41fdc6d6..a1584260f 100644
--- a/scijava/scijava-ops-engine/src/main/java/module-info.java
+++ b/scijava/scijava-ops-engine/src/main/java/module-info.java
@@ -41,8 +41,9 @@
 	requires org.scijava;
 	requires org.scijava.function;
 	requires org.scijava.struct;
-	requires org.scijava.ops.spi;
+	requires org.scijava.ops.api;
 	requires org.scijava.ops.discovery;
+	requires org.scijava.ops.spi;
 	requires org.scijava.types;
 	requires javassist;
 	requires java.compiler;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpCandidate.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpCandidate.java
index 6cc65cb4a..53dac7563 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpCandidate.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpCandidate.java
@@ -35,6 +35,9 @@
 import java.util.Map;
 
 import org.scijava.ValidityProblem;
+import org.scijava.ops.api.OpEnvironment;
+import org.scijava.ops.api.OpInfo;
+import org.scijava.ops.api.OpRef;
 import org.scijava.ops.engine.matcher.OpMatcher;
 import org.scijava.struct.Member;
 import org.scijava.struct.Struct;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpInfoGenerator.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpInfoGenerator.java
index 1070a097b..0544efd3d 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpInfoGenerator.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpInfoGenerator.java
@@ -2,6 +2,8 @@
 
 import java.util.List;
 
+import org.scijava.ops.api.OpInfo;
+
 public interface OpInfoGenerator {
 
 	List<OpInfo> generateInfos();
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpService.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpService.java
index a263bf57d..e55b654d6 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpService.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpService.java
@@ -29,6 +29,8 @@
 
 package org.scijava.ops.engine;
 
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpEnvironment;
 import org.scijava.service.SciJavaService;
 
 /**
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpUtils.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpUtils.java
index bfc099e4d..7115aef49 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpUtils.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpUtils.java
@@ -38,6 +38,8 @@
 import java.util.stream.Collectors;
 
 import org.scijava.ValidityProblem;
+import org.scijava.ops.api.OpInfo;
+import org.scijava.ops.api.OpRef;
 import org.scijava.ops.engine.OpCandidate.StatusCode;
 import org.scijava.struct.Member;
 import org.scijava.struct.MemberInstance;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/AbstractHints.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/AbstractHints.java
index 6db8e1772..4da3db725 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/AbstractHints.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/AbstractHints.java
@@ -5,7 +5,7 @@
 import java.util.NoSuchElementException;
 import java.util.UUID;
 
-import org.scijava.ops.engine.Hints;
+import org.scijava.ops.api.Hints;
 
 /**
  * Abstract class containing behavior common to most {@link Hints}
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/AdaptationHints.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/AdaptationHints.java
index 1f830a418..5c21613b4 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/AdaptationHints.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/AdaptationHints.java
@@ -5,7 +5,7 @@
 import java.util.Map;
 import java.util.UUID;
 
-import org.scijava.ops.engine.Hints;
+import org.scijava.ops.api.Hints;
 import org.scijava.ops.engine.BaseOpHints.Adaptation;
 
 /**
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/DefaultHints.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/DefaultHints.java
index d34150a8d..705217712 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/DefaultHints.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/DefaultHints.java
@@ -4,10 +4,10 @@
 import java.util.Map;
 import java.util.UUID;
 
+import org.scijava.ops.api.Hints;
 import org.scijava.ops.engine.BaseOpHints.Adaptation;
 import org.scijava.ops.engine.BaseOpHints.DependencyMatching;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
-import org.scijava.ops.engine.Hints;
 
 /**
  * Default Implementation of {@link Hints}
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/ImmutableHints.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/ImmutableHints.java
index e8567ef89..2eebad906 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/ImmutableHints.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/ImmutableHints.java
@@ -4,7 +4,7 @@
 import java.util.Map;
 import java.util.UUID;
 
-import org.scijava.ops.engine.Hints;
+import org.scijava.ops.api.Hints;
 
 /**
  * A {@link Hints} not modifiable after creation.
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/SimplificationHints.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/SimplificationHints.java
index 2edd58d36..e87468a94 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/SimplificationHints.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/hint/SimplificationHints.java
@@ -5,7 +5,7 @@
 import java.util.Map;
 import java.util.UUID;
 
-import org.scijava.ops.engine.Hints;
+import org.scijava.ops.api.Hints;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
 
 public class SimplificationHints extends AbstractHints {
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpEnvironment.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpEnvironment.java
index ab9282192..be2ee0764 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpEnvironment.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpEnvironment.java
@@ -48,20 +48,20 @@
 
 import org.scijava.Priority;
 import org.scijava.log.LogService;
+import org.scijava.ops.api.Hints;
+import org.scijava.ops.api.OpEnvironment;
+import org.scijava.ops.api.OpInfo;
+import org.scijava.ops.api.OpRef;
 import org.scijava.ops.discovery.Discoverer;
 import org.scijava.ops.engine.BaseOpHints.Adaptation;
 import org.scijava.ops.engine.BaseOpHints.DependencyMatching;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
-import org.scijava.ops.engine.Hints;
 import org.scijava.ops.engine.OpCandidate;
 import org.scijava.ops.engine.OpCandidate.StatusCode;
 import org.scijava.ops.engine.OpDependencyMember;
-import org.scijava.ops.engine.OpEnvironment;
 import org.scijava.ops.engine.OpHistoryService;
-import org.scijava.ops.engine.OpInfo;
 import org.scijava.ops.engine.OpInfoGenerator;
 import org.scijava.ops.engine.OpInstance;
-import org.scijava.ops.engine.OpRef;
 import org.scijava.ops.engine.OpWrapper;
 import org.scijava.ops.engine.hint.AdaptationHints;
 import org.scijava.ops.engine.hint.DefaultHints;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpService.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpService.java
index 95f71be87..eff03bfc4 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpService.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpService.java
@@ -36,10 +36,10 @@
 import org.scijava.Context;
 import org.scijava.InstantiableException;
 import org.scijava.log.LogService;
+import org.scijava.ops.api.OpBuilder;
+import org.scijava.ops.api.OpEnvironment;
 import org.scijava.ops.discovery.Discoverer;
 import org.scijava.ops.discovery.Implementation;
-import org.scijava.ops.engine.OpBuilder;
-import org.scijava.ops.engine.OpEnvironment;
 import org.scijava.ops.engine.OpHistoryService;
 import org.scijava.ops.engine.OpInfoGenerator;
 import org.scijava.ops.engine.OpService;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/MatchingConditions.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/MatchingConditions.java
index 08e1c2197..f083015da 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/MatchingConditions.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/MatchingConditions.java
@@ -3,8 +3,8 @@
 
 import java.util.Objects;
 
-import org.scijava.ops.engine.Hints;
-import org.scijava.ops.engine.OpRef;
+import org.scijava.ops.api.Hints;
+import org.scijava.ops.api.OpRef;
 
 public class MatchingConditions {
 
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedClassOpInfoGenerator.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedClassOpInfoGenerator.java
index 83e1e4fbb..4a89fbcd2 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedClassOpInfoGenerator.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedClassOpInfoGenerator.java
@@ -4,7 +4,7 @@
 import java.util.List;
 
 import org.scijava.InstantiableException;
-import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.api.OpInfo;
 import org.scijava.ops.engine.OpInfoGenerator;
 import org.scijava.ops.engine.OpUtils;
 import org.scijava.ops.engine.matcher.impl.OpClassInfo;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedOpCollectionInfoGenerator.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedOpCollectionInfoGenerator.java
index 1768cd49c..4a30cecc6 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedOpCollectionInfoGenerator.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedOpCollectionInfoGenerator.java
@@ -7,7 +7,7 @@
 import java.util.List;
 
 import org.scijava.InstantiableException;
-import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.api.OpInfo;
 import org.scijava.ops.engine.OpInfoGenerator;
 import org.scijava.ops.engine.OpUtils;
 import org.scijava.ops.engine.matcher.impl.OpFieldInfo;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/DependencyMatchingException.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/DependencyMatchingException.java
index 62943a30a..cc7af3682 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/DependencyMatchingException.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/DependencyMatchingException.java
@@ -1,7 +1,7 @@
 
 package org.scijava.ops.engine.matcher;
 
-import org.scijava.ops.engine.OpRef;
+import org.scijava.ops.api.OpRef;
 
 /**
  * An {@link OpMatchingException} caused by another {@code OpMatchingException}
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/MatchingResult.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/MatchingResult.java
index 3e8906d06..605827b23 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/MatchingResult.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/MatchingResult.java
@@ -3,8 +3,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.scijava.ops.api.OpRef;
 import org.scijava.ops.engine.OpCandidate;
-import org.scijava.ops.engine.OpRef;
 import org.scijava.ops.engine.OpUtils;
 import org.scijava.ops.engine.OpCandidate.StatusCode;
 
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/OpMatcher.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/OpMatcher.java
index e10fa0fe1..0e20598af 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/OpMatcher.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/OpMatcher.java
@@ -31,10 +31,10 @@
 
 import java.util.List;
 
-import org.scijava.ops.engine.Hints;
+import org.scijava.ops.api.Hints;
+import org.scijava.ops.api.OpEnvironment;
+import org.scijava.ops.api.OpRef;
 import org.scijava.ops.engine.OpCandidate;
-import org.scijava.ops.engine.OpEnvironment;
-import org.scijava.ops.engine.OpRef;
 
 /**
  * Finds Ops which match an {@link OpRef}.
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/OpMatchingException.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/OpMatchingException.java
index 75f9f32b4..4077db150 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/OpMatchingException.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/OpMatchingException.java
@@ -1,6 +1,6 @@
 package org.scijava.ops.engine.matcher;
 
-import org.scijava.ops.engine.OpRef;
+import org.scijava.ops.api.OpRef;
 
 /**
  * Indicates that no op matching a given {@link OpRef} could be found.
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/DefaultOpMatcher.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/DefaultOpMatcher.java
index 2e43ddb5f..09ac8e3fc 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/DefaultOpMatcher.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/DefaultOpMatcher.java
@@ -43,11 +43,11 @@
 import java.util.Set;
 import java.util.function.Predicate;
 
-import org.scijava.ops.engine.Hints;
+import org.scijava.ops.api.Hints;
+import org.scijava.ops.api.OpEnvironment;
+import org.scijava.ops.api.OpInfo;
+import org.scijava.ops.api.OpRef;
 import org.scijava.ops.engine.OpCandidate;
-import org.scijava.ops.engine.OpEnvironment;
-import org.scijava.ops.engine.OpInfo;
-import org.scijava.ops.engine.OpRef;
 import org.scijava.ops.engine.OpUtils;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
 import org.scijava.ops.engine.OpCandidate.StatusCode;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/DefaultOpRef.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/DefaultOpRef.java
index e531fb421..d38418aa8 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/DefaultOpRef.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/DefaultOpRef.java
@@ -35,7 +35,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.scijava.ops.engine.OpRef;
+import org.scijava.ops.api.OpRef;
 import org.scijava.ops.engine.matcher.OpMatcher;
 import org.scijava.ops.spi.Op;
 import org.scijava.types.Types;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpAdaptationInfo.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpAdaptationInfo.java
index d3d8732d9..0f60a534d 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpAdaptationInfo.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpAdaptationInfo.java
@@ -10,9 +10,9 @@
 import java.util.function.Function;
 
 import org.scijava.ValidityProblem;
-import org.scijava.ops.engine.Hints;
+import org.scijava.ops.api.Hints;
+import org.scijava.ops.api.OpInfo;
 import org.scijava.ops.engine.OpDependencyMember;
-import org.scijava.ops.engine.OpInfo;
 import org.scijava.ops.engine.OpUtils;
 import org.scijava.ops.engine.BaseOpHints.Adaptation;
 import org.scijava.ops.engine.hint.ImmutableHints;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpClassInfo.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpClassInfo.java
index b0d24ca0c..f2c67d020 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpClassInfo.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpClassInfo.java
@@ -39,10 +39,10 @@
 
 import org.scijava.Priority;
 import org.scijava.ValidityProblem;
-import org.scijava.ops.engine.Hints;
+import org.scijava.ops.api.Hints;
+import org.scijava.ops.api.OpInfo;
 import org.scijava.ops.engine.OpDependencyMember;
 import org.scijava.ops.engine.OpHints;
-import org.scijava.ops.engine.OpInfo;
 import org.scijava.ops.engine.OpUtils;
 import org.scijava.ops.engine.hint.ImmutableHints;
 import org.scijava.ops.engine.struct.ClassOpDependencyMemberParser;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpFieldInfo.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpFieldInfo.java
index 34d26eef2..1538d3987 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpFieldInfo.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpFieldInfo.java
@@ -39,9 +39,9 @@
 
 import org.scijava.Priority;
 import org.scijava.ValidityProblem;
-import org.scijava.ops.engine.Hints;
+import org.scijava.ops.api.Hints;
+import org.scijava.ops.api.OpInfo;
 import org.scijava.ops.engine.OpHints;
-import org.scijava.ops.engine.OpInfo;
 import org.scijava.ops.engine.OpUtils;
 import org.scijava.ops.engine.hint.ImmutableHints;
 import org.scijava.ops.engine.struct.FieldParameterMemberParser;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpMethodInfo.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpMethodInfo.java
index 64e16d1a0..ad033edd1 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpMethodInfo.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpMethodInfo.java
@@ -45,10 +45,10 @@
 
 import org.scijava.Priority;
 import org.scijava.ValidityProblem;
-import org.scijava.ops.engine.Hints;
+import org.scijava.ops.api.Hints;
+import org.scijava.ops.api.OpInfo;
 import org.scijava.ops.engine.OpDependencyMember;
 import org.scijava.ops.engine.OpHints;
-import org.scijava.ops.engine.OpInfo;
 import org.scijava.ops.engine.OpUtils;
 import org.scijava.ops.engine.hint.ImmutableHints;
 import org.scijava.ops.engine.struct.MethodOpDependencyMemberParser;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/ChainCluster.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/ChainCluster.java
index 3da73b8ec..622d6b019 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/ChainCluster.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/ChainCluster.java
@@ -6,7 +6,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.api.OpInfo;
 
 public class ChainCluster {
 
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/InfoSimplificationGenerator.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/InfoSimplificationGenerator.java
index 38662969b..3b130b713 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/InfoSimplificationGenerator.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/InfoSimplificationGenerator.java
@@ -9,10 +9,10 @@
 import java.util.Map;
 import java.util.Optional;
 
-import org.scijava.ops.engine.Hints;
-import org.scijava.ops.engine.OpEnvironment;
-import org.scijava.ops.engine.OpInfo;
-import org.scijava.ops.engine.OpRef;
+import org.scijava.ops.api.Hints;
+import org.scijava.ops.api.OpEnvironment;
+import org.scijava.ops.api.OpInfo;
+import org.scijava.ops.api.OpRef;
 import org.scijava.ops.engine.OpUtils;
 import org.scijava.types.Types;
 
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/MutatorChain.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/MutatorChain.java
index 61fb65099..66e3b9a8f 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/MutatorChain.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/MutatorChain.java
@@ -2,7 +2,7 @@
 
 import java.lang.reflect.Type;
 
-import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.api.OpInfo;
 import org.scijava.util.Types;
 
 public class MutatorChain implements Comparable<MutatorChain>{
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplificationMetadata.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplificationMetadata.java
index 29629ba9c..bf4a2f0dd 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplificationMetadata.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplificationMetadata.java
@@ -11,8 +11,8 @@
 import java.util.stream.Collectors;
 
 import org.scijava.function.Computers;
-import org.scijava.ops.engine.OpEnvironment;
-import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.api.OpEnvironment;
+import org.scijava.ops.api.OpInfo;
 import org.scijava.ops.engine.OpUtils;
 import org.scijava.struct.Member;
 import org.scijava.util.Types;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplificationUtils.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplificationUtils.java
index aaf55b32a..f3783fdc4 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplificationUtils.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplificationUtils.java
@@ -21,9 +21,9 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Container;
 import org.scijava.function.Mutable;
-import org.scijava.ops.engine.OpEnvironment;
-import org.scijava.ops.engine.OpInfo;
-import org.scijava.ops.engine.OpRef;
+import org.scijava.ops.api.OpEnvironment;
+import org.scijava.ops.api.OpInfo;
+import org.scijava.ops.api.OpRef;
 import org.scijava.ops.engine.OpUtils;
 import org.scijava.ops.engine.util.AnnotationUtils;
 import org.scijava.types.Nil;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedOpInfo.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedOpInfo.java
index 56b3ec805..8f214866f 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedOpInfo.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedOpInfo.java
@@ -8,9 +8,9 @@
 
 import org.scijava.Priority;
 import org.scijava.ValidityProblem;
-import org.scijava.ops.engine.Hints;
-import org.scijava.ops.engine.OpEnvironment;
-import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.api.Hints;
+import org.scijava.ops.api.OpEnvironment;
+import org.scijava.ops.api.OpInfo;
 import org.scijava.ops.engine.OpUtils;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
 import org.scijava.ops.engine.conversionLoss.LossReporter;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedOpRef.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedOpRef.java
index 2fc943972..49a48561a 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedOpRef.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedOpRef.java
@@ -10,6 +10,7 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Computers.Arity1;
+<<<<<<< HEAD
 import org.scijava.ops.engine.BaseOpHints.Adaptation;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
 import org.scijava.ops.engine.Hints;
@@ -17,6 +18,14 @@
 import org.scijava.ops.engine.OpInfo;
 import org.scijava.ops.engine.OpRef;
 import org.scijava.ops.engine.hint.DefaultHints;
+=======
+import org.scijava.ops.api.Hints;
+import org.scijava.ops.api.OpEnvironment;
+import org.scijava.ops.api.OpInfo;
+import org.scijava.ops.api.OpRef;
+import org.scijava.ops.engine.BaseOpHints.Adaptation;
+import org.scijava.ops.engine.BaseOpHints.Simplification;
+>>>>>>> WIP: Partition scijava-ops-api
 import org.scijava.ops.engine.matcher.OpMatchingException;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/JavadocParameterData.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/JavadocParameterData.java
index b83376a07..fb9328df0 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/JavadocParameterData.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/JavadocParameterData.java
@@ -17,7 +17,7 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.api.OpInfo;
 import org.scijava.ops.engine.OpUtils;
 import org.scijava.ops.spi.OpDependency;
 import org.scijava.struct.FunctionalMethodType;
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/JavadocParameterTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/JavadocParameterTest.java
index ba4175b13..3d8e62303 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/JavadocParameterTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/JavadocParameterTest.java
@@ -15,7 +15,7 @@
 import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.api.OpInfo;
 import org.scijava.ops.engine.OpUtils;
 import org.scijava.ops.spi.Op;
 import org.scijava.ops.spi.OpCollection;
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpBuilderNoOutputTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpBuilderNoOutputTest.java
index a14527afc..5358be042 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpBuilderNoOutputTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpBuilderNoOutputTest.java
@@ -7,7 +7,7 @@
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.ops.spi.OpCollection;
 import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpEnvironmentTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpEnvironmentTest.java
index 110e100b8..cc748a452 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpEnvironmentTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpEnvironmentTest.java
@@ -7,8 +7,8 @@
 import org.junit.Test;
 import org.scijava.Priority;
 import org.scijava.function.Producer;
-import org.scijava.ops.engine.OpEnvironment;
-import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.api.OpEnvironment;
+import org.scijava.ops.api.OpInfo;
 import org.scijava.ops.engine.OpService;
 import org.scijava.ops.engine.matcher.impl.OpClassInfo;
 import org.scijava.types.GenericTyped;
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/OpAdaptationPriorityTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/OpAdaptationPriorityTest.java
index 337096092..773d9e69b 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/OpAdaptationPriorityTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/OpAdaptationPriorityTest.java
@@ -38,7 +38,7 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Producer;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.ops.engine.adapt.functional.ComputersToFunctionsViaFunction;
 import org.scijava.ops.engine.adapt.functional.ComputersToFunctionsViaSource;
 import org.scijava.ops.spi.OpCollection;
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/complexLift/ComputerToFunctionIterablesTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/complexLift/ComputerToFunctionIterablesTest.java
index 4b6b4e84b..acf48cc48 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/complexLift/ComputerToFunctionIterablesTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/complexLift/ComputerToFunctionIterablesTest.java
@@ -42,7 +42,7 @@
 import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/complexLift/FunctionToComputerIterablesTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/complexLift/FunctionToComputerIterablesTest.java
index a313302e1..e9a4f4f4b 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/complexLift/FunctionToComputerIterablesTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/complexLift/FunctionToComputerIterablesTest.java
@@ -40,7 +40,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 
 public class FunctionToComputerIterablesTest extends AbstractTestEnvironment {
 
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTest.java
index e1da90f34..3ce692010 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTest.java
@@ -38,7 +38,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 
 public class ComputerToFunctionAdaptTest extends AbstractTestEnvironment {
 
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTest.java
index 0d71f6b92..345fc6599 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTest.java
@@ -37,7 +37,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 
 public class FunctionToComputerAdaptTest extends AbstractTestEnvironment {
 
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/InplaceToFunctionAdaptTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/InplaceToFunctionAdaptTest.java
index ec709070c..8c905ae14 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/InplaceToFunctionAdaptTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/functional/InplaceToFunctionAdaptTest.java
@@ -40,7 +40,7 @@
 
 import org.junit.Test;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 public class InplaceToFunctionAdaptTest extends AbstractTestEnvironment {
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/ComputerToIterablesTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/ComputerToIterablesTest.java
index 39dd515df..339d5767f 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/ComputerToIterablesTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/ComputerToIterablesTest.java
@@ -42,7 +42,7 @@
 import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 
 /**
  * Tests the adaptation of {@link Computers} running on a type into
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/FunctionToIterablesTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/FunctionToIterablesTest.java
index a9e23eb87..2b948f8d9 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/FunctionToIterablesTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/FunctionToIterablesTest.java
@@ -40,7 +40,7 @@
 import org.junit.Test;
 import org.scijava.function.Functions;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/AdaptationHintTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/AdaptationHintTest.java
index 2e435ec1c..28c4c17b9 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/AdaptationHintTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/AdaptationHintTest.java
@@ -5,8 +5,8 @@
 import java.util.function.Function;
 
 import org.junit.Test;
+import org.scijava.ops.api.Hints;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.Hints;
 import org.scijava.ops.engine.OpHints;
 import org.scijava.ops.engine.BaseOpHints.Adaptation;
 import org.scijava.ops.engine.hint.DefaultHints;
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/SimplificationHintTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/SimplificationHintTest.java
index e88768866..0ccd972d4 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/SimplificationHintTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/SimplificationHintTest.java
@@ -6,8 +6,8 @@
 import java.util.function.Function;
 
 import org.junit.Test;
+import org.scijava.ops.api.Hints;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.Hints;
 import org.scijava.ops.engine.OpHints;
 import org.scijava.ops.engine.BaseOpHints.Adaptation;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/OpCachingTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/OpCachingTest.java
index d49f99e3f..02987a63c 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/OpCachingTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/OpCachingTest.java
@@ -40,10 +40,14 @@
 import org.junit.jupiter.api.Assertions;
 import org.scijava.Context;
 import org.scijava.function.Producer;
+import org.scijava.ops.api.OpEnvironment;
 import org.scijava.ops.engine.AbstractTestEnvironment;
+<<<<<<< HEAD
 import org.scijava.ops.engine.OpEnvironment;
 import org.scijava.ops.engine.OpHistoryService;
 import org.scijava.ops.engine.OpInstance;
+=======
+>>>>>>> WIP: Partition scijava-ops-api
 import org.scijava.ops.engine.OpService;
 import org.scijava.ops.spi.Op;
 import org.scijava.ops.spi.OpCollection;
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingWithGCSTTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingWithGCSTTest.java
index 0a45aca85..5d5e8d47d 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingWithGCSTTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingWithGCSTTest.java
@@ -8,7 +8,7 @@
 
 import org.junit.Test;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.ops.spi.OpCollection;
 import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/OpWrappersTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/OpWrappersTest.java
index 943d1dbd1..bbfc18269 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/OpWrappersTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/OpWrappersTest.java
@@ -16,7 +16,7 @@
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.GenericTyped;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/monitor/OpMonitorTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/monitor/OpMonitorTest.java
index a7da8cf03..8d0d33615 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/monitor/OpMonitorTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/monitor/OpMonitorTest.java
@@ -11,7 +11,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.ops.engine.monitor.DefaultOpMonitor;
 import org.scijava.ops.engine.monitor.OpMonitor;
 import org.scijava.ops.spi.Op;
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/stats/MeanTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/stats/MeanTest.java
index 6ff5dcebe..dcf340f43 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/stats/MeanTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/stats/MeanTest.java
@@ -8,7 +8,7 @@
 
 import org.junit.Test;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 public class MeanTest <N extends Number> extends AbstractTestEnvironment{
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/ComputersTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/ComputersTest.java
index 012e3fbf1..409b04d14 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/ComputersTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/ComputersTest.java
@@ -32,7 +32,7 @@
 import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 public class ComputersTest extends AbstractTestEnvironment {
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/FunctionsTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/FunctionsTest.java
index 50bb24439..764b4ec88 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/FunctionsTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/FunctionsTest.java
@@ -34,7 +34,7 @@
 
 import org.junit.Test;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 public class FunctionsTest extends AbstractTestEnvironment {
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/InplacesTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/InplacesTest.java
index 95f9bd25e..992008b41 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/InplacesTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/InplacesTest.java
@@ -32,7 +32,7 @@
 import org.junit.Test;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 public class InplacesTest extends AbstractTestEnvironment {
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/LiftTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/LiftTest.java
index 9211a8e4e..5b9c3028e 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/LiftTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/LiftTest.java
@@ -40,7 +40,7 @@
 import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.ops.engine.util.Maps;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/OpsAsParametersTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/OpsAsParametersTest.java
index 9d80f33f9..602381b0b 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/OpsAsParametersTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/OpsAsParametersTest.java
@@ -7,7 +7,7 @@
 
 import org.junit.Test;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.ops.spi.Op;
 import org.scijava.ops.spi.OpCollection;
 import org.scijava.ops.spi.OpField;
diff --git a/scijava/scijava-ops-engine/templates/main/java/module-info.vm b/scijava/scijava-ops-engine/templates/main/java/module-info.vm
index 80c1b0a9f..191a30f24 100644
--- a/scijava/scijava-ops-engine/templates/main/java/module-info.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/module-info.vm
@@ -32,8 +32,9 @@ module org.scijava.ops.engine {
 	requires org.scijava;
 	requires org.scijava.function;
 	requires org.scijava.struct;
-	requires org.scijava.ops.spi;
+	requires org.scijava.ops.api;
 	requires org.scijava.ops.discovery;
+	requires org.scijava.ops.spi;
 	requires org.scijava.types;
 	requires javassist;
 	requires java.compiler;
diff --git a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/OpBuilder.list b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/OpBuilder.list
deleted file mode 100644
index 0cef647dc..000000000
--- a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/OpBuilder.list
+++ /dev/null
@@ -1,131 +0,0 @@
-.include templates/main/java/org/scijava/ops/engine/util/Globals.list
-arities = (1..maxArity).collect()
-
-[OpBuilder.java]
-inplaceMatchNumber = ```
-{ arity, num ->
-  arity == 1 ? '' :
-  "$num"
-}
-```
-generics = ```
-{ arity ->
-  arity == 0 ? '<O>' :
-  '<' + String.join(', ', (1..arity).stream().map{a -> "I$a"}.collect()) + ', O>'
-}
-```
-genericsWithoutOutput = ```
-{ arity ->
-  arity == 1 ? '<I1>' :
-  '<' + String.join(', ', (1..arity).stream().map{a -> "I$a"}.collect()) + '>'
-}
-```
-genericsWildcardFunction = ```
-{ arity ->
-  arity == 0 ? '<?>' :
-  '<' + String.join(', ', (1..arity).stream().map{a -> "I$a"}.collect()) + ', ?>'
-}
-```
-inputObjectsArgs = ```
-{ arity ->
-  String.join(', ', (1..arity).stream().map{a -> "final I$a in$a"}.collect())
-}
-```
-inputObjects = ```
-{ arity ->
-  String.join(', ', (1..arity).stream().map{a -> "in$a"}.collect())
-}
-```
-inputClassesArgs = ```
-{ arity ->
-  String.join(', ', (1..arity).stream().map{a -> "final Class<I$a> in${a}Class"}.collect())
-}
-```
-inputClassesToTypes = ```
-{ arity ->
-  String.join(', ', (1..arity).stream().map{a -> "Nil.of(in${a}Class)"}.collect())
-}
-```
-inputTypesArgs = ```
-{ arity ->
-  arity == 0 ? '' : 
-  String.join(', ', (1..arity).stream().map{a -> "final Nil<I$a> in${a}Type"}.collect())
-}
-```
-inputTypesFromArgs = ```
-{ arity ->
-  String.join(', ', (1..arity).stream().map{a -> "type(in$a)"}.collect())
-}
-```
-inputTypesArgsWithOutput = ```
-{ arity ->
-  arity == 0 ? 'final Nil<O> outType' : 
-  String.join(', ', (1..arity).stream().map{a -> "final Nil<I$a> in${a}Type"}.collect()) + ', final Nil<O> outType'
-}
-```
-inputTypes = ```
-{ arity ->
-  arity == 0 ? '' : 
-  String.join(', ', (1..arity).stream().map{a -> "in${a}Type"}.collect())
-}
-```
-inputTypesWithOutput = ```
-{ arity ->
-  arity == 0 ? 'outType' : 
-  String.join(', ', (1..arity).stream().map{a -> "in${a}Type"}.collect()) + ', outType'
-}
-```
-simplifiedClass = ```
-{ arity, num ->
-  simplifiedInplace(arity, num) + '.class'
-}
-```
-inplaceClass = ```
-{ arity, num ->
-  inplaceType(arity, num) + '.class'
-}
-```
-matchName = ```
-{ arity, num ->
-  arity == 1 ? "matchInplace" :
-  "matchInplace${num}"
-}
-```
-inplaceTypeVarNums = ```
-{ arity, io ->
-  (1..arity).subList(0, io - 1) + 'O' + (1..arity).subList(io, arity)
-}
-```
-inplaceGenericsList = ```
-{ arity, io ->
-  inplaceTypeVarNums(arity, io).stream().map{a -> "I$a"}.collect()
-}
-```
-inplaceGenerics = ```
-{ arity, io ->
-  '<' + String.join(', ', inplaceGenericsList(arity, io)) + '>'
-}
-```
-matchParams = ```
-{ arity, io ->
-  String.join(', ', inplaceGenericsList(arity, io).stream().map{a -> 
-    a.charAt(1) == 'O'? 
-	"final Nil<$a> ${a.toLowerCase()}Type"  :
-	"final Nil<$a> in${a.substring(1)}Type"}.collect())
-}
-```
-typeVarNums = ```
-{ arity, io ->
-  (1..arity).subList(0, io - 1) + 'O' + (1..arity).subList(io, arity)
-}
-```
-basicParamsList = ```
-{ arity, io -> 
-	typeVarNums(arity, io).stream().map{a -> a == 'O' ? "ioType" : "in${a}Type"}.collect()
-}
-```
-basicParams = ```
-{ arity, io ->
-  String.join(', ', basicParamsList(arity, io))
-}
-```
\ No newline at end of file
diff --git a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/OpBuilder.vm b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/OpBuilder.vm
deleted file mode 100644
index 122c8b32f..000000000
--- a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/OpBuilder.vm
+++ /dev/null
@@ -1,676 +0,0 @@
-/*
- * #%L
- * SciJava Operations: a framework for reusable algorithms.
- * %%
- * Copyright (C) 2016 - 2019 SciJava Ops developers.
- * %%
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * #L%
- */
-
-/*
-* This is autogenerated source code -- DO NOT EDIT. Instead, edit the
-* corresponding template in templates/ and rerun bin/generate.groovy.
-*/
-
-package org.scijava.ops.engine;
-
-import java.lang.reflect.Type;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-
-import org.scijava.function.Computers;
-import org.scijava.function.Functions;
-import org.scijava.function.Inplaces;
-import org.scijava.function.Producer;
-import org.scijava.types.Nil;
-import org.scijava.types.Types;
-
-/**
- * Convenience class for looking up and/or executing ops using a builder
- * pattern.
- * <p>
- * TODO: Examples
- * </p>
- *
- * @author Curtis Rueden
- * @author Gabriel Selzer
- */
-public class OpBuilder {
-
-	private final OpEnvironment env;
-	private final String opName;
-
-	public OpBuilder(final OpEnvironment env, final String opName) {
-		this.env = env;
-		this.opName = opName;
-	}
-
-	/** Specifies the op accepts no inputs&mdash;i.e., a nullary op. */
-	public Arity0_OU input() {
-		return new Arity0_OU();
-	}
-
-#foreach($arity in $arities)
-	/** Specifies $arity input by value. */
-	public $genericsWithoutOutput.call($arity) Arity${arity}_IV_OU$genericsWithoutOutput.call($arity) input($inputObjectsArgs.call($arity))
-	{
-		return new Arity${arity}_IV_OU<>($inputObjects.call($arity));
-	}
-
-	/** Specifies $arity input by raw type. */
-	public $genericsWithoutOutput.call($arity) Arity${arity}_IT_OU$genericsWithoutOutput.call($arity) inType($inputClassesArgs.call($arity))
-	{
-		return inType($inputClassesToTypes.call($arity));
-	}
-
-	/** Specifies $arity input by generic type. */
-	public $genericsWithoutOutput.call($arity) Arity${arity}_IT_OU$genericsWithoutOutput.call($arity) inType($inputTypesArgs.call($arity))
-	{
-		return new Arity${arity}_IT_OU<>($inputTypes.call($arity));
-	}
-
-#end
-	// -- Helper methods --
-
-	@SuppressWarnings({ "unchecked" })
-	private <T> Nil<T> type(Object obj) {
-		// FIXME: This vacuous T and unsafe cast is wrong.
-		return (Nil<T>) Nil.of(env.genericType(obj));
-	}
-
-	private void checkComputerRefs(Object... objects) {
-		checkRefs(objects.length - 1, "Output", objects);
-	}
-
-	private void checkInplaceRefs(int inplaceNo, Object... objects) {
-		checkRefs(inplaceNo - 1, "Mutable input " + inplaceNo, objects);
-	}
-
-	private void checkRefs(int mutableIndex, String label, Object... objects) {
-		for (int i = 0; i < objects.length; i++) {
-			if (i == mutableIndex) continue;
-			if (objects[mutableIndex] == objects[i]) {
-				throw new IllegalArgumentException(label +
-					" cannot be same reference as input #" + (i + 1));
-			}
-		}
-	}
-
-	// @formatter:off
-	/*
-	 * -- HELPER CLASSES --
-	 * 
-	 * For each arity, there are multiple conditions:
-	 * * Input TYPES are given (IT) 
-	 * 	1) The output is unspecified (OU): 
-	 * 		a) matchable: Function, Inplace
-	 * 		b) runnable: none
-	 * 	2) The output type is given (OT): 
-	 * 		a) matchable: Function, Computer
-	 * 		b) runnable: none
-	 *  
-	 * * Input VALUES are given (IV) (N.B. this case applies for Arity0):
-	 * 	1) The output is unspecified (OU): 
-	 * 		a) matchable: Function, Inplace
-	 * 		b) runnable: apply, mutate
-	 * 	2) The output type is given (OT): 
-	 * 		a) matchable: Function, Computer
-	 * 		b) runnable: apply
-	 * 	3) The output value is given (OV): 
-	 * 		a) matchable: Computer
-	 *  	b) runnable: compute
-	 */
-	// @formatter:on
-
-	/**
-	 * Builder with arity 0, output unspecified.
-	 *
-	 * @author Curtis Rueden
-	 */
-	public final class Arity0_OU {
-
-		public <O> Arity0_OV<O> output(final O out) {
-			return new Arity0_OV<>(out);
-		}
-
-		public <O> Arity0_OT<O> outType(final Class<O> outType) {
-			return outType(Nil.of(outType));
-		}
-
-		public <O> Arity0_OT<O> outType(final Nil<O> outType) {
-			return new Arity0_OT<>(outType);
-		}
-
-		public Producer<?> producer() {
-			final Nil<Producer<Object>> specialType = new Nil<>() {
-
-				@Override
-				public Type getType() {
-					return Types.parameterize(Producer.class, new Type[] {
-						Object.class });
-				}
-			};
-			return env.op(opName, specialType, new Nil<?>[0], Nil.of(
-				Object.class));
-		}
-
-		public Producer<?> producer(final Hints hints) {
-			final Nil<Producer<Object>> specialType = new Nil<>() {
-
-				@Override
-				public Type getType() {
-					return Types.parameterize(Producer.class, new Type[] {
-						Object.class });
-				}
-			};
-			return env.op(opName, specialType, new Nil<?>[0], Nil.of(
-				Object.class, hints));
-		}
-
-		public Object create() {
-			return producer().create();
-		}
-
-		public Object create(final Hints hints) {
-			return producer(hints).create();
-		}
-	}
-
-	/**
-	 * Builder with arity 0, output type given.
-	 *
-	 * @author Curtis Rueden
-	 * @param <O> The type of the output.
-	 */
-	public final class Arity0_OT<O> {
-
-		private final Nil<O> outType;
-
-		public Arity0_OT(final Nil<O> outType) {
-			this.outType = outType;
-		}
-
-		public Producer<O> producer() {
-			final Nil<Producer<O>> specialType = new Nil<>() {
-
-				@Override
-				public Type getType() {
-					return Types.parameterize(Producer.class, new Type[] { outType
-						.getType() });
-				}
-			};
-			return env.op(opName, specialType, new Nil<?>[0], outType);
-		}
-
-		public Producer<O> producer(final Hints hints) {
-			final Nil<Producer<O>> specialType = new Nil<>() {
-
-				@Override
-				public Type getType() {
-					return Types.parameterize(Producer.class, new Type[] { outType
-						.getType() });
-				}
-			};
-			return env.op(opName, specialType, new Nil<?>[0], outType, hints);
-		}
-
-		public Computers.Arity0<O> computer() {
-			return matchComputer(env, opName, outType);
-		}
-
-		public O create() {
-			return producer().create();
-		}
-
-		public Computers.Arity0<O> computer(Hints hints) {
-			return matchComputer(env, opName, outType, hints);
-		}
-
-		public O create(Hints hints) {
-			return producer(hints).create();
-		}
-
-	}
-
-	/**
-	 * Builder with arity 0, output value given.
-	 *
-	 * @author Curtis Rueden
-	 * @param <O> The type of the output.
-	 */
-	public final class Arity0_OV<O> {
-
-		private final O out;
-
-		public Arity0_OV(final O out) {
-			this.out = out;
-		}
-
-		public Computers.Arity0<O> computer() {
-			return matchComputer(env, opName, type(out));
-		}
-
-		public void compute() {
-			computer().compute(out);
-		}
-
-		public Computers.Arity0<O> computer(final Hints hints) {
-			return matchComputer(env, opName, type(out), hints);
-		}
-
-		public void compute(final Hints hints) {
-			computer(hints).compute(out);
-		}
-
-	}
-
-#foreach($arity in $arities)
-	/**
-	 * Builder with arity $arity, input type given, output type given.
-	 *
-	 * @author Curtis Rueden
-#foreach($a in [1..$arity])
-	 * @param <I$a> The type of input $a.
-#end
-	 * @param <O> The type of the output.
-	 */
-	public final class Arity${arity}_IT_OT$generics.call($arity) {
-
-#foreach($a in [1..$arity])
-		private final Nil<I$a> in${a}Type;
-#end
-		private final Nil<O> outType;
-
-		public Arity${arity}_IT_OT($inputTypesArgsWithOutput.call($arity))
-		{
-#foreach($a in [1..$arity])			
-			this.in${a}Type = in${a}Type;
-#end
-			this.outType = outType;
-		}
-
-		public $functionArity.call($arity)$generics.call($arity) function() {
-			return matchFunction(env, opName, $inputTypesWithOutput.call($arity));
-		}
-
-		public $functionArity.call($arity)$generics.call($arity) function(final Hints hints) {
-			return matchFunction(env, opName, $inputTypesWithOutput.call($arity), hints);
-		}
-
-		public Computers.Arity${arity}$generics.call($arity) computer() {
-			return matchComputer(env, opName, $inputTypesWithOutput.call($arity));
-		}
-
-		public Computers.Arity${arity}$generics.call($arity) computer(final Hints hints) {
-			return matchComputer(env, opName, $inputTypesWithOutput.call($arity), hints);
-		}
-
-#foreach($a in [1..$arity])
-		public Inplaces.Arity$inplaceSuffix.call($arity, $a)$genericsWithoutOutput.call($arity) inplace${inplaceMatchNumber.call($arity, $a)}() {
-			return matchInplace${inplaceMatchNumber.call($arity, $a)}(env, opName, $inputTypes.call($arity));
-		}
-
-#end
-	}
-
-	/**
-	 * Builder with arity $arity, input type given, output unspecified.
-	 *
-	 * @author Curtis Rueden
-#foreach($a in [1..$arity])
-	 * @param <I$a> The type of input $a.
-#end
-	 */
-	public final class Arity${arity}_IT_OU$genericsWithoutOutput.call($arity) {
-
-#foreach($a in [1..$arity])
-		private final Nil<I$a> in${a}Type;
-#end
-
-		public Arity${arity}_IT_OU($inputTypesArgs.call($arity))
-		{
-#foreach($a in [1..$arity])			
-			this.in${a}Type = in${a}Type;
-#end
-		}
-
-		public <O> Arity${arity}_IT_OT$generics.call($arity) outType(final Class<O> outType) {
-			return outType(Nil.of(outType));
-		}
-
-		public <O> Arity${arity}_IT_OT$generics.call($arity) outType(final Nil<O> outType) {
-			return new Arity${arity}_IT_OT<>($inputTypesWithOutput.call($arity));
-		}
-
-		public $functionArity.call($arity)$genericsWildcardFunction.call($arity) function() {
-			return matchFunction(env, opName, $inputTypes.call($arity), Nil.of(Object.class));
-		}
-
-		public $functionArity.call($arity)$genericsWildcardFunction.call($arity) function(final Hints hints) {
-			return matchFunction(env, opName, $inputTypes.call($arity), Nil.of(Object.class), hints);
-		}
-
-#foreach($a in [1..$arity])
-		public Inplaces.Arity$inplaceSuffix.call($arity, $a)$genericsWithoutOutput.call($arity) inplace${inplaceMatchNumber.call($arity, $a)}() {
-			return matchInplace${inplaceMatchNumber.call($arity, $a)}(env, opName, $inputTypes.call($arity));
-		}
-
-#end
-	}
-
-	/**
-	 * Builder with arity ${arity}, input value given, output type given.
-	 *
-	 * @author Curtis Rueden
-#foreach($a in [1..$arity])
-	 * @param <I$a> The type of input $a.
-#end
-	 * @param <O> The type of the output.
-	 */
-	public final class Arity${arity}_IV_OT$generics.call($arity) {
-
-#foreach($a in [1..$arity])
-		private final I$a in${a};
-#end
-		private final Nil<O> outType;
-
-		public Arity${arity}_IV_OT($inputObjectsArgs.call($arity), final Nil<O> outType)
-		{
-#foreach($a in [1..$arity])
-			this.in$a = in$a;
-#end
-			this.outType = outType;
-		}
-
-		public $functionArity.call($arity)$generics.call($arity) function() {
-			return matchFunction(env, opName, $inputTypesFromArgs.call($arity), outType);
-		}
-	
-		public $functionArity.call($arity)$generics.call($arity) function(final Hints hints) {
-			return matchFunction(env, opName, $inputTypesFromArgs.call($arity), outType, hints);
-		}
-	
-		public Computers.Arity${arity}$generics.call($arity) computer() {
-			return matchComputer(env, opName, $inputTypesFromArgs.call($arity), outType);
-		}
-
-		public Computers.Arity${arity}$generics.call($arity) computer(final Hints hints) {
-			return matchComputer(env, opName, $inputTypesFromArgs.call($arity), outType, hints);
-		}
-	
-		public O apply() {
-			return function().apply($inputObjects.call($arity));
-		}
-
-		public O apply(final Hints hints) {
-			return function(hints).apply($inputObjects.call($arity));
-		}
-	}
-
-	/**
-	 * Builder with arity $arity, input value given, output unspecified.
-	 *
-	 * @author Curtis Rueden
-#foreach($a in [1..$arity])
-	 * @param <I$a> The type of input $a.
-#end
-	 */
-	public final class Arity${arity}_IV_OU$genericsWithoutOutput.call($arity) {
-
-#foreach($a in [1..$arity])
-		private final I$a in$a;
-#end
-
-		public Arity${arity}_IV_OU($inputObjectsArgs.call($arity))
-		{
-#foreach($a in [1..$arity])
-			this.in$a = in$a;
-#end
-		}
-
-		public <O> Arity${arity}_IV_OV$generics.call($arity) output(final O out) {
-			checkComputerRefs($inputObjects.call($arity), out);
-			return new Arity${arity}_IV_OV<>($inputObjects.call($arity), out);
-		}
-
-		public <O> Arity${arity}_IV_OT$generics.call($arity) outType(final Class<O> outType) {
-			return outType(Nil.of(outType));
-		}
-
-		public <O> Arity${arity}_IV_OT$generics.call($arity) outType(final Nil<O> outType) {
-			return new Arity${arity}_IV_OT<>($inputObjects.call($arity), outType);
-		}
-
-		public $functionArity.call($arity)$genericsWildcardFunction.call($arity) function() {
-			return matchFunction(env, opName, $inputTypesFromArgs.call($arity), Nil.of(Object.class));
-		}
-
-		public $functionArity.call($arity)$genericsWildcardFunction.call($arity) function(final Hints hints) {
-			return matchFunction(env, opName, $inputTypesFromArgs.call($arity), Nil.of(Object.class), hints);
-		}
-
-#foreach($a in [1..$arity])
-		public Inplaces.Arity$inplaceSuffix.call($arity, $a)$genericsWithoutOutput.call($arity) inplace${inplaceMatchNumber.call($arity, $a)}() {
-			checkInplaceRefs($a, $inputObjects.call($arity));
-			return matchInplace${inplaceMatchNumber.call($arity, $a)}(env, opName, $inputTypesFromArgs.call($arity));
-		}
-
-#end
-#foreach($a in [1..$arity])
-		public Inplaces.Arity$inplaceSuffix.call($arity, $a)$genericsWithoutOutput.call($arity) inplace${inplaceMatchNumber.call($arity, $a)}(final Hints hints) {
-			checkInplaceRefs($a, $inputObjects.call($arity));
-			return matchInplace${inplaceMatchNumber.call($arity, $a)}(env, opName, $inputTypesFromArgs.call($arity), hints);
-		}
-
-#end
-		public Object apply() {
-			return function().apply($inputObjects.call($arity));
-		}
-
-		public Object apply(final Hints hints) {
-			return function(hints).apply($inputObjects.call($arity));
-		}
-
-#foreach($a in [1..$arity])
-		public void mutate${inplaceMatchNumber.call($arity, $a)}() {
-			inplace${inplaceMatchNumber.call($arity, $a)}().mutate($inputObjects.call($arity));
-		}
-
-#end
-#foreach($a in [1..$arity])
-		public void mutate${inplaceMatchNumber.call($arity, $a)}(final Hints hints) {
-			inplace${inplaceMatchNumber.call($arity, $a)}(hints).mutate($inputObjects.call($arity));
-		}
-
-#end
-	}
-
-	/**
-	 * Builder with arity $arity, input value given, output value given.
-	 *
-	 * @author Curtis Rueden
-#foreach($a in [1..$arity])
-	 * @param <I$a> The type of input $a.
-#end
-	 */
-	public final class Arity${arity}_IV_OV${generics.call($arity)} {
-
-#foreach($a in [1..$arity])
-		private final I$a in$a;
-#end
-		private final O out;
-
-		public Arity${arity}_IV_OV($inputObjectsArgs.call($arity), final O out)
-		{
-#foreach($a in [1..$arity])
-			this.in$a = in$a;
-#end
-			this.out = out;
-		}
-
-		public Computers.Arity${arity}${generics.call($arity)} computer() {
-			return matchComputer(env, opName, $inputTypesFromArgs.call($arity), type(out));
-		}
-
-		public void compute() {
-			computer().compute($inputObjects.call($arity), out);
-		}
-
-		public Computers.Arity${arity}${generics.call($arity)} computer(final Hints hints) {
-			return matchComputer(env, opName, $inputTypesFromArgs.call($arity), type(out), hints);
-		}
-
-		public void compute(final Hints hints) {
-			computer(hints).compute($inputObjects.call($arity), out);
-		}
-
-	}
-#end
-
-#foreach($arity in [0..$maxArity])
-	@SuppressWarnings({ "unchecked" })
-	public static $generics.call($arity) $functionArity.call($arity)$generics.call($arity) matchFunction(final OpEnvironment env, final String opName, $inputTypesArgsWithOutput.call($arity))
-	{
-		return matchFunctionHelper(env, opName, ${functionArity.call($arity)}.class, outType#if( $arity == 0)#{else}, #end$inputTypes.call($arity));
-	}
-
-#end
-#foreach($arity in [0..$maxArity])
-	@SuppressWarnings({ "unchecked" })
-	public static $generics.call($arity) $functionArity.call($arity)$generics.call($arity) matchFunction(final OpEnvironment env, final String opName, $inputTypesArgsWithOutput.call($arity), final Hints hints)
-	{
-		return matchFunctionHelper(env, opName, hints, ${functionArity.call($arity)}.class, outType#if( $arity == 0)#{else}, #end$inputTypes.call($arity));
-	}
-
-#end
-	@SuppressWarnings({ "unchecked" })
-	private static <T> T matchFunctionHelper(final OpEnvironment env, final String opName,
-		final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
-	{
-		final Type[] types = new Type[inTypes.length + 1];
-		for (int i = 0; i < inTypes.length; i++)
-			types[i] = inTypes[i].getType();
-		types[types.length - 1] = outType.getType();
-		final Type specialType = Types.parameterize(opClass, types);
-		return (T) env.op(opName, Nil.of(specialType), inTypes, outType);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	private static <T> T matchFunctionHelper(final OpEnvironment env, final String opName, final Hints hints,
-		final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
-	{
-		final Type[] types = new Type[inTypes.length + 1];
-		for (int i = 0; i < inTypes.length; i++)
-			types[i] = inTypes[i].getType();
-		types[types.length - 1] = outType.getType();
-		final Type specialType = Types.parameterize(opClass, types);
-		return (T) env.op(opName, Nil.of(specialType), inTypes, outType, hints);
-	}
-
-#foreach($arity in [0..$maxArity])
-	@SuppressWarnings("unchecked")
-	public static $generics.call($arity) $computerArity.call($arity)$generics.call($arity) matchComputer(final OpEnvironment env, final String opName, $inputTypesArgsWithOutput.call($arity))
-	{
-		return matchComputerHelper(env, opName, ${computerArity.call($arity)}.class, outType#if( $arity == 0)#{else}, #end$inputTypes.call($arity));
-	}
-
-#end
-#foreach($arity in [0..$maxArity])
-	@SuppressWarnings("unchecked")
-	public static $generics.call($arity) $computerArity.call($arity)$generics.call($arity) matchComputer(final OpEnvironment env, final String opName, $inputTypesArgsWithOutput.call($arity), final Hints hints)
-	{
-		return matchComputerHelper(env, opName, hints, ${computerArity.call($arity)}.class, outType#if( $arity == 0)#{else}, #end$inputTypes.call($arity));
-	}
-
-#end
-	@SuppressWarnings({ "unchecked" })
-	private static <T> T matchComputerHelper(final OpEnvironment env, final String opName, final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
-	{
-		final Type[] types = new Type[inTypes.length + 1];
-		for (int i = 0; i < inTypes.length; i++)
-			types[i] = inTypes[i].getType();
-		types[types.length - 1] = outType.getType();
-		final Type specialType = Types.parameterize(opClass, types);
-		final Nil<?>[] nils = new Nil[inTypes.length + 1];
-		System.arraycopy(inTypes, 0, nils, 0, inTypes.length);
-		nils[nils.length - 1] = outType;
-		return (T) env.op(opName, Nil.of(specialType), nils, outType);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	private static <T> T matchComputerHelper(final OpEnvironment env, final String opName, final Hints hints, final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
-	{
-		final Type[] types = new Type[inTypes.length + 1];
-		for (int i = 0; i < inTypes.length; i++)
-			types[i] = inTypes[i].getType();
-		types[types.length - 1] = outType.getType();
-		final Type specialType = Types.parameterize(opClass, types);
-		final Nil<?>[] nils = new Nil[inTypes.length + 1];
-		System.arraycopy(inTypes, 0, nils, 0, inTypes.length);
-		nils[nils.length - 1] = outType;
-		return (T) env.op(opName, Nil.of(specialType), nils, outType, hints);
-	}
-
-#foreach($arity in $arities)
-#foreach($a in [1..$arity])
-	@SuppressWarnings({ "unchecked" })
-	public static $inplaceGenerics.call($arity, $a) $inplaceType.call($arity, $a)$inplaceGenerics.call($arity, $a) $matchName.call($arity, $a)(final OpEnvironment env, final String opName, $matchParams.call($arity, $a))
-	{
-		return matchInplaceHelper(env, opName, ${inplaceClass.call($arity, $a)}, ioType, new Nil[] {${basicParams.call($arity, $a)}});
-	}
-
-#end
-#end
-
-#foreach($arity in $arities)
-#foreach($a in [1..$arity])
-	@SuppressWarnings({ "unchecked" })
-	public static $inplaceGenerics.call($arity, $a) $inplaceType.call($arity, $a)$inplaceGenerics.call($arity, $a) $matchName.call($arity, $a)(final OpEnvironment env, final String opName, $matchParams.call($arity, $a), final Hints hints)
-	{
-		return matchInplaceHelper(env, opName, hints, ${inplaceType.call($arity, $a)}.class, ioType, new Nil[] {${basicParams.call($arity, $a)}});
-	}
-
-#end
-#end
-	@SuppressWarnings({ "unchecked" })
-	private static <T> T matchInplaceHelper(final OpEnvironment env, final String opName,
-		final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
-	{
-		final Type[] types = new Type[inTypes.length];
-		for (int i = 0; i < inTypes.length; i++)
-			types[i] = inTypes[i].getType();
-		final Type specialType = Types.parameterize(opClass, types);
-		return (T) env.op(opName, Nil.of(specialType), inTypes, outType);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	private static <T> T matchInplaceHelper(final OpEnvironment env, final String opName, final Hints hints,
-		final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
-	{
-		final Type[] types = new Type[inTypes.length];
-		for (int i = 0; i < inTypes.length; i++)
-			types[i] = inTypes[i].getType();
-		final Type specialType = Types.parameterize(opClass, types);
-		return (T) env.op(opName, Nil.of(specialType), inTypes, outType, hints);
-	}
-}
diff --git a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/complexLift/ComputerToFunctionIterablesTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/complexLift/ComputerToFunctionIterablesTest.vm
index 01f9d9727..55c7f14a8 100644
--- a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/complexLift/ComputerToFunctionIterablesTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/complexLift/ComputerToFunctionIterablesTest.vm
@@ -42,7 +42,7 @@ import java.util.List;
 import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/complexLift/FunctionToComputerIterablesTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/complexLift/FunctionToComputerIterablesTest.vm
index dce5c8121..cb11bae52 100644
--- a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/complexLift/FunctionToComputerIterablesTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/complexLift/FunctionToComputerIterablesTest.vm
@@ -40,7 +40,7 @@ import java.util.List;
 import org.junit.Assert;
 import org.junit.Test;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 
 public class FunctionToComputerIterablesTest extends AbstractTestEnvironment {
 #foreach($arity in [1..$maxArity])
diff --git a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTest.vm
index 8c0122c88..cd37b20b5 100644
--- a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/ComputerToFunctionAdaptTest.vm
@@ -38,7 +38,7 @@ package org.scijava.ops.engine.adapt.functional;
 import org.junit.Assert;
 import org.junit.Test;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 
 public class ComputerToFunctionAdaptTest extends AbstractTestEnvironment {
 #foreach($arity in [1..$maxArity])
diff --git a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTest.vm
index 0c26f3219..cc70f4b2e 100644
--- a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/FunctionToComputerAdaptTest.vm
@@ -37,7 +37,7 @@ package org.scijava.ops.engine.adapt.functional;
 import org.junit.Assert;
 import org.junit.Test;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 
 public class FunctionToComputerAdaptTest extends AbstractTestEnvironment {
 #foreach($arity in [1..$maxArity])
diff --git a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/InplaceToFunctionAdaptTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/InplaceToFunctionAdaptTest.vm
index 3de0da877..2f79b7674 100644
--- a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/InplaceToFunctionAdaptTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/functional/InplaceToFunctionAdaptTest.vm
@@ -40,7 +40,7 @@ import java.util.Arrays;
 
 import org.junit.Test;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 public class InplaceToFunctionAdaptTest extends AbstractTestEnvironment {
diff --git a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/ComputerToIterablesTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/ComputerToIterablesTest.vm
index a8c7e9152..2fbf26e07 100644
--- a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/ComputerToIterablesTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/ComputerToIterablesTest.vm
@@ -42,7 +42,7 @@ import java.util.List;
 import org.junit.Test;
 import org.scijava.function.Computers;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 
 /**
  * Tests the adaptation of {@link Computers} running on a type into
diff --git a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/FunctionToIterablesTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/FunctionToIterablesTest.vm
index b37c1a342..4aef7a132 100644
--- a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/FunctionToIterablesTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/FunctionToIterablesTest.vm
@@ -40,7 +40,7 @@ import java.util.List;
 import org.junit.Test;
 import org.scijava.function.Functions;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.Nil;
 
 /**
diff --git a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/matcher/OpWrappersTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/matcher/OpWrappersTest.vm
index 51fc0d47d..3eb683757 100644
--- a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/matcher/OpWrappersTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/matcher/OpWrappersTest.vm
@@ -16,7 +16,7 @@ import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.types.GenericTyped;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops-spi/.gitignore b/scijava/scijava-ops-spi/.gitignore
new file mode 100644
index 000000000..00d2ab71d
--- /dev/null
+++ b/scijava/scijava-ops-spi/.gitignore
@@ -0,0 +1,2 @@
+/.apt_generated/
+/.apt_generated_tests/
diff --git a/scijava/scijava-ops-spi/LICENSE.txt b/scijava/scijava-ops-spi/LICENSE.txt
new file mode 100644
index 000000000..ef17d5e7a
--- /dev/null
+++ b/scijava/scijava-ops-spi/LICENSE.txt
@@ -0,0 +1,24 @@
+Copyright (c) 2016 - 2019, SciJava Ops developers.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/scijava/scijava-ops-spi/README.md b/scijava/scijava-ops-spi/README.md
new file mode 100644
index 000000000..90608641c
--- /dev/null
+++ b/scijava/scijava-ops-spi/README.md
@@ -0,0 +1,12 @@
+The SciJava Ops projects offers a framework for typed operations, or Ops.
+
+Each op implements a particular functional interface, possessing typed inputs
+or outputs. The system provides the ability to request ops matching particular
+constraints, including implementing interface, input types and output types. 
+
+It is like Java's method overloading, but more powerful, and more extensible.
+
+More documentation coming later.
+
+See also [ImageJ Ops](https://github.com/imagej/imagej-ops), a collection of
+ops focused on scientific image processing and analysis.
diff --git a/scijava/scijava-ops-spi/bin/generate.groovy b/scijava/scijava-ops-spi/bin/generate.groovy
new file mode 100644
index 000000000..3e26050d9
--- /dev/null
+++ b/scijava/scijava-ops-spi/bin/generate.groovy
@@ -0,0 +1,238 @@
+#!/usr/bin/env groovy
+
+/*
+ * #%L
+ * SciJava Operations: a framework for reusable algorithms.
+ * %%
+ * Copyright (C) 2018 SciJava developers.
+ * %%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+debug = System.getenv('DEBUG')
+def debug(msg) {
+	if (debug) System.err.println("[DEBUG] $msg")
+}
+
+@Grab('org.apache.velocity:velocity:1.7')
+import org.apache.velocity.app.VelocityEngine
+
+// TODO: Get path to Groovy script and make these dirs relative to that.
+templateDirectory = 'templates'
+outputDirectory = 'src'
+
+knownFiles = new java.util.HashSet();
+
+/* Gets the last modified timestamp for the given file. */
+def timestamp(dir, file) {
+	if (file == null) return Long.MAX_VALUE;
+	file = new java.io.File(dir, file);
+	knownFiles.add(file);
+	return file.lastModified();
+}
+
+/* Processes a template using Apache Velocity. */
+def processTemplate(engine, context, templateFile, outFilename) {
+	debug("processTemplate('$engine', '$context', '$templateFile', '$outFilename')")
+
+	if (outFilename == null) return; // nothing to do
+
+	// create output directory if it does not already exist
+	outFile = new java.io.File(outputDirectory, outFilename);
+	knownFiles.add(outFile);
+	if (outFile.getParentFile() != null) outFile.getParentFile().mkdirs();
+
+	// apply the template and write out the result
+	t = engine.getTemplate(templateFile);
+	writer = new StringWriter();
+	t.merge(context, writer);
+	out = new PrintWriter(outFile, "UTF-8");
+	out.print(writer.toString());
+	out.close();
+}
+
+/* Evaluates a string using Groovy. */
+def parseValue(sh, translationsFile, key, expression) {
+	try {
+		result = sh.evaluate(expression)
+		sh.setVariable(key, result)
+		return result
+	}
+	catch (groovy.lang.GroovyRuntimeException e) {
+		print("[WARNING] $translationsFile: " +
+			"key '$key' has unparseable value: " + e.getMessage());
+	}
+}
+
+/* Reads a translations File */
+def readTranslation(engine, globalContext, reader, templateSubdirectory, templateFile, translationsFile, isInclude){
+	sh = new groovy.lang.GroovyShell();
+	for (;;) {
+		// read the line
+		line = reader.readLine();
+
+		if (line == null) break;
+		// check if the line starts a new section
+		if (line.startsWith("[") && line.endsWith("]")) {
+			// if we are parsing a .include file, return when we hit any sections
+			if(isInclude){
+				println("[WARNING] $translationsFile: Section definition in .include file. Ending processing of $translationsFile");
+				return context; 
+			}
+			// write out the previous file
+			processTemplate(engine, context, templateFile, outputFilename);
+
+			// start a new file
+			outputFilename = line.substring(1, line.length() - 1);
+			if (!templateDirectory.equals(templateSubdirectory)) {
+				subPath = templateSubdirectory.substring(templateDirectory.length() + 1);
+				outputFilename = "$subPath/$outputFilename";
+			}
+			context = new org.apache.velocity.VelocityContext(globalContext);
+			continue;
+		}
+
+		// ignore blank lines
+		trimmedLine = line.trim();
+		if (trimmedLine.isEmpty()) continue;
+
+		// ignore comments
+		if (trimmedLine.startsWith("#")) continue;
+
+		// include any global files
+		if (trimmedLine.startsWith(".include")){
+			includeFile = line.substring(9);
+			if(includeFile.startsWith("templates")){
+				includeSubdirectory = includeFile.substring(0, includeFile.lastIndexOf("/"))
+				includeFile = includeFile.substring(includeFile.lastIndexOf("/"))
+			}
+			else{
+			includeSubdirectory = templateSubdirectory
+			}
+			globalReader = new java.io.BufferedReader(new java.io.FileReader("$includeSubdirectory/$includeFile"));
+			encapsulatedContext = new org.apache.velocity.VelocityContext(context)
+			context = readTranslation(engine, encapsulatedContext, globalReader, templateSubdirectory, templateFile, includeFile, true) 
+			continue;
+		}
+		
+		if (!line.contains('=')) {
+			print("[WARNING] $translationsFile: Ignoring spurious line: $line");
+			continue;
+		}
+
+		int idx = line.indexOf('=');
+		key = line.substring(0, idx).trim();
+		value = line.substring(idx + 1);
+
+		if (value.trim().equals('```')) {
+			// multi-line value
+			builder = new StringBuilder();
+			for (;;) {
+				line = reader.readLine();
+				if (line == null) {
+					throw new RuntimeException("Unfinished value: " + builder.toString());
+				}
+				if (line.equals('```')) {
+					break;
+				}
+				if (builder.length() > 0) {
+					builder.append("\n");
+				}
+				builder.append(line);
+			}
+			value = builder.toString();
+		}
+
+		context.put(key, parseValue(sh, translationsFile, key, value));
+	}
+	
+	return context;
+}
+
+/*
+ * Translates a template into many files in the outputDirectory,
+ * given a translations file in INI style; e.g.:
+ *
+ * [filename1]
+ * variable1 = value1
+ * variable2 = value2
+ * ...
+ * [filename2]
+ * variable1 = value3
+ * variable2 = value4
+ * ...
+ */
+def translate(templateSubdirectory, templateFile, translationsFile) {
+	debug("translate('$templateSubdirectory', '$templateFile', '$translationsFile')")
+
+	// initialize the Velocity engine
+	engine = new org.apache.velocity.app.VelocityEngine();
+	p = new java.util.Properties();
+	// fail if template uses an invalid expression; e.g., an undefined variable
+	p.setProperty("runtime.references.strict", "true");
+	// tell Velocity where the templates are located
+	p.setProperty("file.resource.loader.path", "$templateSubdirectory");
+	// tell Velocity to log to stderr rather than to a velocity.log file
+	p.setProperty(org.apache.velocity.runtime.RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS,
+			"org.apache.velocity.runtime.log.SystemLogChute");
+	engine.init(p);
+
+	// read translation lines
+	outputFilename = null;
+	context = globalContext = new org.apache.velocity.VelocityContext();
+	reader = new java.io.BufferedReader(new java.io.FileReader("$templateSubdirectory/$translationsFile"));
+
+	readTranslation(engine, context, reader, templateSubdirectory, templateFile, translationsFile, false);
+
+	reader.close();
+
+	// process the template
+	processTemplate(engine, context, templateFile, outputFilename);
+}
+
+/* Recursively translates all templates in the given directory. */
+def translateDirectory(templateSubdirectory) {
+	debug("translateDirectory('$templateSubdirectory')")
+
+	for (file in new java.io.File(templateSubdirectory).listFiles()) {
+		if (file.isDirectory()) {
+			// process subdirectories recursively
+			translateDirectory(file.getPath());
+		}
+		else {
+			// process Velocity template files only
+			name = file.getName();
+			if (!name.endsWith('.vm')) continue;
+			prefix = name.substring(0, name.lastIndexOf('.'));
+			translate(templateSubdirectory, name, prefix + '.list');
+		}
+	}
+}
+
+try {
+	translateDirectory(templateDirectory);
+}
+catch (Throwable t) {
+	t.printStackTrace(System.err);
+	throw t;
+}
diff --git a/scijava/scijava-ops-spi/pom.xml b/scijava/scijava-ops-spi/pom.xml
new file mode 100644
index 000000000..999e8478b
--- /dev/null
+++ b/scijava/scijava-ops-spi/pom.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.scijava</groupId>
+		<artifactId>scijava-incubator</artifactId>
+		<version>0-SNAPSHOT</version>
+		<relativePath>../..</relativePath>
+	</parent>
+
+	<artifactId>scijava-ops-spi</artifactId>
+
+	<name>SciJava Ops SPI</name>
+	<description>SciJava Operations SPI: service descriptors used by the SciJava Operations framework.</description>
+	<url>https://github.com/scijava/scijava-ops-spi</url>
+	<inceptionYear>2021</inceptionYear>
+	<organization>
+		<name>SciJava</name>
+		<url>https://scijava.org/</url>
+	</organization>
+	<licenses>
+		<license>
+			<name>Simplified BSD License</name>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+
+	<developers>
+		<developer>
+			<id>ctrueden</id>
+			<name>Curtis Rueden</name>
+			<url>https://imagej.net/User:Rueden</url>
+			<roles>
+				<role>founder</role>
+				<role>lead</role>
+				<role>reviewer</role>
+				<role>support</role>
+				<role>maintainer</role>
+			</roles>
+		</developer>
+		<developer>
+			<id>gselzer</id>
+			<name>Gabriel Selzer</name>
+			<roles>
+				<role>founder</role>
+				<role>developer</role>
+				<role>debugger</role>
+				<role>reviewer</role>
+				<role>support</role>
+			</roles>
+		</developer>
+	</developers>
+	<contributors>
+		<contributor>
+			<name>Christian Dietz</name>
+			<url>https://imagej.net/User:Dietzc</url>
+			<roles>
+				<role>founder</role>
+			</roles>
+			<properties>
+				<id>dietzc</id>
+			</properties>
+		</contributor>
+		<contributor>
+			<name>David Kolb</name>
+			<roles>
+				<role>founder</role>
+			</roles>
+			<properties>
+				<id>Treiblesschorle</id>
+			</properties>
+		</contributor>
+	</contributors>
+
+	<mailingLists>
+		<mailingList>
+			<name>Image.sc Forum</name>
+			<archive>https://forum.image.sc/tags/scijava-ops-spi</archive>
+		</mailingList>
+	</mailingLists>
+
+	<scm>
+		<connection>scm:git:git://github.com/scijava/incubator</connection>
+		<developerConnection>scm:git:git@github.com:scijava/incubator</developerConnection>
+		<tag>HEAD</tag>
+		<url>https://github.com/scijava/incubator</url>
+	</scm>
+	<issueManagement>
+		<system>GitHub Issues</system>
+		<url>https://github.com/scijava/scijava-ops-spi/issues</url>
+	</issueManagement>
+	<ciManagement>
+		<system>Travis CI</system>
+		<url>https://travis-ci.com/scijava/incubator</url>
+	</ciManagement>
+
+	<properties>
+		<main-class>org.scijava.ops.spi.Main</main-class>
+		<package-name>org.scijava.ops.spi</package-name>
+
+		<license.licenseName>bsd_2</license.licenseName>
+		<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
+		<!--  <enforcer.skip>true</enforcer.skip>-->
+		<scijava-ops-spi.allowedDuplicateClasses>${scijava.allowedDuplicateClasses},com.github.therapi.runtimejavadoc.repack.com.eclipsesource.json.*</scijava-ops-spi.allowedDuplicateClasses>
+		<allowedDuplicateClasses>${scijava-ops-spi.allowedDuplicateClasses}</allowedDuplicateClasses>
+	</properties>
+	<dependencies>
+		<!-- SciJava dependencies -->
+		<dependency>
+			<groupId>org.scijava</groupId>
+			<artifactId>scijava-common</artifactId>
+		</dependency>
+
+		<!-- Test scope dependencies -->
+	</dependencies>
+</project>
diff --git a/scijava/scijava-ops-spi/src/main/java/module-info.java b/scijava/scijava-ops-spi/src/main/java/module-info.java
new file mode 100644
index 000000000..bca1c6d6f
--- /dev/null
+++ b/scijava/scijava-ops-spi/src/main/java/module-info.java
@@ -0,0 +1,7 @@
+module org.scijava.ops.spi {
+
+	exports org.scijava.ops.spi;
+
+	requires org.scijava;
+
+}
diff --git a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/spi/Op.java b/scijava/scijava-ops-spi/src/main/java/org/scijava/ops/spi/Op.java
similarity index 100%
rename from scijava/scijava-ops-api/src/main/java/org/scijava/ops/spi/Op.java
rename to scijava/scijava-ops-spi/src/main/java/org/scijava/ops/spi/Op.java
diff --git a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/spi/OpCollection.java b/scijava/scijava-ops-spi/src/main/java/org/scijava/ops/spi/OpCollection.java
similarity index 100%
rename from scijava/scijava-ops-api/src/main/java/org/scijava/ops/spi/OpCollection.java
rename to scijava/scijava-ops-spi/src/main/java/org/scijava/ops/spi/OpCollection.java
diff --git a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/spi/OpDependency.java b/scijava/scijava-ops-spi/src/main/java/org/scijava/ops/spi/OpDependency.java
similarity index 100%
rename from scijava/scijava-ops-api/src/main/java/org/scijava/ops/spi/OpDependency.java
rename to scijava/scijava-ops-spi/src/main/java/org/scijava/ops/spi/OpDependency.java
diff --git a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/spi/OpField.java b/scijava/scijava-ops-spi/src/main/java/org/scijava/ops/spi/OpField.java
similarity index 100%
rename from scijava/scijava-ops-api/src/main/java/org/scijava/ops/spi/OpField.java
rename to scijava/scijava-ops-spi/src/main/java/org/scijava/ops/spi/OpField.java
diff --git a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/spi/OpMethod.java b/scijava/scijava-ops-spi/src/main/java/org/scijava/ops/spi/OpMethod.java
similarity index 100%
rename from scijava/scijava-ops-api/src/main/java/org/scijava/ops/spi/OpMethod.java
rename to scijava/scijava-ops-spi/src/main/java/org/scijava/ops/spi/OpMethod.java

From 29553ebe280d24888e0fd0585a8d63e6561f72b3 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Tue, 27 Jul 2021 11:19:26 -0500
Subject: [PATCH 84/91] BIG WIP: Add scijava-common dependency

Ideally, we wouldn't need SJC for this, but we need ValidityProblem
---
 scijava/scijava-ops-api/pom.xml                          | 9 +++++++++
 scijava/scijava-ops-api/src/main/java/module-info.java   | 2 ++
 .../src/main/java/org/scijava/ops/api}/OpCandidate.java  | 0
 .../java/org/scijava/ops/api}/OpDependencyMember.java    | 0
 4 files changed, 11 insertions(+)
 rename scijava/{scijava-ops-engine/src/main/java/org/scijava/ops/engine => scijava-ops-api/src/main/java/org/scijava/ops/api}/OpCandidate.java (100%)
 rename scijava/{scijava-ops-engine/src/main/java/org/scijava/ops/engine => scijava-ops-api/src/main/java/org/scijava/ops/api}/OpDependencyMember.java (100%)

diff --git a/scijava/scijava-ops-api/pom.xml b/scijava/scijava-ops-api/pom.xml
index a2dcc7d9e..65f59cd4d 100644
--- a/scijava/scijava-ops-api/pom.xml
+++ b/scijava/scijava-ops-api/pom.xml
@@ -109,11 +109,20 @@
 	</properties>
 	<dependencies>
 		<!-- SciJava dependencies -->
+		<dependency>
+			<groupId>org.scijava</groupId>
+			<artifactId>scijava-common</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.scijava</groupId>
 			<artifactId>scijava-function</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.scijava</groupId>
+			<artifactId>scijava-ops-spi</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.scijava</groupId>
 			<artifactId>scijava-struct</artifactId>
diff --git a/scijava/scijava-ops-api/src/main/java/module-info.java b/scijava/scijava-ops-api/src/main/java/module-info.java
index be84f06f5..5af02e0d7 100644
--- a/scijava/scijava-ops-api/src/main/java/module-info.java
+++ b/scijava/scijava-ops-api/src/main/java/module-info.java
@@ -2,8 +2,10 @@
 
 	exports org.scijava.ops.api;
 
+	requires org.scijava;
 	requires org.scijava.function;
 	requires org.scijava.struct;
+	requires org.scijava.ops.spi;
 	requires org.scijava.types;
 
 }
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpCandidate.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpCandidate.java
similarity index 100%
rename from scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpCandidate.java
rename to scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpCandidate.java
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpDependencyMember.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpDependencyMember.java
similarity index 100%
rename from scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpDependencyMember.java
rename to scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpDependencyMember.java

From d7881c8448a050580aed6c876d888cfbcea53230 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Tue, 27 Jul 2021 13:33:00 -0500
Subject: [PATCH 85/91] Scijava-ops-api

---
 imagej/imagej-ops2/pom.xml                    |  29 +-
 .../src/main/java/module-info.java            |   1 +
 .../net/imagej/ops2/help/AbstractHelp.java    |   4 +-
 .../imagej/ops2/coloc/ColocalisationTest.java |   2 +-
 .../vesselness/FrangiVesselnessTest.java      |   2 +-
 scijava/scijava-ops-api/pom.xml               |   5 -
 .../src/main/java/module-info.java            |   3 +-
 .../java/org/scijava/ops/api/OpBuilder.java   |   2 -
 .../java/org/scijava/ops/api/OpCandidate.java |   6 +-
 .../scijava/ops/api/OpDependencyMember.java   |   2 +-
 .../scijava/ops/api}/OpExecutionSummary.java  |   6 +-
 .../java/org/scijava/ops/api}/OpHints.java    |   2 +-
 .../java/org/scijava/ops/api}/OpHistory.java  |   4 +-
 .../main/java/org/scijava/ops/api/OpInfo.java |  12 +-
 .../org/scijava/ops/api}/OpInfoGenerator.java |   4 +-
 .../main/java/org/scijava/ops/api/OpRef.java  |   4 -
 .../java/org/scijava/ops/api}/OpUtils.java    |   6 +-
 .../java/org/scijava/ops/api}/OpWrapper.java  |   2 +-
 .../java/org/scijava/ops/api/Globals.list     | 121 ++++
 .../java/org/scijava/ops/api/OpBuilder.list   | 131 ++++
 .../java/org/scijava/ops/api/OpBuilder.vm     | 676 ++++++++++++++++++
 scijava/scijava-ops-engine/pom.xml            |  32 +-
 .../src/main/java/module-info.java            |   3 -
 .../engine/AnnotatedOpDependencyMember.java   |   3 +-
 .../java/org/scijava/ops/engine/NeededOp.java |   6 -
 .../scijava/ops/engine/OpDependencies.java    |  46 --
 .../scijava/ops/engine/OpHistoryService.java  |   1 +
 .../org/scijava/ops/engine/OpInstance.java    |   2 +
 .../conversionLoss/IdentityLossReporter.java  |   2 +-
 .../conversionLoss/LossReporterWrapper.java   |  10 +-
 .../PrimitiveArrayLossReporters.java          |   2 +-
 .../PrimitiveLossReporters.java               |   2 +-
 .../ops/engine/impl/DefaultOpEnvironment.java |  10 +-
 .../ops/engine/impl/DefaultOpHistory.java     |   6 +-
 .../ops/engine/impl/DefaultOpService.java     |   2 +-
 .../ops/engine/impl/LambdaTypeBaker.java      |   2 +-
 .../impl/PluginBasedClassOpInfoGenerator.java |   4 +-
 .../PluginBasedOpCollectionInfoGenerator.java |   4 +-
 .../impl/SingletonOpHistoryService.java       |   2 +-
 .../ops/engine/matcher/MatchingResult.java    |   6 +-
 .../scijava/ops/engine/matcher/OpMatcher.java |   3 +-
 .../engine/matcher/impl/DefaultOpMatcher.java |   6 +-
 .../engine/matcher/impl/OpAdaptationInfo.java |   4 +-
 .../ops/engine/matcher/impl/OpClassInfo.java  |   6 +-
 .../ops/engine/matcher/impl/OpFieldInfo.java  |   4 +-
 .../ops/engine/matcher/impl/OpMethodInfo.java |   6 +-
 .../ops/engine/matcher/impl/OpWrappers.java   |  10 +-
 .../scijava/ops/engine/simplify/Identity.java |   2 +-
 .../simplify/InfoSimplificationGenerator.java |   2 +-
 .../simplify/PrimitiveArraySimplifiers.java   |   2 +-
 .../engine/simplify/PrimitiveSimplifiers.java |   2 +-
 .../simplify/SimplificationMetadata.java      |   2 +-
 .../engine/simplify/SimplificationUtils.java  |   2 +-
 .../ops/engine/simplify/SimplifiedOpInfo.java |   2 +-
 .../ops/engine/simplify/SimplifiedOpRef.java  |  11 +-
 .../engine/struct/FunctionalParameters.java   |   2 +-
 .../engine/struct/JavadocParameterData.java   |   2 +-
 .../ops/engine/util/FunctionUtils.java        |   4 +-
 .../org/scijava/ops/engine/util/Inject.java   |   2 +-
 .../ops/engine/JavadocParameterTest.java      |   8 +-
 .../org/scijava/ops/engine/OpBuilderTest.java |   1 +
 .../adapt/lift/ComputerToArraysTest.java      |  36 +-
 .../adapt/lift/FunctionToArraysTest.java      |  34 +-
 .../adapt/lift/InplaceToArraysTest.java       | 274 +++----
 .../ops/engine/hints/AdaptationHintTest.java  |   2 +-
 .../engine/hints/SimplificationHintTest.java  |   3 +-
 .../ops/engine/impl/OpCachingTest.java        |  43 +-
 .../ops/engine/impl/ProvenanceTest.java       |   6 +-
 .../ops/engine/matcher/MatchingUtilsTest.java |   5 +-
 .../simplify/PrimitiveListSimplifierTest.java |   2 +-
 .../simplify/SimplificationPriorityTest.java  |   9 +-
 .../templates/main/java/module-info.vm        |   3 -
 .../ops/engine/matcher/impl/OpWrappers.vm     |   8 +-
 .../scijava/ops/engine/util/FunctionUtils.vm  |   4 +-
 .../org/scijava/ops/engine/OpBuilderTest.vm   |   1 +
 .../engine/adapt/lift/ComputerToArraysTest.vm |   4 +-
 .../engine/adapt/lift/FunctionToArraysTest.vm |   4 +-
 .../engine/adapt/lift/InplaceToArraysTest.vm  |   4 +-
 scijava/scijava-struct/pom.xml                |  19 +-
 scijava/scijava-testutil/pom.xml              |  10 -
 scijava/scijava-types/pom.xml                 |  16 +-
 81 files changed, 1263 insertions(+), 476 deletions(-)
 rename scijava/{scijava-ops-engine/src/main/java/org/scijava/ops/engine => scijava-ops-api/src/main/java/org/scijava/ops/api}/OpExecutionSummary.java (89%)
 rename scijava/{scijava-ops-engine/src/main/java/org/scijava/ops/engine => scijava-ops-api/src/main/java/org/scijava/ops/api}/OpHints.java (89%)
 rename scijava/{scijava-ops-engine/src/main/java/org/scijava/ops/engine => scijava-ops-api/src/main/java/org/scijava/ops/api}/OpHistory.java (95%)
 rename scijava/{scijava-ops-engine/src/main/java/org/scijava/ops/engine => scijava-ops-api/src/main/java/org/scijava/ops/api}/OpInfoGenerator.java (54%)
 rename scijava/{scijava-ops-engine/src/main/java/org/scijava/ops/engine => scijava-ops-api/src/main/java/org/scijava/ops/api}/OpUtils.java (98%)
 rename scijava/{scijava-ops-engine/src/main/java/org/scijava/ops/engine => scijava-ops-api/src/main/java/org/scijava/ops/api}/OpWrapper.java (94%)
 create mode 100644 scijava/scijava-ops-api/templates/main/java/org/scijava/ops/api/Globals.list
 create mode 100644 scijava/scijava-ops-api/templates/main/java/org/scijava/ops/api/OpBuilder.list
 create mode 100644 scijava/scijava-ops-api/templates/main/java/org/scijava/ops/api/OpBuilder.vm
 delete mode 100644 scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/NeededOp.java
 delete mode 100644 scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpDependencies.java

diff --git a/imagej/imagej-ops2/pom.xml b/imagej/imagej-ops2/pom.xml
index 62791da4b..164064554 100644
--- a/imagej/imagej-ops2/pom.xml
+++ b/imagej/imagej-ops2/pom.xml
@@ -12,8 +12,8 @@
 	<groupId>net.imagej</groupId>
 	<artifactId>imagej-ops2</artifactId>
 
-	<name>ImageJ Ops</name>
-	<description>ImageJ Operations: a framework for reusable algorithms.</description>
+	<name>ImageJ Ops 2</name>
+	<description>ImageJ Operations 2: a framework for reusable algorithms.</description>
 	<url>http://imagej.net/ImageJ_Ops</url>
 	<inceptionYear>2014</inceptionYear>
 	<organization>
@@ -271,6 +271,16 @@
 			<groupId>org.scijava</groupId>
 			<artifactId>scijava-common</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.scijava</groupId>
+			<artifactId>scijava-ops-api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.scijava</groupId>
+			<artifactId>scijava-ops-spi</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.scijava</groupId>
 			<artifactId>scijava-ops-engine</artifactId>
@@ -298,10 +308,6 @@
 		</dependency>
 
 		<!-- Third party dependencies -->
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-math3</artifactId>
@@ -321,18 +327,13 @@
 
 		<!-- Test scope dependencies -->
 		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-api</artifactId>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-engine</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.vintage</groupId>
-			<artifactId>junit-vintage-engine</artifactId>
+			<artifactId>junit-jupiter-api</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/imagej/imagej-ops2/src/main/java/module-info.java b/imagej/imagej-ops2/src/main/java/module-info.java
index 6a6607470..f8f361767 100644
--- a/imagej/imagej-ops2/src/main/java/module-info.java
+++ b/imagej/imagej-ops2/src/main/java/module-info.java
@@ -136,6 +136,7 @@
 	requires imglib2.algorithm.fft;
 	requires mines.jtk;
 	requires org.scijava.function;
+	requires org.scijava.ops.api;
 	requires org.scijava.ops.spi;
 
 }
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/AbstractHelp.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/AbstractHelp.java
index 67bfc9f49..1dc4ef1dc 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/AbstractHelp.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/AbstractHelp.java
@@ -33,9 +33,9 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.scijava.ops.api.OpCandidate;
 import org.scijava.ops.api.OpInfo;
-import org.scijava.ops.engine.OpCandidate;
-import org.scijava.ops.engine.OpUtils;
+import org.scijava.ops.api.OpUtils;
 
 /**
  * Base class for help operations.
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/ColocalisationTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/ColocalisationTest.java
index 48f26f575..d877572d7 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/ColocalisationTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/ColocalisationTest.java
@@ -59,7 +59,7 @@
 import org.scijava.app.StatusService;
 import org.scijava.cache.CacheService;
 import org.scijava.io.location.FileLocation;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.ops.engine.OpHistoryService;
 import org.scijava.ops.engine.OpService;
 import org.scijava.plugin.PluginService;
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/vesselness/FrangiVesselnessTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/vesselness/FrangiVesselnessTest.java
index 29e64ba02..bd8385d9b 100644
--- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/vesselness/FrangiVesselnessTest.java
+++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/vesselness/FrangiVesselnessTest.java
@@ -48,7 +48,7 @@
 import org.junit.jupiter.api.Test;
 import org.scijava.Context;
 import org.scijava.cache.CacheService;
-import org.scijava.ops.engine.OpBuilder;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.ops.engine.OpHistoryService;
 import org.scijava.ops.engine.OpService;
 import org.scijava.plugin.PluginService;
diff --git a/scijava/scijava-ops-api/pom.xml b/scijava/scijava-ops-api/pom.xml
index 65f59cd4d..719ff8cca 100644
--- a/scijava/scijava-ops-api/pom.xml
+++ b/scijava/scijava-ops-api/pom.xml
@@ -118,11 +118,6 @@
 			<artifactId>scijava-function</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.scijava</groupId>
-			<artifactId>scijava-ops-spi</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.scijava</groupId>
 			<artifactId>scijava-struct</artifactId>
diff --git a/scijava/scijava-ops-api/src/main/java/module-info.java b/scijava/scijava-ops-api/src/main/java/module-info.java
index 5af02e0d7..26418c50f 100644
--- a/scijava/scijava-ops-api/src/main/java/module-info.java
+++ b/scijava/scijava-ops-api/src/main/java/module-info.java
@@ -4,8 +4,7 @@
 
 	requires org.scijava;
 	requires org.scijava.function;
-	requires org.scijava.struct;
-	requires org.scijava.ops.spi;
+	requires transitive org.scijava.struct;
 	requires org.scijava.types;
 
 }
diff --git a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpBuilder.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpBuilder.java
index a4fed7a1b..692b5a9e8 100644
--- a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpBuilder.java
+++ b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpBuilder.java
@@ -42,8 +42,6 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
-import org.scijava.ops.api.Hints;
-import org.scijava.ops.api.OpEnvironment;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
 
diff --git a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpCandidate.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpCandidate.java
index 53dac7563..95a385470 100644
--- a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpCandidate.java
+++ b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpCandidate.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops.engine;
+package org.scijava.ops.api;
 
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
@@ -35,10 +35,6 @@
 import java.util.Map;
 
 import org.scijava.ValidityProblem;
-import org.scijava.ops.api.OpEnvironment;
-import org.scijava.ops.api.OpInfo;
-import org.scijava.ops.api.OpRef;
-import org.scijava.ops.engine.matcher.OpMatcher;
 import org.scijava.struct.Member;
 import org.scijava.struct.Struct;
 import org.scijava.struct.StructInstance;
diff --git a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpDependencyMember.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpDependencyMember.java
index b58807a23..70b9f365a 100644
--- a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpDependencyMember.java
+++ b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpDependencyMember.java
@@ -28,7 +28,7 @@
  * #L%
  */
 
-package org.scijava.ops.engine;
+package org.scijava.ops.api;
 
 import org.scijava.struct.ItemIO;
 import org.scijava.struct.Member;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpExecutionSummary.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpExecutionSummary.java
similarity index 89%
rename from scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpExecutionSummary.java
rename to scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpExecutionSummary.java
index ff47f12bf..9892b4fb1 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpExecutionSummary.java
+++ b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpExecutionSummary.java
@@ -1,10 +1,8 @@
 
-package org.scijava.ops.engine;
+package org.scijava.ops.api;
 
 import java.util.UUID;
 
-import org.scijava.ops.engine.impl.DefaultOpEnvironment;
-
 /**
  * Describes the execution of an Op
  *
@@ -21,7 +19,7 @@ public class OpExecutionSummary {
 	/** The {@link Object} created by {@code info} */
 	private final Object instance;
 
-	/** The {@link Object} returned by the call to {@link DefaultOpEnvironment} */
+	/** The {@link Object} returned by an {@link OpWrapper} */
 	private final Object wrappedInstance;
 
 	/**
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpHints.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpHints.java
similarity index 89%
rename from scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpHints.java
rename to scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpHints.java
index b1555ddb0..d4b4a2b60 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpHints.java
+++ b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpHints.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops.engine;
+package org.scijava.ops.api;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpHistory.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpHistory.java
similarity index 95%
rename from scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpHistory.java
rename to scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpHistory.java
index b4c2a03b5..09eca1918 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpHistory.java
+++ b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpHistory.java
@@ -1,13 +1,11 @@
 
-package org.scijava.ops.engine;
+package org.scijava.ops.api;
 
 import com.google.common.graph.Graph;
 
 import java.util.List;
 import java.util.UUID;
 
-import org.scijava.service.SciJavaService;
-
 /**
  * Log describing each execution of an Op. This class is designed to answer two
  * questions:
diff --git a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpInfo.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpInfo.java
index bce57d2e5..fed912330 100644
--- a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpInfo.java
+++ b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpInfo.java
@@ -6,12 +6,12 @@
 import java.lang.reflect.TypeVariable;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.scijava.struct.Member;
 import org.scijava.struct.Struct;
 import org.scijava.struct.StructInstance;
 import org.scijava.struct.ValidityException;
-import org.scijava.util.MiscUtils;
 
 /**
  * Metadata about an op implementation.
@@ -40,7 +40,13 @@ default List<Member<?>> inputs() {
 
 	/** Gets the op's output parameters. */
 	default Member<?> output() {
-		return OpUtils.outputs(struct()).get(0);
+		List<Member<?>> outputs = OpUtils.outputs(struct());
+
+		if (outputs.size() == 0) throw new IllegalStateException(
+			"No outputs in Struct " + struct());
+		if (outputs.size() == 1) return outputs.get(0);
+		throw new IllegalStateException(
+			"Multiple outputs in Struct " + struct());
 	}
 
 	/** Gets the op's dependencies on other ops. */
@@ -71,6 +77,6 @@ default OpCandidate createCandidate(OpEnvironment env, OpRef ref, Map<TypeVariab
 	default int compareTo(final OpInfo that) {
 		if (this.priority() < that.priority()) return 1;
 		if (this.priority() > that.priority()) return -1;
-		return MiscUtils.compare(this.implementationName(), that.implementationName());
+		return this.implementationName().compareTo(that.implementationName());
 	}
 }
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpInfoGenerator.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpInfoGenerator.java
similarity index 54%
rename from scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpInfoGenerator.java
rename to scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpInfoGenerator.java
index 0544efd3d..cdd8dfca4 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpInfoGenerator.java
+++ b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpInfoGenerator.java
@@ -1,9 +1,7 @@
-package org.scijava.ops.engine;
+package org.scijava.ops.api;
 
 import java.util.List;
 
-import org.scijava.ops.api.OpInfo;
-
 public interface OpInfoGenerator {
 
 	List<OpInfo> generateInfos();
diff --git a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpRef.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpRef.java
index 941e024c5..2f74604ed 100644
--- a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpRef.java
+++ b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpRef.java
@@ -40,10 +40,6 @@
 /**
  * Data structure which identifies an op by name and/or type(s) and/or argument
  * type(s), along with a list of input arguments.
- * <p>
- * With the help of the {@link OpMatcher}, an {@code OpRef} holds all
- * information needed to create an appropriate {@link Op}.
- * </p>
  *
  * @author Christian Dietz (University of Konstanz)
  * @author Curtis Rueden
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpUtils.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpUtils.java
similarity index 98%
rename from scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpUtils.java
rename to scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpUtils.java
index 7115aef49..51e9a823d 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpUtils.java
+++ b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpUtils.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops.engine;
+package org.scijava.ops.api;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
@@ -38,9 +38,7 @@
 import java.util.stream.Collectors;
 
 import org.scijava.ValidityProblem;
-import org.scijava.ops.api.OpInfo;
-import org.scijava.ops.api.OpRef;
-import org.scijava.ops.engine.OpCandidate.StatusCode;
+import org.scijava.ops.api.OpCandidate.StatusCode;
 import org.scijava.struct.Member;
 import org.scijava.struct.MemberInstance;
 import org.scijava.struct.Struct;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpWrapper.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpWrapper.java
similarity index 94%
rename from scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpWrapper.java
rename to scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpWrapper.java
index e0c937914..e7a6a3666 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpWrapper.java
+++ b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpWrapper.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.engine;
+package org.scijava.ops.api;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
diff --git a/scijava/scijava-ops-api/templates/main/java/org/scijava/ops/api/Globals.list b/scijava/scijava-ops-api/templates/main/java/org/scijava/ops/api/Globals.list
new file mode 100644
index 000000000..683b34d16
--- /dev/null
+++ b/scijava/scijava-ops-api/templates/main/java/org/scijava/ops/api/Globals.list
@@ -0,0 +1,121 @@
+maxArity = 16
+numConsumers = maxArity+1
+
+inplaceSuffix = ```
+{ arity, num ->
+  arity == 1 ? '1' :
+  arity + "_" + num
+}
+```
+simplifiedInplace = ```
+{ arity, num ->
+  arity == 1 ? "Arity1" :
+  "Arity" + inplaceSuffix(arity, num)
+}
+```
+inplaceType = ```
+{ arity, num ->
+  "Inplaces." + simplifiedInplace(arity,num)
+}
+```
+computerArity = ```
+{ arity ->
+  "Computers.Arity${arity}"
+}
+```
+consumerArity = ```
+{ arity ->
+  arity == 0 ? 'Consumer' :
+  arity == 1 ? 'BiConsumer' :
+  "Consumers.Arity${arity+1}"
+}
+```
+functionArity = ```
+{ arity ->
+  arity == 0 ? 'Producer' :
+  arity == 1 ? 'Function' :
+  arity == 2 ? 'BiFunction' :
+  "Functions.Arity${arity}"
+}
+```
+genericParamTypes = ```
+{ arity ->
+  arity == 0 ? ['O'] :
+  arity == 1 ? ['I', 'O'] :
+  (1..arity).stream().map{a -> "I$a"}.collect() + ['O']
+}
+```
+generics = ```
+{ arity ->
+  '<' + String.join(', ', genericParamTypes(arity)) + '>'
+}
+```
+genericsNamesList = ```
+{ arity ->
+  genericParamTypes(arity).stream().map{a -> 
+    a == 'O' ? "out" :
+    a == 'I' ? "in" :
+    "in${a.substring(1)}"
+  }.collect()
+}
+```
+nilNames = ```
+{ arity ->
+  genericsNamesList(arity).stream().map{a -> "${a}Type"}.collect()
+}
+```
+typeArgs = ```
+{ arity ->
+  String.join(', ', nilNames(arity).stream().map{a -> "${a}.getType()"}.collect())
+}
+```
+typeParamsList = ```
+{ arity ->
+  gpt = genericParamTypes(arity)
+  names = genericsNamesList(arity)
+  (0..arity).stream().map{a -> "${gpt[a]} ${names[a]}"}.collect()
+}
+```
+typeParamsListWithoutOutput = ```
+{ arity ->
+  gpt = genericParamTypes(arity)
+  names = genericsNamesList(arity)
+  (0..arity-1).stream().map{a -> "${gpt[a]} ${names[a]}"}.collect()
+}
+```
+applyParams = ```
+{ arity ->
+  typeParams = typeParamsList(arity)
+  typeParams.remove(typeParams.size() - 1)
+  String.join(', ', typeParams)
+}
+```
+applyArgs = ```
+{ arity ->
+  names = genericsNamesList(arity)
+  String.join(', ', names[0..names.size() - 2])
+}
+```
+computeParams = ```
+{ arity ->
+  typeParams = typeParamsList(arity)
+  typeParams.set(arity, "@Container " + typeParams.get(arity))
+  String.join(', ', typeParams)
+}
+```
+acceptParams = ```
+{ arity ->
+  String.join(', ', typeParamsList(arity).stream().map{a -> "final " + a}.collect())
+}
+```
+computeArgs = ```
+{ arity ->
+  String.join(', ', genericsNamesList(arity))
+}
+```
+acceptArgs = ```
+{ arity ->
+  computeArgs(arity)
+}
+```
+
diff --git a/scijava/scijava-ops-api/templates/main/java/org/scijava/ops/api/OpBuilder.list b/scijava/scijava-ops-api/templates/main/java/org/scijava/ops/api/OpBuilder.list
new file mode 100644
index 000000000..e231684ce
--- /dev/null
+++ b/scijava/scijava-ops-api/templates/main/java/org/scijava/ops/api/OpBuilder.list
@@ -0,0 +1,131 @@
+.include templates/main/java/org/scijava/ops/api/Globals.list
+arities = (1..maxArity).collect()
+
+[OpBuilder.java]
+inplaceMatchNumber = ```
+{ arity, num ->
+  arity == 1 ? '' :
+  "$num"
+}
+```
+generics = ```
+{ arity ->
+  arity == 0 ? '<O>' :
+  '<' + String.join(', ', (1..arity).stream().map{a -> "I$a"}.collect()) + ', O>'
+}
+```
+genericsWithoutOutput = ```
+{ arity ->
+  arity == 1 ? '<I1>' :
+  '<' + String.join(', ', (1..arity).stream().map{a -> "I$a"}.collect()) + '>'
+}
+```
+genericsWildcardFunction = ```
+{ arity ->
+  arity == 0 ? '<?>' :
+  '<' + String.join(', ', (1..arity).stream().map{a -> "I$a"}.collect()) + ', ?>'
+}
+```
+inputObjectsArgs = ```
+{ arity ->
+  String.join(', ', (1..arity).stream().map{a -> "final I$a in$a"}.collect())
+}
+```
+inputObjects = ```
+{ arity ->
+  String.join(', ', (1..arity).stream().map{a -> "in$a"}.collect())
+}
+```
+inputClassesArgs = ```
+{ arity ->
+  String.join(', ', (1..arity).stream().map{a -> "final Class<I$a> in${a}Class"}.collect())
+}
+```
+inputClassesToTypes = ```
+{ arity ->
+  String.join(', ', (1..arity).stream().map{a -> "Nil.of(in${a}Class)"}.collect())
+}
+```
+inputTypesArgs = ```
+{ arity ->
+  arity == 0 ? '' : 
+  String.join(', ', (1..arity).stream().map{a -> "final Nil<I$a> in${a}Type"}.collect())
+}
+```
+inputTypesFromArgs = ```
+{ arity ->
+  String.join(', ', (1..arity).stream().map{a -> "type(in$a)"}.collect())
+}
+```
+inputTypesArgsWithOutput = ```
+{ arity ->
+  arity == 0 ? 'final Nil<O> outType' : 
+  String.join(', ', (1..arity).stream().map{a -> "final Nil<I$a> in${a}Type"}.collect()) + ', final Nil<O> outType'
+}
+```
+inputTypes = ```
+{ arity ->
+  arity == 0 ? '' : 
+  String.join(', ', (1..arity).stream().map{a -> "in${a}Type"}.collect())
+}
+```
+inputTypesWithOutput = ```
+{ arity ->
+  arity == 0 ? 'outType' : 
+  String.join(', ', (1..arity).stream().map{a -> "in${a}Type"}.collect()) + ', outType'
+}
+```
+simplifiedClass = ```
+{ arity, num ->
+  simplifiedInplace(arity, num) + '.class'
+}
+```
+inplaceClass = ```
+{ arity, num ->
+  inplaceType(arity, num) + '.class'
+}
+```
+matchName = ```
+{ arity, num ->
+  arity == 1 ? "matchInplace" :
+  "matchInplace${num}"
+}
+```
+inplaceTypeVarNums = ```
+{ arity, io ->
+  (1..arity).subList(0, io - 1) + 'O' + (1..arity).subList(io, arity)
+}
+```
+inplaceGenericsList = ```
+{ arity, io ->
+  inplaceTypeVarNums(arity, io).stream().map{a -> "I$a"}.collect()
+}
+```
+inplaceGenerics = ```
+{ arity, io ->
+  '<' + String.join(', ', inplaceGenericsList(arity, io)) + '>'
+}
+```
+matchParams = ```
+{ arity, io ->
+  String.join(', ', inplaceGenericsList(arity, io).stream().map{a -> 
+    a.charAt(1) == 'O'? 
+	"final Nil<$a> ${a.toLowerCase()}Type"  :
+	"final Nil<$a> in${a.substring(1)}Type"}.collect())
+}
+```
+typeVarNums = ```
+{ arity, io ->
+  (1..arity).subList(0, io - 1) + 'O' + (1..arity).subList(io, arity)
+}
+```
+basicParamsList = ```
+{ arity, io -> 
+	typeVarNums(arity, io).stream().map{a -> a == 'O' ? "ioType" : "in${a}Type"}.collect()
+}
+```
+basicParams = ```
+{ arity, io ->
+  String.join(', ', basicParamsList(arity, io))
+}
+```
\ No newline at end of file
diff --git a/scijava/scijava-ops-api/templates/main/java/org/scijava/ops/api/OpBuilder.vm b/scijava/scijava-ops-api/templates/main/java/org/scijava/ops/api/OpBuilder.vm
new file mode 100644
index 000000000..3e5be98c5
--- /dev/null
+++ b/scijava/scijava-ops-api/templates/main/java/org/scijava/ops/api/OpBuilder.vm
@@ -0,0 +1,676 @@
+/*
+ * #%L
+ * SciJava Operations: a framework for reusable algorithms.
+ * %%
+ * Copyright (C) 2016 - 2019 SciJava Ops developers.
+ * %%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+/*
+* This is autogenerated source code -- DO NOT EDIT. Instead, edit the
+* corresponding template in templates/ and rerun bin/generate.groovy.
+*/
+
+package org.scijava.ops.api;
+
+import java.lang.reflect.Type;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+
+import org.scijava.function.Computers;
+import org.scijava.function.Functions;
+import org.scijava.function.Inplaces;
+import org.scijava.function.Producer;
+import org.scijava.types.Nil;
+import org.scijava.types.Types;
+
+/**
+ * Convenience class for looking up and/or executing ops using a builder
+ * pattern.
+ * <p>
+ * TODO: Examples
+ * </p>
+ *
+ * @author Curtis Rueden
+ * @author Gabriel Selzer
+ */
+public class OpBuilder {
+
+	private final OpEnvironment env;
+	private final String opName;
+
+	public OpBuilder(final OpEnvironment env, final String opName) {
+		this.env = env;
+		this.opName = opName;
+	}
+
+	/** Specifies the op accepts no inputs&mdash;i.e., a nullary op. */
+	public Arity0_OU input() {
+		return new Arity0_OU();
+	}
+
+#foreach($arity in $arities)
+	/** Specifies $arity input by value. */
+	public $genericsWithoutOutput.call($arity) Arity${arity}_IV_OU$genericsWithoutOutput.call($arity) input($inputObjectsArgs.call($arity))
+	{
+		return new Arity${arity}_IV_OU<>($inputObjects.call($arity));
+	}
+
+	/** Specifies $arity input by raw type. */
+	public $genericsWithoutOutput.call($arity) Arity${arity}_IT_OU$genericsWithoutOutput.call($arity) inType($inputClassesArgs.call($arity))
+	{
+		return inType($inputClassesToTypes.call($arity));
+	}
+
+	/** Specifies $arity input by generic type. */
+	public $genericsWithoutOutput.call($arity) Arity${arity}_IT_OU$genericsWithoutOutput.call($arity) inType($inputTypesArgs.call($arity))
+	{
+		return new Arity${arity}_IT_OU<>($inputTypes.call($arity));
+	}
+
+#end
+	// -- Helper methods --
+
+	@SuppressWarnings({ "unchecked" })
+	private <T> Nil<T> type(Object obj) {
+		// FIXME: This vacuous T and unsafe cast is wrong.
+		return (Nil<T>) Nil.of(env.genericType(obj));
+	}
+
+	private void checkComputerRefs(Object... objects) {
+		checkRefs(objects.length - 1, "Output", objects);
+	}
+
+	private void checkInplaceRefs(int inplaceNo, Object... objects) {
+		checkRefs(inplaceNo - 1, "Mutable input " + inplaceNo, objects);
+	}
+
+	private void checkRefs(int mutableIndex, String label, Object... objects) {
+		for (int i = 0; i < objects.length; i++) {
+			if (i == mutableIndex) continue;
+			if (objects[mutableIndex] == objects[i]) {
+				throw new IllegalArgumentException(label +
+					" cannot be same reference as input #" + (i + 1));
+			}
+		}
+	}
+
+	// @formatter:off
+	/*
+	 * -- HELPER CLASSES --
+	 * 
+	 * For each arity, there are multiple conditions:
+	 * * Input TYPES are given (IT) 
+	 * 	1) The output is unspecified (OU): 
+	 * 		a) matchable: Function, Inplace
+	 * 		b) runnable: none
+	 * 	2) The output type is given (OT): 
+	 * 		a) matchable: Function, Computer
+	 * 		b) runnable: none
+	 *  
+	 * * Input VALUES are given (IV) (N.B. this case applies for Arity0):
+	 * 	1) The output is unspecified (OU): 
+	 * 		a) matchable: Function, Inplace
+	 * 		b) runnable: apply, mutate
+	 * 	2) The output type is given (OT): 
+	 * 		a) matchable: Function, Computer
+	 * 		b) runnable: apply
+	 * 	3) The output value is given (OV): 
+	 * 		a) matchable: Computer
+	 *  	b) runnable: compute
+	 */
+	// @formatter:on
+
+	/**
+	 * Builder with arity 0, output unspecified.
+	 *
+	 * @author Curtis Rueden
+	 */
+	public final class Arity0_OU {
+
+		public <O> Arity0_OV<O> output(final O out) {
+			return new Arity0_OV<>(out);
+		}
+
+		public <O> Arity0_OT<O> outType(final Class<O> outType) {
+			return outType(Nil.of(outType));
+		}
+
+		public <O> Arity0_OT<O> outType(final Nil<O> outType) {
+			return new Arity0_OT<>(outType);
+		}
+
+		public Producer<?> producer() {
+			final Nil<Producer<Object>> specialType = new Nil<>() {
+
+				@Override
+				public Type getType() {
+					return Types.parameterize(Producer.class, new Type[] {
+						Object.class });
+				}
+			};
+			return env.op(opName, specialType, new Nil<?>[0], Nil.of(
+				Object.class));
+		}
+
+		public Producer<?> producer(final Hints hints) {
+			final Nil<Producer<Object>> specialType = new Nil<>() {
+
+				@Override
+				public Type getType() {
+					return Types.parameterize(Producer.class, new Type[] {
+						Object.class });
+				}
+			};
+			return env.op(opName, specialType, new Nil<?>[0], Nil.of(
+				Object.class, hints));
+		}
+
+		public Object create() {
+			return producer().create();
+		}
+
+		public Object create(final Hints hints) {
+			return producer(hints).create();
+		}
+	}
+
+	/**
+	 * Builder with arity 0, output type given.
+	 *
+	 * @author Curtis Rueden
+	 * @param <O> The type of the output.
+	 */
+	public final class Arity0_OT<O> {
+
+		private final Nil<O> outType;
+
+		public Arity0_OT(final Nil<O> outType) {
+			this.outType = outType;
+		}
+
+		public Producer<O> producer() {
+			final Nil<Producer<O>> specialType = new Nil<>() {
+
+				@Override
+				public Type getType() {
+					return Types.parameterize(Producer.class, new Type[] { outType
+						.getType() });
+				}
+			};
+			return env.op(opName, specialType, new Nil<?>[0], outType);
+		}
+
+		public Producer<O> producer(final Hints hints) {
+			final Nil<Producer<O>> specialType = new Nil<>() {
+
+				@Override
+				public Type getType() {
+					return Types.parameterize(Producer.class, new Type[] { outType
+						.getType() });
+				}
+			};
+			return env.op(opName, specialType, new Nil<?>[0], outType, hints);
+		}
+
+		public Computers.Arity0<O> computer() {
+			return matchComputer(env, opName, outType);
+		}
+
+		public O create() {
+			return producer().create();
+		}
+
+		public Computers.Arity0<O> computer(Hints hints) {
+			return matchComputer(env, opName, outType, hints);
+		}
+
+		public O create(Hints hints) {
+			return producer(hints).create();
+		}
+
+	}
+
+	/**
+	 * Builder with arity 0, output value given.
+	 *
+	 * @author Curtis Rueden
+	 * @param <O> The type of the output.
+	 */
+	public final class Arity0_OV<O> {
+
+		private final O out;
+
+		public Arity0_OV(final O out) {
+			this.out = out;
+		}
+
+		public Computers.Arity0<O> computer() {
+			return matchComputer(env, opName, type(out));
+		}
+
+		public void compute() {
+			computer().compute(out);
+		}
+
+		public Computers.Arity0<O> computer(final Hints hints) {
+			return matchComputer(env, opName, type(out), hints);
+		}
+
+		public void compute(final Hints hints) {
+			computer(hints).compute(out);
+		}
+
+	}
+
+#foreach($arity in $arities)
+	/**
+	 * Builder with arity $arity, input type given, output type given.
+	 *
+	 * @author Curtis Rueden
+#foreach($a in [1..$arity])
+	 * @param <I$a> The type of input $a.
+#end
+	 * @param <O> The type of the output.
+	 */
+	public final class Arity${arity}_IT_OT$generics.call($arity) {
+
+#foreach($a in [1..$arity])
+		private final Nil<I$a> in${a}Type;
+#end
+		private final Nil<O> outType;
+
+		public Arity${arity}_IT_OT($inputTypesArgsWithOutput.call($arity))
+		{
+#foreach($a in [1..$arity])			
+			this.in${a}Type = in${a}Type;
+#end
+			this.outType = outType;
+		}
+
+		public $functionArity.call($arity)$generics.call($arity) function() {
+			return matchFunction(env, opName, $inputTypesWithOutput.call($arity));
+		}
+
+		public $functionArity.call($arity)$generics.call($arity) function(final Hints hints) {
+			return matchFunction(env, opName, $inputTypesWithOutput.call($arity), hints);
+		}
+
+		public Computers.Arity${arity}$generics.call($arity) computer() {
+			return matchComputer(env, opName, $inputTypesWithOutput.call($arity));
+		}
+
+		public Computers.Arity${arity}$generics.call($arity) computer(final Hints hints) {
+			return matchComputer(env, opName, $inputTypesWithOutput.call($arity), hints);
+		}
+
+#foreach($a in [1..$arity])
+		public Inplaces.Arity$inplaceSuffix.call($arity, $a)$genericsWithoutOutput.call($arity) inplace${inplaceMatchNumber.call($arity, $a)}() {
+			return matchInplace${inplaceMatchNumber.call($arity, $a)}(env, opName, $inputTypes.call($arity));
+		}
+
+#end
+	}
+
+	/**
+	 * Builder with arity $arity, input type given, output unspecified.
+	 *
+	 * @author Curtis Rueden
+#foreach($a in [1..$arity])
+	 * @param <I$a> The type of input $a.
+#end
+	 */
+	public final class Arity${arity}_IT_OU$genericsWithoutOutput.call($arity) {
+
+#foreach($a in [1..$arity])
+		private final Nil<I$a> in${a}Type;
+#end
+
+		public Arity${arity}_IT_OU($inputTypesArgs.call($arity))
+		{
+#foreach($a in [1..$arity])			
+			this.in${a}Type = in${a}Type;
+#end
+		}
+
+		public <O> Arity${arity}_IT_OT$generics.call($arity) outType(final Class<O> outType) {
+			return outType(Nil.of(outType));
+		}
+
+		public <O> Arity${arity}_IT_OT$generics.call($arity) outType(final Nil<O> outType) {
+			return new Arity${arity}_IT_OT<>($inputTypesWithOutput.call($arity));
+		}
+
+		public $functionArity.call($arity)$genericsWildcardFunction.call($arity) function() {
+			return matchFunction(env, opName, $inputTypes.call($arity), Nil.of(Object.class));
+		}
+
+		public $functionArity.call($arity)$genericsWildcardFunction.call($arity) function(final Hints hints) {
+			return matchFunction(env, opName, $inputTypes.call($arity), Nil.of(Object.class), hints);
+		}
+
+#foreach($a in [1..$arity])
+		public Inplaces.Arity$inplaceSuffix.call($arity, $a)$genericsWithoutOutput.call($arity) inplace${inplaceMatchNumber.call($arity, $a)}() {
+			return matchInplace${inplaceMatchNumber.call($arity, $a)}(env, opName, $inputTypes.call($arity));
+		}
+
+#end
+	}
+
+	/**
+	 * Builder with arity ${arity}, input value given, output type given.
+	 *
+	 * @author Curtis Rueden
+#foreach($a in [1..$arity])
+	 * @param <I$a> The type of input $a.
+#end
+	 * @param <O> The type of the output.
+	 */
+	public final class Arity${arity}_IV_OT$generics.call($arity) {
+
+#foreach($a in [1..$arity])
+		private final I$a in${a};
+#end
+		private final Nil<O> outType;
+
+		public Arity${arity}_IV_OT($inputObjectsArgs.call($arity), final Nil<O> outType)
+		{
+#foreach($a in [1..$arity])
+			this.in$a = in$a;
+#end
+			this.outType = outType;
+		}
+
+		public $functionArity.call($arity)$generics.call($arity) function() {
+			return matchFunction(env, opName, $inputTypesFromArgs.call($arity), outType);
+		}
+	
+		public $functionArity.call($arity)$generics.call($arity) function(final Hints hints) {
+			return matchFunction(env, opName, $inputTypesFromArgs.call($arity), outType, hints);
+		}
+	
+		public Computers.Arity${arity}$generics.call($arity) computer() {
+			return matchComputer(env, opName, $inputTypesFromArgs.call($arity), outType);
+		}
+
+		public Computers.Arity${arity}$generics.call($arity) computer(final Hints hints) {
+			return matchComputer(env, opName, $inputTypesFromArgs.call($arity), outType, hints);
+		}
+	
+		public O apply() {
+			return function().apply($inputObjects.call($arity));
+		}
+
+		public O apply(final Hints hints) {
+			return function(hints).apply($inputObjects.call($arity));
+		}
+	}
+
+	/**
+	 * Builder with arity $arity, input value given, output unspecified.
+	 *
+	 * @author Curtis Rueden
+#foreach($a in [1..$arity])
+	 * @param <I$a> The type of input $a.
+#end
+	 */
+	public final class Arity${arity}_IV_OU$genericsWithoutOutput.call($arity) {
+
+#foreach($a in [1..$arity])
+		private final I$a in$a;
+#end
+
+		public Arity${arity}_IV_OU($inputObjectsArgs.call($arity))
+		{
+#foreach($a in [1..$arity])
+			this.in$a = in$a;
+#end
+		}
+
+		public <O> Arity${arity}_IV_OV$generics.call($arity) output(final O out) {
+			checkComputerRefs($inputObjects.call($arity), out);
+			return new Arity${arity}_IV_OV<>($inputObjects.call($arity), out);
+		}
+
+		public <O> Arity${arity}_IV_OT$generics.call($arity) outType(final Class<O> outType) {
+			return outType(Nil.of(outType));
+		}
+
+		public <O> Arity${arity}_IV_OT$generics.call($arity) outType(final Nil<O> outType) {
+			return new Arity${arity}_IV_OT<>($inputObjects.call($arity), outType);
+		}
+
+		public $functionArity.call($arity)$genericsWildcardFunction.call($arity) function() {
+			return matchFunction(env, opName, $inputTypesFromArgs.call($arity), Nil.of(Object.class));
+		}
+
+		public $functionArity.call($arity)$genericsWildcardFunction.call($arity) function(final Hints hints) {
+			return matchFunction(env, opName, $inputTypesFromArgs.call($arity), Nil.of(Object.class), hints);
+		}
+
+#foreach($a in [1..$arity])
+		public Inplaces.Arity$inplaceSuffix.call($arity, $a)$genericsWithoutOutput.call($arity) inplace${inplaceMatchNumber.call($arity, $a)}() {
+			checkInplaceRefs($a, $inputObjects.call($arity));
+			return matchInplace${inplaceMatchNumber.call($arity, $a)}(env, opName, $inputTypesFromArgs.call($arity));
+		}
+
+#end
+#foreach($a in [1..$arity])
+		public Inplaces.Arity$inplaceSuffix.call($arity, $a)$genericsWithoutOutput.call($arity) inplace${inplaceMatchNumber.call($arity, $a)}(final Hints hints) {
+			checkInplaceRefs($a, $inputObjects.call($arity));
+			return matchInplace${inplaceMatchNumber.call($arity, $a)}(env, opName, $inputTypesFromArgs.call($arity), hints);
+		}
+
+#end
+		public Object apply() {
+			return function().apply($inputObjects.call($arity));
+		}
+
+		public Object apply(final Hints hints) {
+			return function(hints).apply($inputObjects.call($arity));
+		}
+
+#foreach($a in [1..$arity])
+		public void mutate${inplaceMatchNumber.call($arity, $a)}() {
+			inplace${inplaceMatchNumber.call($arity, $a)}().mutate($inputObjects.call($arity));
+		}
+
+#end
+#foreach($a in [1..$arity])
+		public void mutate${inplaceMatchNumber.call($arity, $a)}(final Hints hints) {
+			inplace${inplaceMatchNumber.call($arity, $a)}(hints).mutate($inputObjects.call($arity));
+		}
+
+#end
+	}
+
+	/**
+	 * Builder with arity $arity, input value given, output value given.
+	 *
+	 * @author Curtis Rueden
+#foreach($a in [1..$arity])
+	 * @param <I$a> The type of input $a.
+#end
+	 */
+	public final class Arity${arity}_IV_OV${generics.call($arity)} {
+
+#foreach($a in [1..$arity])
+		private final I$a in$a;
+#end
+		private final O out;
+
+		public Arity${arity}_IV_OV($inputObjectsArgs.call($arity), final O out)
+		{
+#foreach($a in [1..$arity])
+			this.in$a = in$a;
+#end
+			this.out = out;
+		}
+
+		public Computers.Arity${arity}${generics.call($arity)} computer() {
+			return matchComputer(env, opName, $inputTypesFromArgs.call($arity), type(out));
+		}
+
+		public void compute() {
+			computer().compute($inputObjects.call($arity), out);
+		}
+
+		public Computers.Arity${arity}${generics.call($arity)} computer(final Hints hints) {
+			return matchComputer(env, opName, $inputTypesFromArgs.call($arity), type(out), hints);
+		}
+
+		public void compute(final Hints hints) {
+			computer(hints).compute($inputObjects.call($arity), out);
+		}
+
+	}
+#end
+
+#foreach($arity in [0..$maxArity])
+	@SuppressWarnings({ "unchecked" })
+	public static $generics.call($arity) $functionArity.call($arity)$generics.call($arity) matchFunction(final OpEnvironment env, final String opName, $inputTypesArgsWithOutput.call($arity))
+	{
+		return matchFunctionHelper(env, opName, ${functionArity.call($arity)}.class, outType#if( $arity == 0)#{else}, #end$inputTypes.call($arity));
+	}
+
+#end
+#foreach($arity in [0..$maxArity])
+	@SuppressWarnings({ "unchecked" })
+	public static $generics.call($arity) $functionArity.call($arity)$generics.call($arity) matchFunction(final OpEnvironment env, final String opName, $inputTypesArgsWithOutput.call($arity), final Hints hints)
+	{
+		return matchFunctionHelper(env, opName, hints, ${functionArity.call($arity)}.class, outType#if( $arity == 0)#{else}, #end$inputTypes.call($arity));
+	}
+
+#end
+	@SuppressWarnings({ "unchecked" })
+	private static <T> T matchFunctionHelper(final OpEnvironment env, final String opName,
+		final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
+	{
+		final Type[] types = new Type[inTypes.length + 1];
+		for (int i = 0; i < inTypes.length; i++)
+			types[i] = inTypes[i].getType();
+		types[types.length - 1] = outType.getType();
+		final Type specialType = Types.parameterize(opClass, types);
+		return (T) env.op(opName, Nil.of(specialType), inTypes, outType);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	private static <T> T matchFunctionHelper(final OpEnvironment env, final String opName, final Hints hints,
+		final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
+	{
+		final Type[] types = new Type[inTypes.length + 1];
+		for (int i = 0; i < inTypes.length; i++)
+			types[i] = inTypes[i].getType();
+		types[types.length - 1] = outType.getType();
+		final Type specialType = Types.parameterize(opClass, types);
+		return (T) env.op(opName, Nil.of(specialType), inTypes, outType, hints);
+	}
+
+#foreach($arity in [0..$maxArity])
+	@SuppressWarnings("unchecked")
+	public static $generics.call($arity) $computerArity.call($arity)$generics.call($arity) matchComputer(final OpEnvironment env, final String opName, $inputTypesArgsWithOutput.call($arity))
+	{
+		return matchComputerHelper(env, opName, ${computerArity.call($arity)}.class, outType#if( $arity == 0)#{else}, #end$inputTypes.call($arity));
+	}
+
+#end
+#foreach($arity in [0..$maxArity])
+	@SuppressWarnings("unchecked")
+	public static $generics.call($arity) $computerArity.call($arity)$generics.call($arity) matchComputer(final OpEnvironment env, final String opName, $inputTypesArgsWithOutput.call($arity), final Hints hints)
+	{
+		return matchComputerHelper(env, opName, hints, ${computerArity.call($arity)}.class, outType#if( $arity == 0)#{else}, #end$inputTypes.call($arity));
+	}
+
+#end
+	@SuppressWarnings({ "unchecked" })
+	private static <T> T matchComputerHelper(final OpEnvironment env, final String opName, final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
+	{
+		final Type[] types = new Type[inTypes.length + 1];
+		for (int i = 0; i < inTypes.length; i++)
+			types[i] = inTypes[i].getType();
+		types[types.length - 1] = outType.getType();
+		final Type specialType = Types.parameterize(opClass, types);
+		final Nil<?>[] nils = new Nil[inTypes.length + 1];
+		System.arraycopy(inTypes, 0, nils, 0, inTypes.length);
+		nils[nils.length - 1] = outType;
+		return (T) env.op(opName, Nil.of(specialType), nils, outType);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	private static <T> T matchComputerHelper(final OpEnvironment env, final String opName, final Hints hints, final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
+	{
+		final Type[] types = new Type[inTypes.length + 1];
+		for (int i = 0; i < inTypes.length; i++)
+			types[i] = inTypes[i].getType();
+		types[types.length - 1] = outType.getType();
+		final Type specialType = Types.parameterize(opClass, types);
+		final Nil<?>[] nils = new Nil[inTypes.length + 1];
+		System.arraycopy(inTypes, 0, nils, 0, inTypes.length);
+		nils[nils.length - 1] = outType;
+		return (T) env.op(opName, Nil.of(specialType), nils, outType, hints);
+	}
+
+#foreach($arity in $arities)
+#foreach($a in [1..$arity])
+	@SuppressWarnings({ "unchecked" })
+	public static $inplaceGenerics.call($arity, $a) $inplaceType.call($arity, $a)$inplaceGenerics.call($arity, $a) $matchName.call($arity, $a)(final OpEnvironment env, final String opName, $matchParams.call($arity, $a))
+	{
+		return matchInplaceHelper(env, opName, ${inplaceClass.call($arity, $a)}, ioType, new Nil[] {${basicParams.call($arity, $a)}});
+	}
+
+#end
+#end
+
+#foreach($arity in $arities)
+#foreach($a in [1..$arity])
+	@SuppressWarnings({ "unchecked" })
+	public static $inplaceGenerics.call($arity, $a) $inplaceType.call($arity, $a)$inplaceGenerics.call($arity, $a) $matchName.call($arity, $a)(final OpEnvironment env, final String opName, $matchParams.call($arity, $a), final Hints hints)
+	{
+		return matchInplaceHelper(env, opName, hints, ${inplaceType.call($arity, $a)}.class, ioType, new Nil[] {${basicParams.call($arity, $a)}});
+	}
+
+#end
+#end
+	@SuppressWarnings({ "unchecked" })
+	private static <T> T matchInplaceHelper(final OpEnvironment env, final String opName,
+		final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
+	{
+		final Type[] types = new Type[inTypes.length];
+		for (int i = 0; i < inTypes.length; i++)
+			types[i] = inTypes[i].getType();
+		final Type specialType = Types.parameterize(opClass, types);
+		return (T) env.op(opName, Nil.of(specialType), inTypes, outType);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	private static <T> T matchInplaceHelper(final OpEnvironment env, final String opName, final Hints hints,
+		final Class<T> opClass, final Nil<?> outType, final Nil<?>... inTypes)
+	{
+		final Type[] types = new Type[inTypes.length];
+		for (int i = 0; i < inTypes.length; i++)
+			types[i] = inTypes[i].getType();
+		final Type specialType = Types.parameterize(opClass, types);
+		return (T) env.op(opName, Nil.of(specialType), inTypes, outType, hints);
+	}
+}
diff --git a/scijava/scijava-ops-engine/pom.xml b/scijava/scijava-ops-engine/pom.xml
index e75637771..334c4bcca 100644
--- a/scijava/scijava-ops-engine/pom.xml
+++ b/scijava/scijava-ops-engine/pom.xml
@@ -117,12 +117,10 @@
 	</build>
 	<dependencies>
 		<!-- SciJava dependencies -->
-		<!-- 
 		<dependency>
 			<groupId>org.scijava</groupId>
 			<artifactId>scijava-common</artifactId>
 		</dependency>
-		-->
 		<dependency>
 			<groupId>org.scijava</groupId>
 			<artifactId>scijava-ops-api</artifactId>
@@ -158,20 +156,10 @@
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>io.leangen.geantyref</groupId>
-			<artifactId>geantyref</artifactId>
-			<version>${geantyref.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.javassist</groupId>
 			<artifactId>javassist</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>javax.annotation</groupId>
-			<artifactId>javax.annotation-api</artifactId>
-			<version>1.3.1</version>
-		</dependency>
 		<dependency>
 			<groupId>com.github.therapi</groupId>
 			<artifactId>therapi-runtime-javadoc</artifactId>
@@ -180,24 +168,8 @@
 
 		<!-- Test scope dependencies -->
 		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-api</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-engine</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.vintage</groupId>
-			<artifactId>junit-vintage-engine</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.scijava</groupId>
-			<artifactId>scijava-testutil</artifactId>
-			<version>${project.version}</version>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/scijava/scijava-ops-engine/src/main/java/module-info.java b/scijava/scijava-ops-engine/src/main/java/module-info.java
index a1584260f..e7548ff15 100644
--- a/scijava/scijava-ops-engine/src/main/java/module-info.java
+++ b/scijava/scijava-ops-engine/src/main/java/module-info.java
@@ -33,9 +33,6 @@
 	opens org.scijava.ops.engine.util to therapi.runtime.javadoc;
 	opens org.scijava.ops.engine.math to therapi.runtime.javadoc;
 
-	// FIXME: This is a file name and is thus unstable
-	requires geantyref;
-
 	requires java.desktop;
 
 	requires org.scijava;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/AnnotatedOpDependencyMember.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/AnnotatedOpDependencyMember.java
index 911ec0d3b..f09b7c79c 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/AnnotatedOpDependencyMember.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/AnnotatedOpDependencyMember.java
@@ -32,6 +32,7 @@
 
 import java.lang.reflect.Type;
 
+import org.scijava.ops.api.OpDependencyMember;
 import org.scijava.ops.spi.OpDependency;
 
 /**
@@ -63,7 +64,7 @@ public OpDependency getAnnotation() {
 	public String getDependencyName() {
 		return annotation.name();
 	}
-	
+
 	@Override
 	public boolean isAdaptable() {
 		return annotation.adaptable();
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/NeededOp.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/NeededOp.java
deleted file mode 100644
index 6dbca0055..000000000
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/NeededOp.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.scijava.ops.engine;
-
-public @interface NeededOp {
-
-	String name();
-}
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpDependencies.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpDependencies.java
deleted file mode 100644
index 842a7f400..000000000
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpDependencies.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * #%L
- * ImageJ software for multidimensional image processing and analysis.
- * %%
- * Copyright (C) 2014 - 2016 Board of Regents of the University of
- * Wisconsin-Madison and University of Konstanz.
- * %%
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * #L%
- */
-
-package org.scijava.ops.engine;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.scijava.ops.spi.OpDependency;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface OpDependencies {
-
-	OpDependency[] value();
-
-}
\ No newline at end of file
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpHistoryService.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpHistoryService.java
index d8c71925b..41e25ba0c 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpHistoryService.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpHistoryService.java
@@ -1,5 +1,6 @@
 package org.scijava.ops.engine;
 
+import org.scijava.ops.api.OpHistory;
 import org.scijava.service.SciJavaService;
 
 
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpInstance.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpInstance.java
index 37c770d0b..313c7cf5c 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpInstance.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpInstance.java
@@ -5,6 +5,8 @@
 import java.util.Map;
 import java.util.Objects;
 
+import org.scijava.ops.api.OpInfo;
+
 /**
  * An instance of an {@link OpInfo}
  * 
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/IdentityLossReporter.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/IdentityLossReporter.java
index e4166030f..4a745906f 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/IdentityLossReporter.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/IdentityLossReporter.java
@@ -1,7 +1,7 @@
 
 package org.scijava.ops.engine.conversionLoss;
 
-import org.scijava.ops.engine.OpHints;
+import org.scijava.ops.api.OpHints;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
 import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/LossReporterWrapper.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/LossReporterWrapper.java
index b6c28d1e8..59de4d504 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/LossReporterWrapper.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/LossReporterWrapper.java
@@ -3,12 +3,12 @@
 import java.lang.reflect.Type;
 import java.util.UUID;
 
+import org.scijava.ops.api.Hints;
+import org.scijava.ops.api.OpExecutionSummary;
+import org.scijava.ops.api.OpHistory;
+import org.scijava.ops.api.OpInfo;
+import org.scijava.ops.api.OpWrapper;
 import org.scijava.ops.engine.BaseOpHints.DependencyMatching;
-import org.scijava.ops.engine.Hints;
-import org.scijava.ops.engine.OpExecutionSummary;
-import org.scijava.ops.engine.OpHistory;
-import org.scijava.ops.engine.OpInfo;
-import org.scijava.ops.engine.OpWrapper;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.GenericTyped;
 import org.scijava.types.Nil;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/PrimitiveArrayLossReporters.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/PrimitiveArrayLossReporters.java
index d321f121c..32754b5cc 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/PrimitiveArrayLossReporters.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/PrimitiveArrayLossReporters.java
@@ -1,6 +1,6 @@
 package org.scijava.ops.engine.conversionLoss;
 
-import org.scijava.ops.engine.OpHints;
+import org.scijava.ops.api.OpHints;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
 import org.scijava.ops.spi.OpCollection;
 import org.scijava.ops.spi.OpField;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/PrimitiveLossReporters.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/PrimitiveLossReporters.java
index 3a898c851..2a0f4dee5 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/PrimitiveLossReporters.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/PrimitiveLossReporters.java
@@ -1,7 +1,7 @@
 
 package org.scijava.ops.engine.conversionLoss;
 
-import org.scijava.ops.engine.OpHints;
+import org.scijava.ops.api.OpHints;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
 import org.scijava.ops.spi.OpCollection;
 import org.scijava.ops.spi.OpField;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpEnvironment.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpEnvironment.java
index be2ee0764..c8a153870 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpEnvironment.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpEnvironment.java
@@ -49,20 +49,20 @@
 import org.scijava.Priority;
 import org.scijava.log.LogService;
 import org.scijava.ops.api.Hints;
+import org.scijava.ops.api.OpCandidate;
+import org.scijava.ops.api.OpCandidate.StatusCode;
+import org.scijava.ops.api.OpDependencyMember;
 import org.scijava.ops.api.OpEnvironment;
 import org.scijava.ops.api.OpInfo;
+import org.scijava.ops.api.OpInfoGenerator;
 import org.scijava.ops.api.OpRef;
+import org.scijava.ops.api.OpWrapper;
 import org.scijava.ops.discovery.Discoverer;
 import org.scijava.ops.engine.BaseOpHints.Adaptation;
 import org.scijava.ops.engine.BaseOpHints.DependencyMatching;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
-import org.scijava.ops.engine.OpCandidate;
-import org.scijava.ops.engine.OpCandidate.StatusCode;
-import org.scijava.ops.engine.OpDependencyMember;
 import org.scijava.ops.engine.OpHistoryService;
-import org.scijava.ops.engine.OpInfoGenerator;
 import org.scijava.ops.engine.OpInstance;
-import org.scijava.ops.engine.OpWrapper;
 import org.scijava.ops.engine.hint.AdaptationHints;
 import org.scijava.ops.engine.hint.DefaultHints;
 import org.scijava.ops.engine.hint.SimplificationHints;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpHistory.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpHistory.java
index cd5ca2740..ff0ece8c8 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpHistory.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpHistory.java
@@ -13,9 +13,9 @@
 import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.stream.Collectors;
 
-import org.scijava.ops.engine.OpExecutionSummary;
-import org.scijava.ops.engine.OpHistory;
-import org.scijava.ops.engine.OpInfo;
+import org.scijava.ops.api.OpExecutionSummary;
+import org.scijava.ops.api.OpHistory;
+import org.scijava.ops.api.OpInfo;
 import org.scijava.ops.spi.OpDependency;
 import org.scijava.plugin.Plugin;
 import org.scijava.service.AbstractService;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpService.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpService.java
index eff03bfc4..3a5cf2dfb 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpService.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpService.java
@@ -38,10 +38,10 @@
 import org.scijava.log.LogService;
 import org.scijava.ops.api.OpBuilder;
 import org.scijava.ops.api.OpEnvironment;
+import org.scijava.ops.api.OpInfoGenerator;
 import org.scijava.ops.discovery.Discoverer;
 import org.scijava.ops.discovery.Implementation;
 import org.scijava.ops.engine.OpHistoryService;
-import org.scijava.ops.engine.OpInfoGenerator;
 import org.scijava.ops.engine.OpService;
 import org.scijava.plugin.Plugin;
 import org.scijava.plugin.PluginInfo;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/LambdaTypeBaker.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/LambdaTypeBaker.java
index 699be2bf7..390eb7102 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/LambdaTypeBaker.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/LambdaTypeBaker.java
@@ -5,7 +5,7 @@
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
 
-import org.scijava.ops.engine.OpUtils;
+import org.scijava.ops.api.OpUtils;
 import org.scijava.types.GenericTyped;
 import org.scijava.types.Types;
 import org.scijava.types.inference.InterfaceInference;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedClassOpInfoGenerator.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedClassOpInfoGenerator.java
index 4a89fbcd2..8bc55e2fb 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedClassOpInfoGenerator.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedClassOpInfoGenerator.java
@@ -5,8 +5,8 @@
 
 import org.scijava.InstantiableException;
 import org.scijava.ops.api.OpInfo;
-import org.scijava.ops.engine.OpInfoGenerator;
-import org.scijava.ops.engine.OpUtils;
+import org.scijava.ops.api.OpInfoGenerator;
+import org.scijava.ops.api.OpUtils;
 import org.scijava.ops.engine.matcher.impl.OpClassInfo;
 import org.scijava.ops.spi.Op;
 import org.scijava.plugin.PluginInfo;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedOpCollectionInfoGenerator.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedOpCollectionInfoGenerator.java
index 4a30cecc6..c4334cf05 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedOpCollectionInfoGenerator.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedOpCollectionInfoGenerator.java
@@ -8,8 +8,8 @@
 
 import org.scijava.InstantiableException;
 import org.scijava.ops.api.OpInfo;
-import org.scijava.ops.engine.OpInfoGenerator;
-import org.scijava.ops.engine.OpUtils;
+import org.scijava.ops.api.OpInfoGenerator;
+import org.scijava.ops.api.OpUtils;
 import org.scijava.ops.engine.matcher.impl.OpFieldInfo;
 import org.scijava.ops.engine.matcher.impl.OpMethodInfo;
 import org.scijava.ops.spi.OpCollection;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/SingletonOpHistoryService.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/SingletonOpHistoryService.java
index 425408118..656d30398 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/SingletonOpHistoryService.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/SingletonOpHistoryService.java
@@ -1,6 +1,6 @@
 package org.scijava.ops.engine.impl;
 
-import org.scijava.ops.engine.OpHistory;
+import org.scijava.ops.api.OpHistory;
 import org.scijava.ops.engine.OpHistoryService;
 import org.scijava.plugin.Plugin;
 import org.scijava.service.AbstractService;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/MatchingResult.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/MatchingResult.java
index 605827b23..c6f206413 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/MatchingResult.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/MatchingResult.java
@@ -3,10 +3,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.scijava.ops.api.OpCandidate;
 import org.scijava.ops.api.OpRef;
-import org.scijava.ops.engine.OpCandidate;
-import org.scijava.ops.engine.OpUtils;
-import org.scijava.ops.engine.OpCandidate.StatusCode;
+import org.scijava.ops.api.OpUtils;
+import org.scijava.ops.api.OpCandidate.StatusCode;
 
 /**
  * Class representing the result from type matching done by the
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/OpMatcher.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/OpMatcher.java
index 0e20598af..e937b4622 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/OpMatcher.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/OpMatcher.java
@@ -32,9 +32,10 @@
 import java.util.List;
 
 import org.scijava.ops.api.Hints;
+import org.scijava.ops.api.OpCandidate;
 import org.scijava.ops.api.OpEnvironment;
 import org.scijava.ops.api.OpRef;
-import org.scijava.ops.engine.OpCandidate;
+import org.scijava.ops.engine.matcher.MatchingResult;
 
 /**
  * Finds Ops which match an {@link OpRef}.
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/DefaultOpMatcher.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/DefaultOpMatcher.java
index 09ac8e3fc..a0caffebf 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/DefaultOpMatcher.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/DefaultOpMatcher.java
@@ -44,13 +44,13 @@
 import java.util.function.Predicate;
 
 import org.scijava.ops.api.Hints;
+import org.scijava.ops.api.OpCandidate;
 import org.scijava.ops.api.OpEnvironment;
 import org.scijava.ops.api.OpInfo;
 import org.scijava.ops.api.OpRef;
-import org.scijava.ops.engine.OpCandidate;
-import org.scijava.ops.engine.OpUtils;
+import org.scijava.ops.api.OpUtils;
+import org.scijava.ops.api.OpCandidate.StatusCode;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
-import org.scijava.ops.engine.OpCandidate.StatusCode;
 import org.scijava.ops.engine.hint.DefaultHints;
 import org.scijava.ops.engine.matcher.MatchingResult;
 import org.scijava.ops.engine.matcher.OpMatcher;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpAdaptationInfo.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpAdaptationInfo.java
index 0f60a534d..e403d3531 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpAdaptationInfo.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpAdaptationInfo.java
@@ -11,9 +11,9 @@
 
 import org.scijava.ValidityProblem;
 import org.scijava.ops.api.Hints;
+import org.scijava.ops.api.OpDependencyMember;
 import org.scijava.ops.api.OpInfo;
-import org.scijava.ops.engine.OpDependencyMember;
-import org.scijava.ops.engine.OpUtils;
+import org.scijava.ops.api.OpUtils;
 import org.scijava.ops.engine.BaseOpHints.Adaptation;
 import org.scijava.ops.engine.hint.ImmutableHints;
 import org.scijava.ops.engine.struct.FunctionalParameters;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpClassInfo.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpClassInfo.java
index f2c67d020..bfd80f2cc 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpClassInfo.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpClassInfo.java
@@ -40,10 +40,10 @@
 import org.scijava.Priority;
 import org.scijava.ValidityProblem;
 import org.scijava.ops.api.Hints;
+import org.scijava.ops.api.OpDependencyMember;
 import org.scijava.ops.api.OpInfo;
-import org.scijava.ops.engine.OpDependencyMember;
-import org.scijava.ops.engine.OpHints;
-import org.scijava.ops.engine.OpUtils;
+import org.scijava.ops.api.OpUtils;
+import org.scijava.ops.api.OpHints;
 import org.scijava.ops.engine.hint.ImmutableHints;
 import org.scijava.ops.engine.struct.ClassOpDependencyMemberParser;
 import org.scijava.ops.engine.struct.ClassParameterMemberParser;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpFieldInfo.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpFieldInfo.java
index 1538d3987..c827a915d 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpFieldInfo.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpFieldInfo.java
@@ -41,8 +41,8 @@
 import org.scijava.ValidityProblem;
 import org.scijava.ops.api.Hints;
 import org.scijava.ops.api.OpInfo;
-import org.scijava.ops.engine.OpHints;
-import org.scijava.ops.engine.OpUtils;
+import org.scijava.ops.api.OpUtils;
+import org.scijava.ops.api.OpHints;
 import org.scijava.ops.engine.hint.ImmutableHints;
 import org.scijava.ops.engine.struct.FieldParameterMemberParser;
 import org.scijava.ops.spi.OpField;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpMethodInfo.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpMethodInfo.java
index ad033edd1..dbb561ad4 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpMethodInfo.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpMethodInfo.java
@@ -46,10 +46,10 @@
 import org.scijava.Priority;
 import org.scijava.ValidityProblem;
 import org.scijava.ops.api.Hints;
+import org.scijava.ops.api.OpDependencyMember;
 import org.scijava.ops.api.OpInfo;
-import org.scijava.ops.engine.OpDependencyMember;
-import org.scijava.ops.engine.OpHints;
-import org.scijava.ops.engine.OpUtils;
+import org.scijava.ops.api.OpUtils;
+import org.scijava.ops.api.OpHints;
 import org.scijava.ops.engine.hint.ImmutableHints;
 import org.scijava.ops.engine.struct.MethodOpDependencyMemberParser;
 import org.scijava.ops.engine.struct.MethodParameterMemberParser;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpWrappers.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpWrappers.java
index 487db20b7..990e4ca5c 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpWrappers.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpWrappers.java
@@ -15,12 +15,12 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
+import org.scijava.ops.api.Hints;
+import org.scijava.ops.api.OpExecutionSummary;
+import org.scijava.ops.api.OpHistory;
+import org.scijava.ops.api.OpInfo;
+import org.scijava.ops.api.OpWrapper;
 import org.scijava.ops.engine.BaseOpHints.DependencyMatching;
-import org.scijava.ops.engine.Hints;
-import org.scijava.ops.engine.OpExecutionSummary;
-import org.scijava.ops.engine.OpHistory;
-import org.scijava.ops.engine.OpInfo;
-import org.scijava.ops.engine.OpWrapper;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.GenericTyped;
 
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/Identity.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/Identity.java
index bac41f7a7..012483c4a 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/Identity.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/Identity.java
@@ -3,7 +3,7 @@
 
 import java.util.function.Function;
 
-import org.scijava.ops.engine.OpHints;
+import org.scijava.ops.api.OpHints;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
 import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/InfoSimplificationGenerator.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/InfoSimplificationGenerator.java
index 3b130b713..4ee07a435 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/InfoSimplificationGenerator.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/InfoSimplificationGenerator.java
@@ -13,7 +13,7 @@
 import org.scijava.ops.api.OpEnvironment;
 import org.scijava.ops.api.OpInfo;
 import org.scijava.ops.api.OpRef;
-import org.scijava.ops.engine.OpUtils;
+import org.scijava.ops.api.OpUtils;
 import org.scijava.types.Types;
 
 
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveArraySimplifiers.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveArraySimplifiers.java
index 69e071573..dbd101afe 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveArraySimplifiers.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveArraySimplifiers.java
@@ -3,7 +3,7 @@
 
 import java.util.function.Function;
 
-import org.scijava.ops.engine.OpHints;
+import org.scijava.ops.api.OpHints;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
 import org.scijava.ops.spi.OpCollection;
 import org.scijava.ops.spi.OpField;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveSimplifiers.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveSimplifiers.java
index 197765f95..f48cf87ae 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveSimplifiers.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/PrimitiveSimplifiers.java
@@ -3,7 +3,7 @@
 
 import java.util.function.Function;
 
-import org.scijava.ops.engine.OpHints;
+import org.scijava.ops.api.OpHints;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
 import org.scijava.ops.spi.OpCollection;
 import org.scijava.ops.spi.OpField;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplificationMetadata.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplificationMetadata.java
index bf4a2f0dd..344a70daa 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplificationMetadata.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplificationMetadata.java
@@ -13,7 +13,7 @@
 import org.scijava.function.Computers;
 import org.scijava.ops.api.OpEnvironment;
 import org.scijava.ops.api.OpInfo;
-import org.scijava.ops.engine.OpUtils;
+import org.scijava.ops.api.OpUtils;
 import org.scijava.struct.Member;
 import org.scijava.util.Types;
 
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplificationUtils.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplificationUtils.java
index f3783fdc4..fd5389f0e 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplificationUtils.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplificationUtils.java
@@ -24,7 +24,7 @@
 import org.scijava.ops.api.OpEnvironment;
 import org.scijava.ops.api.OpInfo;
 import org.scijava.ops.api.OpRef;
-import org.scijava.ops.engine.OpUtils;
+import org.scijava.ops.api.OpUtils;
 import org.scijava.ops.engine.util.AnnotationUtils;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedOpInfo.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedOpInfo.java
index 8f214866f..4a7bf1259 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedOpInfo.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedOpInfo.java
@@ -11,7 +11,7 @@
 import org.scijava.ops.api.Hints;
 import org.scijava.ops.api.OpEnvironment;
 import org.scijava.ops.api.OpInfo;
-import org.scijava.ops.engine.OpUtils;
+import org.scijava.ops.api.OpUtils;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
 import org.scijava.ops.engine.conversionLoss.LossReporter;
 import org.scijava.ops.engine.hint.ImmutableHints;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedOpRef.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedOpRef.java
index 49a48561a..daf3da58a 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedOpRef.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplifiedOpRef.java
@@ -10,22 +10,13 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Computers.Arity1;
-<<<<<<< HEAD
-import org.scijava.ops.engine.BaseOpHints.Adaptation;
-import org.scijava.ops.engine.BaseOpHints.Simplification;
-import org.scijava.ops.engine.Hints;
-import org.scijava.ops.engine.OpEnvironment;
-import org.scijava.ops.engine.OpInfo;
-import org.scijava.ops.engine.OpRef;
-import org.scijava.ops.engine.hint.DefaultHints;
-=======
 import org.scijava.ops.api.Hints;
 import org.scijava.ops.api.OpEnvironment;
 import org.scijava.ops.api.OpInfo;
 import org.scijava.ops.api.OpRef;
 import org.scijava.ops.engine.BaseOpHints.Adaptation;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
->>>>>>> WIP: Partition scijava-ops-api
+import org.scijava.ops.engine.hint.DefaultHints;
 import org.scijava.ops.engine.matcher.OpMatchingException;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/FunctionalParameters.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/FunctionalParameters.java
index db32d896e..6fceea843 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/FunctionalParameters.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/FunctionalParameters.java
@@ -9,7 +9,7 @@
 import org.scijava.ValidityProblem;
 import org.scijava.function.Container;
 import org.scijava.function.Mutable;
-import org.scijava.ops.engine.OpUtils;
+import org.scijava.ops.api.OpUtils;
 import org.scijava.ops.engine.util.AnnotationUtils;
 import org.scijava.struct.FunctionalMethodType;
 import org.scijava.struct.ItemIO;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/JavadocParameterData.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/JavadocParameterData.java
index fb9328df0..73f556ca7 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/JavadocParameterData.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/JavadocParameterData.java
@@ -18,7 +18,7 @@
 import java.util.stream.Collectors;
 
 import org.scijava.ops.api.OpInfo;
-import org.scijava.ops.engine.OpUtils;
+import org.scijava.ops.api.OpUtils;
 import org.scijava.ops.spi.OpDependency;
 import org.scijava.struct.FunctionalMethodType;
 import org.scijava.struct.Member;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/FunctionUtils.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/FunctionUtils.java
index f8c05c4b7..ca7b93635 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/FunctionUtils.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/FunctionUtils.java
@@ -12,8 +12,8 @@
 
 import org.scijava.function.Functions;
 import org.scijava.function.Producer;
-import org.scijava.ops.engine.OpEnvironment;
-import org.scijava.ops.engine.Hints;
+import org.scijava.ops.api.OpEnvironment;
+import org.scijava.ops.api.Hints;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
 
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/Inject.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/Inject.java
index 5769c567c..b99420124 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/Inject.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/Inject.java
@@ -7,7 +7,7 @@
 import java.util.stream.Collectors;
 
 import org.scijava.command.Command;
-import org.scijava.ops.engine.OpDependencyMember;
+import org.scijava.ops.api.OpDependencyMember;
 import org.scijava.ops.engine.struct.ClassOpDependencyMemberParser;
 import org.scijava.ops.engine.struct.ClassParameterMemberParser;
 import org.scijava.struct.ItemIO;
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/JavadocParameterTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/JavadocParameterTest.java
index 3d8e62303..bb1918954 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/JavadocParameterTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/JavadocParameterTest.java
@@ -1,8 +1,6 @@
 
 package org.scijava.ops.engine;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import com.google.common.collect.Streams;
 
 import java.util.Iterator;
@@ -16,7 +14,7 @@
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.api.OpInfo;
-import org.scijava.ops.engine.OpUtils;
+import org.scijava.ops.api.OpUtils;
 import org.scijava.ops.spi.Op;
 import org.scijava.ops.spi.OpCollection;
 import org.scijava.ops.spi.OpDependency;
@@ -329,7 +327,7 @@ public void testJavadocFieldF() {
 
 		// assert output description
 		String outputDescription = info.output().getDescription();
-		assertEquals("the output", outputDescription);
+		Assert.assertEquals("the output", outputDescription);
 	}
 	
 	@Test
@@ -360,7 +358,7 @@ public void testJavadocFieldC() {
 
 		// assert output description
 		String outputDescription = info.output().getDescription();
-		assertEquals("the preallocated output", outputDescription);
+		Assert.assertEquals("the preallocated output", outputDescription);
 	}
 
 	@Test
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpBuilderTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpBuilderTest.java
index 12e6846cb..025b8c32d 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpBuilderTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/OpBuilderTest.java
@@ -41,6 +41,7 @@
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.ops.engine.AbstractTestEnvironment;
 
 /**
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/ComputerToArraysTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/ComputerToArraysTest.java
index c89a763a1..c3eb1438f 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/ComputerToArraysTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/ComputerToArraysTest.java
@@ -35,7 +35,7 @@
 package org.scijava.ops.engine.adapt.lift;
 
 import org.junit.Test;
-import org.junit.jupiter.api.Assertions;
+import org.junit.Assert;
 import org.scijava.function.Computers;
 import org.scijava.ops.spi.OpField;
 import org.scijava.ops.spi.OpCollection;
@@ -85,7 +85,7 @@ public void testComputer0ToArrays() {
 		ops.env().op("test.liftArrayC").input().output(output).compute();
 
 		for(int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(0 * i, output[i].getNumber());
+			Assert.assertEquals(0 * i, output[i].getNumber());
 		}
 	}
 
@@ -99,7 +99,7 @@ public void testComputer1ToArrays() {
 		ops.env().op("test.liftArrayC").input(input).output(output).compute();
 
 		for(int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(1 * i, output[i].getNumber());
+			Assert.assertEquals(1 * i, output[i].getNumber());
 		}
 	}
 
@@ -113,7 +113,7 @@ public void testComputer2ToArrays() {
 		ops.env().op("test.liftArrayC").input(input, input).output(output).compute();
 
 		for(int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(2 * i, output[i].getNumber());
+			Assert.assertEquals(2 * i, output[i].getNumber());
 		}
 	}
 
@@ -127,7 +127,7 @@ public void testComputer3ToArrays() {
 		ops.env().op("test.liftArrayC").input(input, input, input).output(output).compute();
 
 		for(int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(3 * i, output[i].getNumber());
+			Assert.assertEquals(3 * i, output[i].getNumber());
 		}
 	}
 
@@ -141,7 +141,7 @@ public void testComputer4ToArrays() {
 		ops.env().op("test.liftArrayC").input(input, input, input, input).output(output).compute();
 
 		for(int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(4 * i, output[i].getNumber());
+			Assert.assertEquals(4 * i, output[i].getNumber());
 		}
 	}
 
@@ -155,7 +155,7 @@ public void testComputer5ToArrays() {
 		ops.env().op("test.liftArrayC").input(input, input, input, input, input).output(output).compute();
 
 		for(int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(5 * i, output[i].getNumber());
+			Assert.assertEquals(5 * i, output[i].getNumber());
 		}
 	}
 
@@ -169,7 +169,7 @@ public void testComputer6ToArrays() {
 		ops.env().op("test.liftArrayC").input(input, input, input, input, input, input).output(output).compute();
 
 		for(int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(6 * i, output[i].getNumber());
+			Assert.assertEquals(6 * i, output[i].getNumber());
 		}
 	}
 
@@ -183,7 +183,7 @@ public void testComputer7ToArrays() {
 		ops.env().op("test.liftArrayC").input(input, input, input, input, input, input, input).output(output).compute();
 
 		for(int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(7 * i, output[i].getNumber());
+			Assert.assertEquals(7 * i, output[i].getNumber());
 		}
 	}
 
@@ -197,7 +197,7 @@ public void testComputer8ToArrays() {
 		ops.env().op("test.liftArrayC").input(input, input, input, input, input, input, input, input).output(output).compute();
 
 		for(int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(8 * i, output[i].getNumber());
+			Assert.assertEquals(8 * i, output[i].getNumber());
 		}
 	}
 
@@ -211,7 +211,7 @@ public void testComputer9ToArrays() {
 		ops.env().op("test.liftArrayC").input(input, input, input, input, input, input, input, input, input).output(output).compute();
 
 		for(int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(9 * i, output[i].getNumber());
+			Assert.assertEquals(9 * i, output[i].getNumber());
 		}
 	}
 
@@ -225,7 +225,7 @@ public void testComputer10ToArrays() {
 		ops.env().op("test.liftArrayC").input(input, input, input, input, input, input, input, input, input, input).output(output).compute();
 
 		for(int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(10 * i, output[i].getNumber());
+			Assert.assertEquals(10 * i, output[i].getNumber());
 		}
 	}
 
@@ -239,7 +239,7 @@ public void testComputer11ToArrays() {
 		ops.env().op("test.liftArrayC").input(input, input, input, input, input, input, input, input, input, input, input).output(output).compute();
 
 		for(int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(11 * i, output[i].getNumber());
+			Assert.assertEquals(11 * i, output[i].getNumber());
 		}
 	}
 
@@ -253,7 +253,7 @@ public void testComputer12ToArrays() {
 		ops.env().op("test.liftArrayC").input(input, input, input, input, input, input, input, input, input, input, input, input).output(output).compute();
 
 		for(int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(12 * i, output[i].getNumber());
+			Assert.assertEquals(12 * i, output[i].getNumber());
 		}
 	}
 
@@ -267,7 +267,7 @@ public void testComputer13ToArrays() {
 		ops.env().op("test.liftArrayC").input(input, input, input, input, input, input, input, input, input, input, input, input, input).output(output).compute();
 
 		for(int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(13 * i, output[i].getNumber());
+			Assert.assertEquals(13 * i, output[i].getNumber());
 		}
 	}
 
@@ -281,7 +281,7 @@ public void testComputer14ToArrays() {
 		ops.env().op("test.liftArrayC").input(input, input, input, input, input, input, input, input, input, input, input, input, input, input).output(output).compute();
 
 		for(int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(14 * i, output[i].getNumber());
+			Assert.assertEquals(14 * i, output[i].getNumber());
 		}
 	}
 
@@ -295,7 +295,7 @@ public void testComputer15ToArrays() {
 		ops.env().op("test.liftArrayC").input(input, input, input, input, input, input, input, input, input, input, input, input, input, input, input).output(output).compute();
 
 		for(int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(15 * i, output[i].getNumber());
+			Assert.assertEquals(15 * i, output[i].getNumber());
 		}
 	}
 
@@ -309,7 +309,7 @@ public void testComputer16ToArrays() {
 		ops.env().op("test.liftArrayC").input(input, input, input, input, input, input, input, input, input, input, input, input, input, input, input, input).output(output).compute();
 
 		for(int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(16 * i, output[i].getNumber());
+			Assert.assertEquals(16 * i, output[i].getNumber());
 		}
 	}
 
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/FunctionToArraysTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/FunctionToArraysTest.java
index 97a8e95ee..00d340ad0 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/FunctionToArraysTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/FunctionToArraysTest.java
@@ -38,7 +38,7 @@
 import java.util.function.Function;
 
 import org.junit.Test;
-import org.junit.jupiter.api.Assertions;
+import org.junit.Assert;
 import org.scijava.function.Functions;
 import org.scijava.ops.engine.AbstractTestEnvironment;
 import org.scijava.ops.spi.OpField;
@@ -88,7 +88,7 @@ public void testFunction1ToArrays() {
 			{}).apply();
 
 		for (int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(1 * i, output[i].getNumber());
+			Assert.assertEquals(1 * i, output[i].getNumber());
 		}
 	}
 
@@ -107,7 +107,7 @@ public void testFunction2ToArrays() {
 			{}).apply();
 
 		for (int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(2 * i, output[i].getNumber());
+			Assert.assertEquals(2 * i, output[i].getNumber());
 		}
 	}
 
@@ -126,7 +126,7 @@ public void testFunction3ToArrays() {
 			{}).apply();
 
 		for (int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(3 * i, output[i].getNumber());
+			Assert.assertEquals(3 * i, output[i].getNumber());
 		}
 	}
 
@@ -145,7 +145,7 @@ public void testFunction4ToArrays() {
 			{}).apply();
 
 		for (int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(4 * i, output[i].getNumber());
+			Assert.assertEquals(4 * i, output[i].getNumber());
 		}
 	}
 
@@ -164,7 +164,7 @@ public void testFunction5ToArrays() {
 			{}).apply();
 
 		for (int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(5 * i, output[i].getNumber());
+			Assert.assertEquals(5 * i, output[i].getNumber());
 		}
 	}
 
@@ -183,7 +183,7 @@ public void testFunction6ToArrays() {
 			{}).apply();
 
 		for (int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(6 * i, output[i].getNumber());
+			Assert.assertEquals(6 * i, output[i].getNumber());
 		}
 	}
 
@@ -202,7 +202,7 @@ public void testFunction7ToArrays() {
 			{}).apply();
 
 		for (int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(7 * i, output[i].getNumber());
+			Assert.assertEquals(7 * i, output[i].getNumber());
 		}
 	}
 
@@ -221,7 +221,7 @@ public void testFunction8ToArrays() {
 			{}).apply();
 
 		for (int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(8 * i, output[i].getNumber());
+			Assert.assertEquals(8 * i, output[i].getNumber());
 		}
 	}
 
@@ -240,7 +240,7 @@ public void testFunction9ToArrays() {
 			{}).apply();
 
 		for (int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(9 * i, output[i].getNumber());
+			Assert.assertEquals(9 * i, output[i].getNumber());
 		}
 	}
 
@@ -259,7 +259,7 @@ public void testFunction10ToArrays() {
 			{}).apply();
 
 		for (int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(10 * i, output[i].getNumber());
+			Assert.assertEquals(10 * i, output[i].getNumber());
 		}
 	}
 
@@ -278,7 +278,7 @@ public void testFunction11ToArrays() {
 			{}).apply();
 
 		for (int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(11 * i, output[i].getNumber());
+			Assert.assertEquals(11 * i, output[i].getNumber());
 		}
 	}
 
@@ -297,7 +297,7 @@ public void testFunction12ToArrays() {
 			{}).apply();
 
 		for (int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(12 * i, output[i].getNumber());
+			Assert.assertEquals(12 * i, output[i].getNumber());
 		}
 	}
 
@@ -316,7 +316,7 @@ public void testFunction13ToArrays() {
 			{}).apply();
 
 		for (int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(13 * i, output[i].getNumber());
+			Assert.assertEquals(13 * i, output[i].getNumber());
 		}
 	}
 
@@ -335,7 +335,7 @@ public void testFunction14ToArrays() {
 			{}).apply();
 
 		for (int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(14 * i, output[i].getNumber());
+			Assert.assertEquals(14 * i, output[i].getNumber());
 		}
 	}
 
@@ -354,7 +354,7 @@ public void testFunction15ToArrays() {
 			{}).apply();
 
 		for (int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(15 * i, output[i].getNumber());
+			Assert.assertEquals(15 * i, output[i].getNumber());
 		}
 	}
 
@@ -373,7 +373,7 @@ public void testFunction16ToArrays() {
 			{}).apply();
 
 		for (int i = 0; i < output.length; i++) {
-			Assertions.assertEquals(16 * i, output[i].getNumber());
+			Assert.assertEquals(16 * i, output[i].getNumber());
 		}
 	}
 
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/InplaceToArraysTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/InplaceToArraysTest.java
index 9d7dc65f5..ee3a15e6a 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/InplaceToArraysTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/adapt/lift/InplaceToArraysTest.java
@@ -35,7 +35,7 @@
 package org.scijava.ops.engine.adapt.lift;
 
 import org.junit.Test;
-import org.junit.jupiter.api.Assertions;
+import org.junit.Assert;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.engine.AbstractTestEnvironment;
 import org.scijava.ops.spi.OpField;
@@ -89,7 +89,7 @@ public void testInplace1ToArrays() {
 			.mutate();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(1 * i, io[i].getNumber());
+			Assert.assertEquals(1 * i, io[i].getNumber());
 		}
 	}
 
@@ -111,7 +111,7 @@ public void testInplace2_1ToArrays() {
 			.mutate1();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(2 * i, io[i].getNumber());
+			Assert.assertEquals(2 * i, io[i].getNumber());
 		}
 	}
 
@@ -133,7 +133,7 @@ public void testInplace2_2ToArrays() {
 			.mutate2();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(2 * i, io[i].getNumber());
+			Assert.assertEquals(2 * i, io[i].getNumber());
 		}
 	}
 
@@ -156,7 +156,7 @@ public void testInplace3_1ToArrays() {
 			.mutate1();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(3 * i, io[i].getNumber());
+			Assert.assertEquals(3 * i, io[i].getNumber());
 		}
 	}
 
@@ -179,7 +179,7 @@ public void testInplace3_2ToArrays() {
 			.mutate2();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(3 * i, io[i].getNumber());
+			Assert.assertEquals(3 * i, io[i].getNumber());
 		}
 	}
 
@@ -202,7 +202,7 @@ public void testInplace3_3ToArrays() {
 			.mutate3();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(3 * i, io[i].getNumber());
+			Assert.assertEquals(3 * i, io[i].getNumber());
 		}
 	}
 
@@ -226,7 +226,7 @@ public void testInplace4_1ToArrays() {
 			.mutate1();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(4 * i, io[i].getNumber());
+			Assert.assertEquals(4 * i, io[i].getNumber());
 		}
 	}
 
@@ -250,7 +250,7 @@ public void testInplace4_2ToArrays() {
 			.mutate2();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(4 * i, io[i].getNumber());
+			Assert.assertEquals(4 * i, io[i].getNumber());
 		}
 	}
 
@@ -274,7 +274,7 @@ public void testInplace4_3ToArrays() {
 			.mutate3();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(4 * i, io[i].getNumber());
+			Assert.assertEquals(4 * i, io[i].getNumber());
 		}
 	}
 
@@ -298,7 +298,7 @@ public void testInplace4_4ToArrays() {
 			.mutate4();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(4 * i, io[i].getNumber());
+			Assert.assertEquals(4 * i, io[i].getNumber());
 		}
 	}
 
@@ -323,7 +323,7 @@ public void testInplace5_1ToArrays() {
 			.mutate1();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(5 * i, io[i].getNumber());
+			Assert.assertEquals(5 * i, io[i].getNumber());
 		}
 	}
 
@@ -348,7 +348,7 @@ public void testInplace5_2ToArrays() {
 			.mutate2();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(5 * i, io[i].getNumber());
+			Assert.assertEquals(5 * i, io[i].getNumber());
 		}
 	}
 
@@ -373,7 +373,7 @@ public void testInplace5_3ToArrays() {
 			.mutate3();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(5 * i, io[i].getNumber());
+			Assert.assertEquals(5 * i, io[i].getNumber());
 		}
 	}
 
@@ -398,7 +398,7 @@ public void testInplace5_4ToArrays() {
 			.mutate4();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(5 * i, io[i].getNumber());
+			Assert.assertEquals(5 * i, io[i].getNumber());
 		}
 	}
 
@@ -423,7 +423,7 @@ public void testInplace5_5ToArrays() {
 			.mutate5();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(5 * i, io[i].getNumber());
+			Assert.assertEquals(5 * i, io[i].getNumber());
 		}
 	}
 
@@ -449,7 +449,7 @@ public void testInplace6_1ToArrays() {
 			.mutate1();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(6 * i, io[i].getNumber());
+			Assert.assertEquals(6 * i, io[i].getNumber());
 		}
 	}
 
@@ -475,7 +475,7 @@ public void testInplace6_2ToArrays() {
 			.mutate2();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(6 * i, io[i].getNumber());
+			Assert.assertEquals(6 * i, io[i].getNumber());
 		}
 	}
 
@@ -501,7 +501,7 @@ public void testInplace6_3ToArrays() {
 			.mutate3();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(6 * i, io[i].getNumber());
+			Assert.assertEquals(6 * i, io[i].getNumber());
 		}
 	}
 
@@ -527,7 +527,7 @@ public void testInplace6_4ToArrays() {
 			.mutate4();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(6 * i, io[i].getNumber());
+			Assert.assertEquals(6 * i, io[i].getNumber());
 		}
 	}
 
@@ -553,7 +553,7 @@ public void testInplace6_5ToArrays() {
 			.mutate5();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(6 * i, io[i].getNumber());
+			Assert.assertEquals(6 * i, io[i].getNumber());
 		}
 	}
 
@@ -579,7 +579,7 @@ public void testInplace6_6ToArrays() {
 			.mutate6();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(6 * i, io[i].getNumber());
+			Assert.assertEquals(6 * i, io[i].getNumber());
 		}
 	}
 
@@ -606,7 +606,7 @@ public void testInplace7_1ToArrays() {
 			.mutate1();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(7 * i, io[i].getNumber());
+			Assert.assertEquals(7 * i, io[i].getNumber());
 		}
 	}
 
@@ -633,7 +633,7 @@ public void testInplace7_2ToArrays() {
 			.mutate2();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(7 * i, io[i].getNumber());
+			Assert.assertEquals(7 * i, io[i].getNumber());
 		}
 	}
 
@@ -660,7 +660,7 @@ public void testInplace7_3ToArrays() {
 			.mutate3();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(7 * i, io[i].getNumber());
+			Assert.assertEquals(7 * i, io[i].getNumber());
 		}
 	}
 
@@ -687,7 +687,7 @@ public void testInplace7_4ToArrays() {
 			.mutate4();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(7 * i, io[i].getNumber());
+			Assert.assertEquals(7 * i, io[i].getNumber());
 		}
 	}
 
@@ -714,7 +714,7 @@ public void testInplace7_5ToArrays() {
 			.mutate5();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(7 * i, io[i].getNumber());
+			Assert.assertEquals(7 * i, io[i].getNumber());
 		}
 	}
 
@@ -741,7 +741,7 @@ public void testInplace7_6ToArrays() {
 			.mutate6();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(7 * i, io[i].getNumber());
+			Assert.assertEquals(7 * i, io[i].getNumber());
 		}
 	}
 
@@ -768,7 +768,7 @@ public void testInplace7_7ToArrays() {
 			.mutate7();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(7 * i, io[i].getNumber());
+			Assert.assertEquals(7 * i, io[i].getNumber());
 		}
 	}
 
@@ -796,7 +796,7 @@ public void testInplace8_1ToArrays() {
 			.mutate1();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(8 * i, io[i].getNumber());
+			Assert.assertEquals(8 * i, io[i].getNumber());
 		}
 	}
 
@@ -824,7 +824,7 @@ public void testInplace8_2ToArrays() {
 			.mutate2();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(8 * i, io[i].getNumber());
+			Assert.assertEquals(8 * i, io[i].getNumber());
 		}
 	}
 
@@ -852,7 +852,7 @@ public void testInplace8_3ToArrays() {
 			.mutate3();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(8 * i, io[i].getNumber());
+			Assert.assertEquals(8 * i, io[i].getNumber());
 		}
 	}
 
@@ -880,7 +880,7 @@ public void testInplace8_4ToArrays() {
 			.mutate4();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(8 * i, io[i].getNumber());
+			Assert.assertEquals(8 * i, io[i].getNumber());
 		}
 	}
 
@@ -908,7 +908,7 @@ public void testInplace8_5ToArrays() {
 			.mutate5();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(8 * i, io[i].getNumber());
+			Assert.assertEquals(8 * i, io[i].getNumber());
 		}
 	}
 
@@ -936,7 +936,7 @@ public void testInplace8_6ToArrays() {
 			.mutate6();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(8 * i, io[i].getNumber());
+			Assert.assertEquals(8 * i, io[i].getNumber());
 		}
 	}
 
@@ -964,7 +964,7 @@ public void testInplace8_7ToArrays() {
 			.mutate7();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(8 * i, io[i].getNumber());
+			Assert.assertEquals(8 * i, io[i].getNumber());
 		}
 	}
 
@@ -992,7 +992,7 @@ public void testInplace8_8ToArrays() {
 			.mutate8();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(8 * i, io[i].getNumber());
+			Assert.assertEquals(8 * i, io[i].getNumber());
 		}
 	}
 
@@ -1021,7 +1021,7 @@ public void testInplace9_1ToArrays() {
 			.mutate1();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(9 * i, io[i].getNumber());
+			Assert.assertEquals(9 * i, io[i].getNumber());
 		}
 	}
 
@@ -1050,7 +1050,7 @@ public void testInplace9_2ToArrays() {
 			.mutate2();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(9 * i, io[i].getNumber());
+			Assert.assertEquals(9 * i, io[i].getNumber());
 		}
 	}
 
@@ -1079,7 +1079,7 @@ public void testInplace9_3ToArrays() {
 			.mutate3();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(9 * i, io[i].getNumber());
+			Assert.assertEquals(9 * i, io[i].getNumber());
 		}
 	}
 
@@ -1108,7 +1108,7 @@ public void testInplace9_4ToArrays() {
 			.mutate4();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(9 * i, io[i].getNumber());
+			Assert.assertEquals(9 * i, io[i].getNumber());
 		}
 	}
 
@@ -1137,7 +1137,7 @@ public void testInplace9_5ToArrays() {
 			.mutate5();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(9 * i, io[i].getNumber());
+			Assert.assertEquals(9 * i, io[i].getNumber());
 		}
 	}
 
@@ -1166,7 +1166,7 @@ public void testInplace9_6ToArrays() {
 			.mutate6();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(9 * i, io[i].getNumber());
+			Assert.assertEquals(9 * i, io[i].getNumber());
 		}
 	}
 
@@ -1195,7 +1195,7 @@ public void testInplace9_7ToArrays() {
 			.mutate7();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(9 * i, io[i].getNumber());
+			Assert.assertEquals(9 * i, io[i].getNumber());
 		}
 	}
 
@@ -1224,7 +1224,7 @@ public void testInplace9_8ToArrays() {
 			.mutate8();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(9 * i, io[i].getNumber());
+			Assert.assertEquals(9 * i, io[i].getNumber());
 		}
 	}
 
@@ -1253,7 +1253,7 @@ public void testInplace9_9ToArrays() {
 			.mutate9();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(9 * i, io[i].getNumber());
+			Assert.assertEquals(9 * i, io[i].getNumber());
 		}
 	}
 
@@ -1283,7 +1283,7 @@ public void testInplace10_1ToArrays() {
 			.mutate1();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(10 * i, io[i].getNumber());
+			Assert.assertEquals(10 * i, io[i].getNumber());
 		}
 	}
 
@@ -1313,7 +1313,7 @@ public void testInplace10_2ToArrays() {
 			.mutate2();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(10 * i, io[i].getNumber());
+			Assert.assertEquals(10 * i, io[i].getNumber());
 		}
 	}
 
@@ -1343,7 +1343,7 @@ public void testInplace10_3ToArrays() {
 			.mutate3();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(10 * i, io[i].getNumber());
+			Assert.assertEquals(10 * i, io[i].getNumber());
 		}
 	}
 
@@ -1373,7 +1373,7 @@ public void testInplace10_4ToArrays() {
 			.mutate4();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(10 * i, io[i].getNumber());
+			Assert.assertEquals(10 * i, io[i].getNumber());
 		}
 	}
 
@@ -1403,7 +1403,7 @@ public void testInplace10_5ToArrays() {
 			.mutate5();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(10 * i, io[i].getNumber());
+			Assert.assertEquals(10 * i, io[i].getNumber());
 		}
 	}
 
@@ -1433,7 +1433,7 @@ public void testInplace10_6ToArrays() {
 			.mutate6();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(10 * i, io[i].getNumber());
+			Assert.assertEquals(10 * i, io[i].getNumber());
 		}
 	}
 
@@ -1463,7 +1463,7 @@ public void testInplace10_7ToArrays() {
 			.mutate7();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(10 * i, io[i].getNumber());
+			Assert.assertEquals(10 * i, io[i].getNumber());
 		}
 	}
 
@@ -1493,7 +1493,7 @@ public void testInplace10_8ToArrays() {
 			.mutate8();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(10 * i, io[i].getNumber());
+			Assert.assertEquals(10 * i, io[i].getNumber());
 		}
 	}
 
@@ -1523,7 +1523,7 @@ public void testInplace10_9ToArrays() {
 			.mutate9();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(10 * i, io[i].getNumber());
+			Assert.assertEquals(10 * i, io[i].getNumber());
 		}
 	}
 
@@ -1553,7 +1553,7 @@ public void testInplace10_10ToArrays() {
 			.mutate10();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(10 * i, io[i].getNumber());
+			Assert.assertEquals(10 * i, io[i].getNumber());
 		}
 	}
 
@@ -1584,7 +1584,7 @@ public void testInplace11_1ToArrays() {
 			.mutate1();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(11 * i, io[i].getNumber());
+			Assert.assertEquals(11 * i, io[i].getNumber());
 		}
 	}
 
@@ -1615,7 +1615,7 @@ public void testInplace11_2ToArrays() {
 			.mutate2();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(11 * i, io[i].getNumber());
+			Assert.assertEquals(11 * i, io[i].getNumber());
 		}
 	}
 
@@ -1646,7 +1646,7 @@ public void testInplace11_3ToArrays() {
 			.mutate3();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(11 * i, io[i].getNumber());
+			Assert.assertEquals(11 * i, io[i].getNumber());
 		}
 	}
 
@@ -1677,7 +1677,7 @@ public void testInplace11_4ToArrays() {
 			.mutate4();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(11 * i, io[i].getNumber());
+			Assert.assertEquals(11 * i, io[i].getNumber());
 		}
 	}
 
@@ -1708,7 +1708,7 @@ public void testInplace11_5ToArrays() {
 			.mutate5();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(11 * i, io[i].getNumber());
+			Assert.assertEquals(11 * i, io[i].getNumber());
 		}
 	}
 
@@ -1739,7 +1739,7 @@ public void testInplace11_6ToArrays() {
 			.mutate6();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(11 * i, io[i].getNumber());
+			Assert.assertEquals(11 * i, io[i].getNumber());
 		}
 	}
 
@@ -1770,7 +1770,7 @@ public void testInplace11_7ToArrays() {
 			.mutate7();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(11 * i, io[i].getNumber());
+			Assert.assertEquals(11 * i, io[i].getNumber());
 		}
 	}
 
@@ -1801,7 +1801,7 @@ public void testInplace11_8ToArrays() {
 			.mutate8();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(11 * i, io[i].getNumber());
+			Assert.assertEquals(11 * i, io[i].getNumber());
 		}
 	}
 
@@ -1832,7 +1832,7 @@ public void testInplace11_9ToArrays() {
 			.mutate9();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(11 * i, io[i].getNumber());
+			Assert.assertEquals(11 * i, io[i].getNumber());
 		}
 	}
 
@@ -1863,7 +1863,7 @@ public void testInplace11_10ToArrays() {
 			.mutate10();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(11 * i, io[i].getNumber());
+			Assert.assertEquals(11 * i, io[i].getNumber());
 		}
 	}
 
@@ -1894,7 +1894,7 @@ public void testInplace11_11ToArrays() {
 			.mutate11();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(11 * i, io[i].getNumber());
+			Assert.assertEquals(11 * i, io[i].getNumber());
 		}
 	}
 
@@ -1926,7 +1926,7 @@ public void testInplace12_1ToArrays() {
 			.mutate1();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(12 * i, io[i].getNumber());
+			Assert.assertEquals(12 * i, io[i].getNumber());
 		}
 	}
 
@@ -1958,7 +1958,7 @@ public void testInplace12_2ToArrays() {
 			.mutate2();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(12 * i, io[i].getNumber());
+			Assert.assertEquals(12 * i, io[i].getNumber());
 		}
 	}
 
@@ -1990,7 +1990,7 @@ public void testInplace12_3ToArrays() {
 			.mutate3();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(12 * i, io[i].getNumber());
+			Assert.assertEquals(12 * i, io[i].getNumber());
 		}
 	}
 
@@ -2022,7 +2022,7 @@ public void testInplace12_4ToArrays() {
 			.mutate4();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(12 * i, io[i].getNumber());
+			Assert.assertEquals(12 * i, io[i].getNumber());
 		}
 	}
 
@@ -2054,7 +2054,7 @@ public void testInplace12_5ToArrays() {
 			.mutate5();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(12 * i, io[i].getNumber());
+			Assert.assertEquals(12 * i, io[i].getNumber());
 		}
 	}
 
@@ -2086,7 +2086,7 @@ public void testInplace12_6ToArrays() {
 			.mutate6();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(12 * i, io[i].getNumber());
+			Assert.assertEquals(12 * i, io[i].getNumber());
 		}
 	}
 
@@ -2118,7 +2118,7 @@ public void testInplace12_7ToArrays() {
 			.mutate7();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(12 * i, io[i].getNumber());
+			Assert.assertEquals(12 * i, io[i].getNumber());
 		}
 	}
 
@@ -2150,7 +2150,7 @@ public void testInplace12_8ToArrays() {
 			.mutate8();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(12 * i, io[i].getNumber());
+			Assert.assertEquals(12 * i, io[i].getNumber());
 		}
 	}
 
@@ -2182,7 +2182,7 @@ public void testInplace12_9ToArrays() {
 			.mutate9();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(12 * i, io[i].getNumber());
+			Assert.assertEquals(12 * i, io[i].getNumber());
 		}
 	}
 
@@ -2214,7 +2214,7 @@ public void testInplace12_10ToArrays() {
 			.mutate10();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(12 * i, io[i].getNumber());
+			Assert.assertEquals(12 * i, io[i].getNumber());
 		}
 	}
 
@@ -2246,7 +2246,7 @@ public void testInplace12_11ToArrays() {
 			.mutate11();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(12 * i, io[i].getNumber());
+			Assert.assertEquals(12 * i, io[i].getNumber());
 		}
 	}
 
@@ -2278,7 +2278,7 @@ public void testInplace12_12ToArrays() {
 			.mutate12();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(12 * i, io[i].getNumber());
+			Assert.assertEquals(12 * i, io[i].getNumber());
 		}
 	}
 
@@ -2311,7 +2311,7 @@ public void testInplace13_1ToArrays() {
 			.mutate1();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(13 * i, io[i].getNumber());
+			Assert.assertEquals(13 * i, io[i].getNumber());
 		}
 	}
 
@@ -2344,7 +2344,7 @@ public void testInplace13_2ToArrays() {
 			.mutate2();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(13 * i, io[i].getNumber());
+			Assert.assertEquals(13 * i, io[i].getNumber());
 		}
 	}
 
@@ -2377,7 +2377,7 @@ public void testInplace13_3ToArrays() {
 			.mutate3();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(13 * i, io[i].getNumber());
+			Assert.assertEquals(13 * i, io[i].getNumber());
 		}
 	}
 
@@ -2410,7 +2410,7 @@ public void testInplace13_4ToArrays() {
 			.mutate4();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(13 * i, io[i].getNumber());
+			Assert.assertEquals(13 * i, io[i].getNumber());
 		}
 	}
 
@@ -2443,7 +2443,7 @@ public void testInplace13_5ToArrays() {
 			.mutate5();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(13 * i, io[i].getNumber());
+			Assert.assertEquals(13 * i, io[i].getNumber());
 		}
 	}
 
@@ -2476,7 +2476,7 @@ public void testInplace13_6ToArrays() {
 			.mutate6();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(13 * i, io[i].getNumber());
+			Assert.assertEquals(13 * i, io[i].getNumber());
 		}
 	}
 
@@ -2509,7 +2509,7 @@ public void testInplace13_7ToArrays() {
 			.mutate7();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(13 * i, io[i].getNumber());
+			Assert.assertEquals(13 * i, io[i].getNumber());
 		}
 	}
 
@@ -2542,7 +2542,7 @@ public void testInplace13_8ToArrays() {
 			.mutate8();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(13 * i, io[i].getNumber());
+			Assert.assertEquals(13 * i, io[i].getNumber());
 		}
 	}
 
@@ -2575,7 +2575,7 @@ public void testInplace13_9ToArrays() {
 			.mutate9();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(13 * i, io[i].getNumber());
+			Assert.assertEquals(13 * i, io[i].getNumber());
 		}
 	}
 
@@ -2608,7 +2608,7 @@ public void testInplace13_10ToArrays() {
 			.mutate10();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(13 * i, io[i].getNumber());
+			Assert.assertEquals(13 * i, io[i].getNumber());
 		}
 	}
 
@@ -2641,7 +2641,7 @@ public void testInplace13_11ToArrays() {
 			.mutate11();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(13 * i, io[i].getNumber());
+			Assert.assertEquals(13 * i, io[i].getNumber());
 		}
 	}
 
@@ -2674,7 +2674,7 @@ public void testInplace13_12ToArrays() {
 			.mutate12();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(13 * i, io[i].getNumber());
+			Assert.assertEquals(13 * i, io[i].getNumber());
 		}
 	}
 
@@ -2707,7 +2707,7 @@ public void testInplace13_13ToArrays() {
 			.mutate13();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(13 * i, io[i].getNumber());
+			Assert.assertEquals(13 * i, io[i].getNumber());
 		}
 	}
 
@@ -2741,7 +2741,7 @@ public void testInplace14_1ToArrays() {
 			.mutate1();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(14 * i, io[i].getNumber());
+			Assert.assertEquals(14 * i, io[i].getNumber());
 		}
 	}
 
@@ -2775,7 +2775,7 @@ public void testInplace14_2ToArrays() {
 			.mutate2();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(14 * i, io[i].getNumber());
+			Assert.assertEquals(14 * i, io[i].getNumber());
 		}
 	}
 
@@ -2809,7 +2809,7 @@ public void testInplace14_3ToArrays() {
 			.mutate3();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(14 * i, io[i].getNumber());
+			Assert.assertEquals(14 * i, io[i].getNumber());
 		}
 	}
 
@@ -2843,7 +2843,7 @@ public void testInplace14_4ToArrays() {
 			.mutate4();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(14 * i, io[i].getNumber());
+			Assert.assertEquals(14 * i, io[i].getNumber());
 		}
 	}
 
@@ -2877,7 +2877,7 @@ public void testInplace14_5ToArrays() {
 			.mutate5();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(14 * i, io[i].getNumber());
+			Assert.assertEquals(14 * i, io[i].getNumber());
 		}
 	}
 
@@ -2911,7 +2911,7 @@ public void testInplace14_6ToArrays() {
 			.mutate6();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(14 * i, io[i].getNumber());
+			Assert.assertEquals(14 * i, io[i].getNumber());
 		}
 	}
 
@@ -2945,7 +2945,7 @@ public void testInplace14_7ToArrays() {
 			.mutate7();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(14 * i, io[i].getNumber());
+			Assert.assertEquals(14 * i, io[i].getNumber());
 		}
 	}
 
@@ -2979,7 +2979,7 @@ public void testInplace14_8ToArrays() {
 			.mutate8();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(14 * i, io[i].getNumber());
+			Assert.assertEquals(14 * i, io[i].getNumber());
 		}
 	}
 
@@ -3013,7 +3013,7 @@ public void testInplace14_9ToArrays() {
 			.mutate9();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(14 * i, io[i].getNumber());
+			Assert.assertEquals(14 * i, io[i].getNumber());
 		}
 	}
 
@@ -3047,7 +3047,7 @@ public void testInplace14_10ToArrays() {
 			.mutate10();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(14 * i, io[i].getNumber());
+			Assert.assertEquals(14 * i, io[i].getNumber());
 		}
 	}
 
@@ -3081,7 +3081,7 @@ public void testInplace14_11ToArrays() {
 			.mutate11();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(14 * i, io[i].getNumber());
+			Assert.assertEquals(14 * i, io[i].getNumber());
 		}
 	}
 
@@ -3115,7 +3115,7 @@ public void testInplace14_12ToArrays() {
 			.mutate12();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(14 * i, io[i].getNumber());
+			Assert.assertEquals(14 * i, io[i].getNumber());
 		}
 	}
 
@@ -3149,7 +3149,7 @@ public void testInplace14_13ToArrays() {
 			.mutate13();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(14 * i, io[i].getNumber());
+			Assert.assertEquals(14 * i, io[i].getNumber());
 		}
 	}
 
@@ -3183,7 +3183,7 @@ public void testInplace14_14ToArrays() {
 			.mutate14();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(14 * i, io[i].getNumber());
+			Assert.assertEquals(14 * i, io[i].getNumber());
 		}
 	}
 
@@ -3218,7 +3218,7 @@ public void testInplace15_1ToArrays() {
 			.mutate1();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(15 * i, io[i].getNumber());
+			Assert.assertEquals(15 * i, io[i].getNumber());
 		}
 	}
 
@@ -3253,7 +3253,7 @@ public void testInplace15_2ToArrays() {
 			.mutate2();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(15 * i, io[i].getNumber());
+			Assert.assertEquals(15 * i, io[i].getNumber());
 		}
 	}
 
@@ -3288,7 +3288,7 @@ public void testInplace15_3ToArrays() {
 			.mutate3();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(15 * i, io[i].getNumber());
+			Assert.assertEquals(15 * i, io[i].getNumber());
 		}
 	}
 
@@ -3323,7 +3323,7 @@ public void testInplace15_4ToArrays() {
 			.mutate4();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(15 * i, io[i].getNumber());
+			Assert.assertEquals(15 * i, io[i].getNumber());
 		}
 	}
 
@@ -3358,7 +3358,7 @@ public void testInplace15_5ToArrays() {
 			.mutate5();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(15 * i, io[i].getNumber());
+			Assert.assertEquals(15 * i, io[i].getNumber());
 		}
 	}
 
@@ -3393,7 +3393,7 @@ public void testInplace15_6ToArrays() {
 			.mutate6();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(15 * i, io[i].getNumber());
+			Assert.assertEquals(15 * i, io[i].getNumber());
 		}
 	}
 
@@ -3428,7 +3428,7 @@ public void testInplace15_7ToArrays() {
 			.mutate7();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(15 * i, io[i].getNumber());
+			Assert.assertEquals(15 * i, io[i].getNumber());
 		}
 	}
 
@@ -3463,7 +3463,7 @@ public void testInplace15_8ToArrays() {
 			.mutate8();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(15 * i, io[i].getNumber());
+			Assert.assertEquals(15 * i, io[i].getNumber());
 		}
 	}
 
@@ -3498,7 +3498,7 @@ public void testInplace15_9ToArrays() {
 			.mutate9();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(15 * i, io[i].getNumber());
+			Assert.assertEquals(15 * i, io[i].getNumber());
 		}
 	}
 
@@ -3533,7 +3533,7 @@ public void testInplace15_10ToArrays() {
 			.mutate10();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(15 * i, io[i].getNumber());
+			Assert.assertEquals(15 * i, io[i].getNumber());
 		}
 	}
 
@@ -3568,7 +3568,7 @@ public void testInplace15_11ToArrays() {
 			.mutate11();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(15 * i, io[i].getNumber());
+			Assert.assertEquals(15 * i, io[i].getNumber());
 		}
 	}
 
@@ -3603,7 +3603,7 @@ public void testInplace15_12ToArrays() {
 			.mutate12();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(15 * i, io[i].getNumber());
+			Assert.assertEquals(15 * i, io[i].getNumber());
 		}
 	}
 
@@ -3638,7 +3638,7 @@ public void testInplace15_13ToArrays() {
 			.mutate13();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(15 * i, io[i].getNumber());
+			Assert.assertEquals(15 * i, io[i].getNumber());
 		}
 	}
 
@@ -3673,7 +3673,7 @@ public void testInplace15_14ToArrays() {
 			.mutate14();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(15 * i, io[i].getNumber());
+			Assert.assertEquals(15 * i, io[i].getNumber());
 		}
 	}
 
@@ -3708,7 +3708,7 @@ public void testInplace15_15ToArrays() {
 			.mutate15();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(15 * i, io[i].getNumber());
+			Assert.assertEquals(15 * i, io[i].getNumber());
 		}
 	}
 
@@ -3744,7 +3744,7 @@ public void testInplace16_1ToArrays() {
 			.mutate1();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(16 * i, io[i].getNumber());
+			Assert.assertEquals(16 * i, io[i].getNumber());
 		}
 	}
 
@@ -3780,7 +3780,7 @@ public void testInplace16_2ToArrays() {
 			.mutate2();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(16 * i, io[i].getNumber());
+			Assert.assertEquals(16 * i, io[i].getNumber());
 		}
 	}
 
@@ -3816,7 +3816,7 @@ public void testInplace16_3ToArrays() {
 			.mutate3();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(16 * i, io[i].getNumber());
+			Assert.assertEquals(16 * i, io[i].getNumber());
 		}
 	}
 
@@ -3852,7 +3852,7 @@ public void testInplace16_4ToArrays() {
 			.mutate4();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(16 * i, io[i].getNumber());
+			Assert.assertEquals(16 * i, io[i].getNumber());
 		}
 	}
 
@@ -3888,7 +3888,7 @@ public void testInplace16_5ToArrays() {
 			.mutate5();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(16 * i, io[i].getNumber());
+			Assert.assertEquals(16 * i, io[i].getNumber());
 		}
 	}
 
@@ -3924,7 +3924,7 @@ public void testInplace16_6ToArrays() {
 			.mutate6();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(16 * i, io[i].getNumber());
+			Assert.assertEquals(16 * i, io[i].getNumber());
 		}
 	}
 
@@ -3960,7 +3960,7 @@ public void testInplace16_7ToArrays() {
 			.mutate7();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(16 * i, io[i].getNumber());
+			Assert.assertEquals(16 * i, io[i].getNumber());
 		}
 	}
 
@@ -3996,7 +3996,7 @@ public void testInplace16_8ToArrays() {
 			.mutate8();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(16 * i, io[i].getNumber());
+			Assert.assertEquals(16 * i, io[i].getNumber());
 		}
 	}
 
@@ -4032,7 +4032,7 @@ public void testInplace16_9ToArrays() {
 			.mutate9();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(16 * i, io[i].getNumber());
+			Assert.assertEquals(16 * i, io[i].getNumber());
 		}
 	}
 
@@ -4068,7 +4068,7 @@ public void testInplace16_10ToArrays() {
 			.mutate10();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(16 * i, io[i].getNumber());
+			Assert.assertEquals(16 * i, io[i].getNumber());
 		}
 	}
 
@@ -4104,7 +4104,7 @@ public void testInplace16_11ToArrays() {
 			.mutate11();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(16 * i, io[i].getNumber());
+			Assert.assertEquals(16 * i, io[i].getNumber());
 		}
 	}
 
@@ -4140,7 +4140,7 @@ public void testInplace16_12ToArrays() {
 			.mutate12();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(16 * i, io[i].getNumber());
+			Assert.assertEquals(16 * i, io[i].getNumber());
 		}
 	}
 
@@ -4176,7 +4176,7 @@ public void testInplace16_13ToArrays() {
 			.mutate13();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(16 * i, io[i].getNumber());
+			Assert.assertEquals(16 * i, io[i].getNumber());
 		}
 	}
 
@@ -4212,7 +4212,7 @@ public void testInplace16_14ToArrays() {
 			.mutate14();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(16 * i, io[i].getNumber());
+			Assert.assertEquals(16 * i, io[i].getNumber());
 		}
 	}
 
@@ -4248,7 +4248,7 @@ public void testInplace16_15ToArrays() {
 			.mutate15();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(16 * i, io[i].getNumber());
+			Assert.assertEquals(16 * i, io[i].getNumber());
 		}
 	}
 
@@ -4284,7 +4284,7 @@ public void testInplace16_16ToArrays() {
 			.mutate16();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals(16 * i, io[i].getNumber());
+			Assert.assertEquals(16 * i, io[i].getNumber());
 		}
 	}
 
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/AdaptationHintTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/AdaptationHintTest.java
index 28c4c17b9..c6d9724b8 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/AdaptationHintTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/AdaptationHintTest.java
@@ -7,7 +7,7 @@
 import org.junit.Test;
 import org.scijava.ops.api.Hints;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.OpHints;
+import org.scijava.ops.api.OpHints;
 import org.scijava.ops.engine.BaseOpHints.Adaptation;
 import org.scijava.ops.engine.hint.DefaultHints;
 import org.scijava.ops.engine.matcher.OpMatchingException;
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/SimplificationHintTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/SimplificationHintTest.java
index 0ccd972d4..47ed8d0dd 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/SimplificationHintTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/hints/SimplificationHintTest.java
@@ -8,8 +8,7 @@
 import org.junit.Test;
 import org.scijava.ops.api.Hints;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.OpHints;
-import org.scijava.ops.engine.BaseOpHints.Adaptation;
+import org.scijava.ops.api.OpHints;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
 import org.scijava.ops.engine.hint.DefaultHints;
 import org.scijava.ops.engine.matcher.OpMatchingException;
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/OpCachingTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/OpCachingTest.java
index 02987a63c..23d628795 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/OpCachingTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/OpCachingTest.java
@@ -35,19 +35,15 @@
 import java.util.Map;
 import java.util.Optional;
 
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.jupiter.api.Assertions;
 import org.scijava.Context;
 import org.scijava.function.Producer;
 import org.scijava.ops.api.OpEnvironment;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-<<<<<<< HEAD
-import org.scijava.ops.engine.OpEnvironment;
 import org.scijava.ops.engine.OpHistoryService;
 import org.scijava.ops.engine.OpInstance;
-=======
->>>>>>> WIP: Partition scijava-ops-api
 import org.scijava.ops.engine.OpService;
 import org.scijava.ops.spi.Op;
 import org.scijava.ops.spi.OpCollection;
@@ -110,9 +106,9 @@ public void cacheOp() throws SecurityException, IllegalArgumentException,
 
 		// assert there is exactly one Op in the cache
 		OpInstance cachedInstance = opCache.values().iterator().next();
-		Assertions.assertEquals(opCache.size(), 1, 0);
-		Assertions.assertEquals(basicOp, cachedInstance.op(),
-			"Object in cache was not the same Object that was returned!");
+		Assert.assertEquals(opCache.size(), 1, 0);
+		Assert.assertEquals(
+			"Object in cache was not the same Object that was returned!", basicOp, cachedInstance.op());
 
 		// assert that the same call to the matcher returns our Object
 		MatchingConditions cachedConditions = opCache.keySet().iterator().next();
@@ -124,9 +120,9 @@ public void cacheOp() throws SecurityException, IllegalArgumentException,
 
 		Producer<String> invadedOp = defOpEnv.op("test.basicOp").input().outType(
 			String.class).producer();
-		Assertions.assertEquals(newProducer.create(), invadedOp.create(),
-			"Op returned did not match the Op inserted into the cache!");
-
+		Assert.assertEquals(
+			"Op returned did not match the Op inserted into the cache!", invadedOp.create(),
+			newProducer.create());
 	}
 
 	@Test
@@ -141,23 +137,26 @@ public void cacheOpAndDependencies() throws NoSuchFieldException,
 		Map<MatchingConditions, OpInstance> opCache = getOpCache(defOpEnv);
 
 		// assert there are exactly two Ops in the cache
-		Assertions.assertEquals(opCache.size(), 2, 0);
+		Assert.assertEquals(opCache.size(), 2, 0);
 
 		// assert that complicatedOp is in the cache (
 		Optional<MatchingConditions> complicatedOptional = opCache.keySet().stream().filter(
 			condition -> condition.ref().getName().equals("test.complicatedOp")).findFirst();
-		Assertions.assertFalse(complicatedOptional.isEmpty(),
-			"test.complicatedOp not in cache!");
-		Assertions.assertTrue(opCache.get(complicatedOptional.get()).op() instanceof ComplicatedOp,
-			"Object in cache was not an instance of ComplicatedOp!");
+		Assert.assertFalse(
+			"test.complicatedOp not in cache!", complicatedOptional.isEmpty());
+		Assert.assertTrue("Object in cache was not an instance of ComplicatedOp!",
+			opCache.get(complicatedOptional.get()).op() instanceof ComplicatedOp);
 
 		// assert that basic Op is also in the cache
-		Optional<MatchingConditions> basicOptional = opCache.keySet().stream().filter(condition -> condition
-			.ref().getName().equals("test.basicOp")).findFirst();
-		Assertions.assertFalse(basicOptional.isEmpty(),
-			"test.basicOp not in cache despite being an OpDependency of test.complicatedOp");
-		Assertions.assertEquals(opCache.get(basicOptional.get()).op(), basicOp,
-			"Object in cache was not the same Object that was returned!");
+		Optional<MatchingConditions> basicOptional = opCache.keySet().stream()
+			.filter(condition -> condition.ref().getName().equals("test.basicOp"))
+			.findFirst();
+		Assert.assertFalse(
+			"test.basicOp not in cache despite being an OpDependency of test.complicatedOp",
+			basicOptional.isEmpty());
+		Assert.assertEquals(
+			"Object in cache was not the same Object that was returned!", opCache.get(
+				basicOptional.get()).op(), basicOp);
 	}
 
 }
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/ProvenanceTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/ProvenanceTest.java
index 484187fc4..4c7a71317 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/ProvenanceTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/ProvenanceTest.java
@@ -12,11 +12,11 @@
 import org.junit.Test;
 import org.scijava.Priority;
 import org.scijava.function.Producer;
+import org.scijava.ops.api.Hints;
+import org.scijava.ops.api.OpExecutionSummary;
+import org.scijava.ops.api.OpInfo;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.Hints;
-import org.scijava.ops.engine.OpExecutionSummary;
 import org.scijava.ops.engine.OpHistoryService;
-import org.scijava.ops.engine.OpInfo;
 import org.scijava.ops.engine.hint.DefaultHints;
 import org.scijava.ops.spi.OpCollection;
 import org.scijava.ops.spi.OpDependency;
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingUtilsTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingUtilsTest.java
index 35638edda..c0ba5dbfe 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingUtilsTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingUtilsTest.java
@@ -43,7 +43,6 @@
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.junit.jupiter.api.Assertions;
 import org.scijava.ops.engine.matcher.impl.MatchingUtils;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
@@ -556,9 +555,9 @@ public <T extends Number> void testIsAssignableOutputToObject() {
 		final Type fooSource = new Nil<Function<T, List<T>>>() {}.getType();
 		final Type fooFunc = new Nil<Function<Double, Object>>() {}.getType();
 
-		Assertions.assertFalse(GenericAssignability.checkGenericAssignability(fooSource,
+		Assert.assertFalse(GenericAssignability.checkGenericAssignability(fooSource,
 			(ParameterizedType) fooFunc, false));
-		Assertions.assertTrue(GenericAssignability.checkGenericAssignability(fooSource,
+		Assert.assertTrue(GenericAssignability.checkGenericAssignability(fooSource,
 			(ParameterizedType) fooFunc, true));
 
 	}
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/PrimitiveListSimplifierTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/PrimitiveListSimplifierTest.java
index e75af0c86..b3df105b2 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/PrimitiveListSimplifierTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/PrimitiveListSimplifierTest.java
@@ -2,7 +2,7 @@
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplificationPriorityTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplificationPriorityTest.java
index 56fde2e46..4fe0a6173 100644
--- a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplificationPriorityTest.java
+++ b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/simplify/SimplificationPriorityTest.java
@@ -1,14 +1,13 @@
 
 package org.scijava.ops.engine.simplify;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
+import org.junit.Assert;
 import org.junit.Test;
+import org.scijava.ops.api.OpHints;
 import org.scijava.ops.engine.AbstractTestEnvironment;
-import org.scijava.ops.engine.OpHints;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
 import org.scijava.ops.engine.conversionLoss.LossReporter;
 import org.scijava.ops.spi.OpCollection;
@@ -43,7 +42,7 @@ public void testSimplificationPriority() {
 
 		Double output = ops.op("test.thing").input(thing1, thing2).outType(
 			Double.class).apply();
-		assertEquals(1., output);
+		Assert.assertEquals(1., output, 0.);
 	}
 
 	@Test
@@ -52,7 +51,7 @@ public void testMissingLossReporter() {
 
 		Double output = ops.op("test.thing").input(thing1).outType(
 			Double.class).apply();
-		assertEquals(2., output);
+		Assert.assertEquals(2., output, 0.);
 	}
 
 	@OpHints(hints = {Simplification.FORBIDDEN})
diff --git a/scijava/scijava-ops-engine/templates/main/java/module-info.vm b/scijava/scijava-ops-engine/templates/main/java/module-info.vm
index 191a30f24..3d7c993ac 100644
--- a/scijava/scijava-ops-engine/templates/main/java/module-info.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/module-info.vm
@@ -24,9 +24,6 @@ module org.scijava.ops.engine {
 	opens $package to $opensToString.call($package, $scijavaPackages, $therapiPackages);
 #end
 
-	// FIXME: This is a file name and is thus unstable
-	requires geantyref;
-
 	requires java.desktop;
 
 	requires org.scijava;
diff --git a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/matcher/impl/OpWrappers.vm b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/matcher/impl/OpWrappers.vm
index a8aaec2c4..1b6a29500 100644
--- a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/matcher/impl/OpWrappers.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/matcher/impl/OpWrappers.vm
@@ -15,12 +15,12 @@ import org.scijava.function.Container;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
+import org.scijava.ops.api.Hints;
+import org.scijava.ops.api.OpHistory;
+import org.scijava.ops.api.OpInfo;
+import org.scijava.ops.api.OpWrapper;
 import org.scijava.ops.engine.BaseOpHints.DependencyMatching;
-import org.scijava.ops.engine.Hints;
 import org.scijava.ops.engine.OpExecutionSummary;
-import org.scijava.ops.engine.OpHistory;
-import org.scijava.ops.engine.OpInfo;
-import org.scijava.ops.engine.OpWrapper;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.GenericTyped;
 
diff --git a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/util/FunctionUtils.vm b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/util/FunctionUtils.vm
index 72ca7baf4..421e1415e 100644
--- a/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/util/FunctionUtils.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/org/scijava/ops/engine/util/FunctionUtils.vm
@@ -12,8 +12,8 @@ import java.util.function.Function;
 
 import org.scijava.function.Functions;
 import org.scijava.function.Producer;
-import org.scijava.ops.engine.OpEnvironment;
-import org.scijava.ops.engine.Hints;
+import org.scijava.ops.api.OpEnvironment;
+import org.scijava.ops.api.Hints;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
 
diff --git a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpBuilderTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpBuilderTest.vm
index 4f4f83ef9..4e4205d58 100644
--- a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpBuilderTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/OpBuilderTest.vm
@@ -41,6 +41,7 @@ import org.scijava.function.Computers;
 import org.scijava.function.Functions;
 import org.scijava.function.Inplaces;
 import org.scijava.function.Producer;
+import org.scijava.ops.api.OpBuilder;
 import org.scijava.ops.engine.AbstractTestEnvironment;
 
 /**
diff --git a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/ComputerToArraysTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/ComputerToArraysTest.vm
index 97cbaf3a2..181e36396 100644
--- a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/ComputerToArraysTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/ComputerToArraysTest.vm
@@ -35,7 +35,7 @@
 package org.scijava.ops.engine.adapt.lift;
 
 import org.junit.Test;
-import org.junit.jupiter.api.Assertions;
+import org.junit.Assert;
 import org.scijava.function.Computers;
 import org.scijava.ops.spi.OpField;
 import org.scijava.ops.spi.OpCollection;
@@ -86,7 +86,7 @@ public class ComputerToArraysTest extends AbstractTestEnvironment {
 		ops.env().op("test.liftArrayC").input($inputArgs.call($arity)).output(output).compute();
 
 		for(int i = 0; i < output.length; i++) {
-			Assertions.assertEquals($arity * i, output[i].getNumber());
+			Assert.assertEquals($arity * i, output[i].getNumber());
 		}
 	}
 
diff --git a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/FunctionToArraysTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/FunctionToArraysTest.vm
index 440146c29..3086725f2 100644
--- a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/FunctionToArraysTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/FunctionToArraysTest.vm
@@ -38,7 +38,7 @@ import java.util.function.BiFunction;
 import java.util.function.Function;
 
 import org.junit.Test;
-import org.junit.jupiter.api.Assertions;
+import org.junit.Assert;
 import org.scijava.function.Functions;
 import org.scijava.ops.engine.AbstractTestEnvironment;
 import org.scijava.ops.spi.OpField;
@@ -89,7 +89,7 @@ public class FunctionToArraysTest extends AbstractTestEnvironment {
 			{}).apply();
 
 		for (int i = 0; i < output.length; i++) {
-			Assertions.assertEquals($arity * i, output[i].getNumber());
+			Assert.assertEquals($arity * i, output[i].getNumber());
 		}
 	}
 
diff --git a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/InplaceToArraysTest.vm b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/InplaceToArraysTest.vm
index 2a8c871e1..f96c0b4df 100644
--- a/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/InplaceToArraysTest.vm
+++ b/scijava/scijava-ops-engine/templates/test/java/org/scijava/ops/engine/adapt/lift/InplaceToArraysTest.vm
@@ -35,7 +35,7 @@
 package org.scijava.ops.engine.adapt.lift;
 
 import org.junit.Test;
-import org.junit.jupiter.api.Assertions;
+import org.junit.Assert;
 import org.scijava.function.Inplaces;
 import org.scijava.ops.engine.AbstractTestEnvironment;
 import org.scijava.ops.spi.OpField;
@@ -97,7 +97,7 @@ public class InplaceToArraysTest extends AbstractTestEnvironment {
 			.${mutateMethod.call($arity, $a)}();
 
 		for (int i = 0; i < input.length; i++) {
-			Assertions.assertEquals($arity * i, io[i].getNumber());
+			Assert.assertEquals($arity * i, io[i].getNumber());
 		}
 	}
 #end
diff --git a/scijava/scijava-struct/pom.xml b/scijava/scijava-struct/pom.xml
index 48ccc2e29..100837683 100644
--- a/scijava/scijava-struct/pom.xml
+++ b/scijava/scijava-struct/pom.xml
@@ -92,6 +92,10 @@
 
 	<dependencies>
 		<!-- SciJava dependencies -->
+		<dependency>
+			<groupId>org.scijava</groupId>
+			<artifactId>scijava-common</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.scijava</groupId>
 			<artifactId>scijava-types</artifactId>
@@ -101,20 +105,5 @@
 		<!-- Third-party dependencies -->
 
 		<!-- Test scope dependencies -->
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-api</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-engine</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.vintage</groupId>
-			<artifactId>junit-vintage-engine</artifactId>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/scijava/scijava-testutil/pom.xml b/scijava/scijava-testutil/pom.xml
index 38fe0ade4..20addccfb 100644
--- a/scijava/scijava-testutil/pom.xml
+++ b/scijava/scijava-testutil/pom.xml
@@ -105,16 +105,6 @@
 			<artifactId>junit-jupiter-api</artifactId>
 			<scope>compile</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-engine</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.vintage</groupId>
-			<artifactId>junit-vintage-engine</artifactId>
-			<scope>runtime</scope>
-		</dependency>
 	</dependencies>
 </project>
 
diff --git a/scijava/scijava-types/pom.xml b/scijava/scijava-types/pom.xml
index 2ba2bd147..915ca1cba 100644
--- a/scijava/scijava-types/pom.xml
+++ b/scijava/scijava-types/pom.xml
@@ -102,26 +102,16 @@
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>io.leangen.geantyref</groupId>
-			<artifactId>geantyref</artifactId>
-			<version>${geantyref.version}</version>
-		</dependency>
 
 		<!-- Test scope dependencies -->
 		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-api</artifactId>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-engine</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.vintage</groupId>
-			<artifactId>junit-vintage-engine</artifactId>
+			<artifactId>junit-jupiter-api</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

From 70e6e489732d904b7467332424df412d5188595f Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Tue, 27 Jul 2021 15:42:53 -0500
Subject: [PATCH 86/91] Re-enforce the prevention of subpackage dependence

---
 pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 644d5e889..ab5699e13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,7 +147,6 @@
 							</rules>
 						</configuration>
 					</execution>
-					<!--
 					<execution>
 						<id>enforce-no-subpackage-dependence</id>
 						<goals>
@@ -161,7 +160,6 @@
 							</rules>
 						</configuration>
 					</execution>
-					-->
 				</executions>
 			</plugin>
 		</plugins>

From 1e2b35bb0b0f7a09192438ba87c19122c32e6763 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Tue, 27 Jul 2021 16:07:22 -0500
Subject: [PATCH 87/91] Move DependencyMember impls to engine.struct package

---
 .../ops/engine/{ => struct}/AnnotatedOpDependencyMember.java    | 2 +-
 .../ops/engine/struct/ClassOpDependencyMemberParser.java        | 1 -
 .../ops/engine/{ => struct}/FieldOpDependencyMember.java        | 2 +-
 .../ops/engine/struct/MethodOpDependencyMemberParser.java       | 1 -
 .../engine/{ => struct}/MethodParameterOpDependencyMember.java  | 2 +-
 5 files changed, 3 insertions(+), 5 deletions(-)
 rename scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/{ => struct}/AnnotatedOpDependencyMember.java (98%)
 rename scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/{ => struct}/FieldOpDependencyMember.java (98%)
 rename scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/{ => struct}/MethodParameterOpDependencyMember.java (95%)

diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/AnnotatedOpDependencyMember.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/AnnotatedOpDependencyMember.java
similarity index 98%
rename from scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/AnnotatedOpDependencyMember.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/AnnotatedOpDependencyMember.java
index f09b7c79c..887b7cf26 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/AnnotatedOpDependencyMember.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/AnnotatedOpDependencyMember.java
@@ -28,7 +28,7 @@
  * #L%
  */
 
-package org.scijava.ops.engine;
+package org.scijava.ops.engine.struct;
 
 import java.lang.reflect.Type;
 
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ClassOpDependencyMemberParser.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ClassOpDependencyMemberParser.java
index db23a22b4..e08f82a56 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ClassOpDependencyMemberParser.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ClassOpDependencyMemberParser.java
@@ -7,7 +7,6 @@
 import java.util.List;
 
 import org.scijava.ValidityProblem;
-import org.scijava.ops.engine.FieldOpDependencyMember;
 import org.scijava.ops.spi.OpDependency;
 import org.scijava.struct.MemberParser;
 import org.scijava.struct.ValidityException;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/FieldOpDependencyMember.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/FieldOpDependencyMember.java
similarity index 98%
rename from scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/FieldOpDependencyMember.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/FieldOpDependencyMember.java
index f2a86a32e..2868da597 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/FieldOpDependencyMember.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/FieldOpDependencyMember.java
@@ -28,7 +28,7 @@
  * #L%
  */
 
-package org.scijava.ops.engine;
+package org.scijava.ops.engine.struct;
 
 import java.lang.reflect.Field;
 
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/MethodOpDependencyMemberParser.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/MethodOpDependencyMemberParser.java
index 781a0944e..d9b79ecf8 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/MethodOpDependencyMemberParser.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/MethodOpDependencyMemberParser.java
@@ -8,7 +8,6 @@
 import java.util.List;
 
 import org.scijava.ValidityProblem;
-import org.scijava.ops.engine.MethodParameterOpDependencyMember;
 import org.scijava.ops.spi.OpDependency;
 import org.scijava.struct.MemberParser;
 import org.scijava.struct.ValidityException;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/MethodParameterOpDependencyMember.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/MethodParameterOpDependencyMember.java
similarity index 95%
rename from scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/MethodParameterOpDependencyMember.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/MethodParameterOpDependencyMember.java
index 871231968..1195e9d0a 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/MethodParameterOpDependencyMember.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/MethodParameterOpDependencyMember.java
@@ -28,7 +28,7 @@
  * #L%
  */
 
-package org.scijava.ops.engine;
+package org.scijava.ops.engine.struct;
 
 import java.lang.reflect.Parameter;
 import java.lang.reflect.Type;

From 8697ef41cc18f88e4b77507c3bbce3f2b59de7d3 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Wed, 28 Jul 2021 09:14:21 -0500
Subject: [PATCH 88/91] Remove unnecessary exports

---
 scijava/scijava-ops-engine/src/main/java/module-info.java | 8 ++------
 .../scijava-ops-engine/templates/main/java/module-info.vm | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/scijava/scijava-ops-engine/src/main/java/module-info.java b/scijava/scijava-ops-engine/src/main/java/module-info.java
index e7548ff15..333726194 100644
--- a/scijava/scijava-ops-engine/src/main/java/module-info.java
+++ b/scijava/scijava-ops-engine/src/main/java/module-info.java
@@ -6,13 +6,9 @@
  */
 
 	//TODO: rearrange packages to export only needed classes
-	exports org.scijava.ops.engine; //contains OpDependency interface
-	exports org.scijava.ops.engine.matcher;
-	exports org.scijava.ops.engine.math;
-	exports org.scijava.ops.engine.simplify;
+	exports org.scijava.ops.engine; //contains OpService interface
 	exports org.scijava.ops.engine.conversionLoss;
-	// TODO: move OpWrapper to its own package (org.scijava.ops.wrap??)
-	exports org.scijava.ops.engine.util; // contains OpWrapper interface
+	exports org.scijava.ops.engine.util;
 
 	opens org.scijava.ops.engine to therapi.runtime.javadoc, org.scijava;
 	opens org.scijava.ops.engine.monitor to therapi.runtime.javadoc;
diff --git a/scijava/scijava-ops-engine/templates/main/java/module-info.vm b/scijava/scijava-ops-engine/templates/main/java/module-info.vm
index 3d7c993ac..41576a452 100644
--- a/scijava/scijava-ops-engine/templates/main/java/module-info.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/module-info.vm
@@ -12,13 +12,9 @@ module org.scijava.ops.engine {
 ## Defines the packages that should be exported to therapi.runtime.javadoc
 #set($therapiPackages = $modulePackages.call("src/main/java/org/scijava"))
 	//TODO: rearrange packages to export only needed classes
-	exports org.scijava.ops.engine; //contains OpDependency interface
-	exports org.scijava.ops.engine.matcher;
-	exports org.scijava.ops.engine.math;
-	exports org.scijava.ops.engine.simplify;
+	exports org.scijava.ops.engine; //contains OpService interface
 	exports org.scijava.ops.engine.conversionLoss;
-	// TODO: move OpWrapper to its own package (org.scijava.ops.wrap??)
-	exports org.scijava.ops.engine.util; // contains OpWrapper interface
+	exports org.scijava.ops.engine.util;
 
 #foreach($package in $packages)
 	opens $package to $opensToString.call($package, $scijavaPackages, $therapiPackages);

From 6aded6211b9e3f8abd590c82ee5e93879156d6f0 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Wed, 28 Jul 2021 10:54:55 -0500
Subject: [PATCH 89/91] Partition util package

Since we are exporting this package, we only want the classes designed
to be exported in this package. This spurs the creation of a
util.internal package
---
 .../src/main/java/module-info.java                   |  1 +
 .../ops/engine/matcher/impl/OpMethodInfo.java        |  2 +-
 .../ops/engine/simplify/SimplificationUtils.java     |  2 +-
 .../ops/engine/struct/FunctionalParameters.java      |  2 +-
 .../engine/struct/MethodParameterMemberParser.java   |  2 +-
 .../engine/util/{ => internal}/AnnotationUtils.java  |  2 +-
 .../engine/util/{ => internal}/OpMethodUtils.java    |  2 +-
 .../ops/engine/util/internal/package-info.java       | 12 ++++++++++++
 .../org/scijava/ops/engine/util/package-info.java    | 11 +++++++++++
 9 files changed, 30 insertions(+), 6 deletions(-)
 rename scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/{ => internal}/AnnotationUtils.java (98%)
 rename scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/{ => internal}/OpMethodUtils.java (95%)
 create mode 100644 scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/internal/package-info.java
 create mode 100644 scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/package-info.java

diff --git a/scijava/scijava-ops-engine/src/main/java/module-info.java b/scijava/scijava-ops-engine/src/main/java/module-info.java
index 333726194..dd2776768 100644
--- a/scijava/scijava-ops-engine/src/main/java/module-info.java
+++ b/scijava/scijava-ops-engine/src/main/java/module-info.java
@@ -10,6 +10,7 @@
 	exports org.scijava.ops.engine.conversionLoss;
 	exports org.scijava.ops.engine.util;
 
+	opens org.scijava.ops.engine.util.internal to therapi.runtime.javadoc;
 	opens org.scijava.ops.engine to therapi.runtime.javadoc, org.scijava;
 	opens org.scijava.ops.engine.monitor to therapi.runtime.javadoc;
 	opens org.scijava.ops.engine.create to therapi.runtime.javadoc;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpMethodInfo.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpMethodInfo.java
index dbb561ad4..5452d5aa1 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpMethodInfo.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/OpMethodInfo.java
@@ -54,7 +54,7 @@
 import org.scijava.ops.engine.struct.MethodOpDependencyMemberParser;
 import org.scijava.ops.engine.struct.MethodParameterMemberParser;
 import org.scijava.ops.engine.util.Adapt;
-import org.scijava.ops.engine.util.OpMethodUtils;
+import org.scijava.ops.engine.util.internal.OpMethodUtils;
 import org.scijava.ops.spi.OpDependency;
 import org.scijava.ops.spi.OpMethod;
 import org.scijava.struct.Member;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplificationUtils.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplificationUtils.java
index fd5389f0e..86fbfb990 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplificationUtils.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/simplify/SimplificationUtils.java
@@ -25,7 +25,7 @@
 import org.scijava.ops.api.OpInfo;
 import org.scijava.ops.api.OpRef;
 import org.scijava.ops.api.OpUtils;
-import org.scijava.ops.engine.util.AnnotationUtils;
+import org.scijava.ops.engine.util.internal.AnnotationUtils;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
 import org.scijava.types.inference.GenericAssignability;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/FunctionalParameters.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/FunctionalParameters.java
index 6fceea843..f1d283340 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/FunctionalParameters.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/FunctionalParameters.java
@@ -10,7 +10,7 @@
 import org.scijava.function.Container;
 import org.scijava.function.Mutable;
 import org.scijava.ops.api.OpUtils;
-import org.scijava.ops.engine.util.AnnotationUtils;
+import org.scijava.ops.engine.util.internal.AnnotationUtils;
 import org.scijava.struct.FunctionalMethodType;
 import org.scijava.struct.ItemIO;
 import org.scijava.types.Types;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/MethodParameterMemberParser.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/MethodParameterMemberParser.java
index d17934a2d..87cf2f47a 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/MethodParameterMemberParser.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/MethodParameterMemberParser.java
@@ -9,7 +9,7 @@
 import java.util.Set;
 
 import org.scijava.ValidityProblem;
-import org.scijava.ops.engine.util.OpMethodUtils;
+import org.scijava.ops.engine.util.internal.OpMethodUtils;
 import org.scijava.ops.spi.OpMethod;
 import org.scijava.struct.MemberParser;
 import org.scijava.struct.ValidityException;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/AnnotationUtils.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/internal/AnnotationUtils.java
similarity index 98%
rename from scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/AnnotationUtils.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/internal/AnnotationUtils.java
index 8c9ddaa8a..f028d78aa 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/AnnotationUtils.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/internal/AnnotationUtils.java
@@ -33,7 +33,7 @@
 // File path shortening code adapted from:
 // from: http://www.rgagnon.com/javadetails/java-0661.html
 
-package org.scijava.ops.engine.util;
+package org.scijava.ops.engine.util.internal;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/OpMethodUtils.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/internal/OpMethodUtils.java
similarity index 95%
rename from scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/OpMethodUtils.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/internal/OpMethodUtils.java
index b28d51e8c..0e9d4dae9 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/OpMethodUtils.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/internal/OpMethodUtils.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.engine.util;
+package org.scijava.ops.engine.util.internal;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/internal/package-info.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/internal/package-info.java
new file mode 100644
index 000000000..9597c6a0f
--- /dev/null
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/internal/package-info.java
@@ -0,0 +1,12 @@
+/**
+ * This package is designed to house utility methods intended for use <b>only
+ * within SciJava Ops</b>.
+ * <p>
+ * Utilities intended for use outside of this library sould be housed within
+ * {@link org.scijava.ops.engine.util}
+ *
+ * @author Gabriel Selzer
+ * @see org.scijava.ops.engine.util
+ */
+
+package org.scijava.ops.engine.util.internal;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/package-info.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/package-info.java
new file mode 100644
index 000000000..b2b36ee5c
--- /dev/null
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/package-info.java
@@ -0,0 +1,11 @@
+/**
+ * This package is intended to house utility methods useful to Op
+ * implementations. This package is <b>exported</b>; any utilities designed to
+ * be used <b>only</b> within SciJava Ops should instead be placed within
+ * {@link org.scijava.ops.engine.util.internal}
+ * 
+ * @author Gabriel Selzer
+ * @see org.scijava.ops.engine.util.internal
+ */
+
+package org.scijava.ops.engine.util;

From 6993af11557e8405d86caa2611debaa90dff72c6 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Wed, 28 Jul 2021 11:59:28 -0500
Subject: [PATCH 90/91] Create conversionLoss.impl package for impls

Now we only export the interfaces
---
 .../src/main/java/module-info.java             |  1 +
 .../{ => impl}/IdentityLossReporter.java       |  3 ++-
 .../{ => impl}/LossReporterWrapper.java        |  3 ++-
 .../PrimitiveArrayLossReporters.java           |  3 ++-
 .../{ => impl}/PrimitiveLossReporters.java     |  3 ++-
 .../conversionLoss/impl/package-info.java      |  2 ++
 .../engine/conversionLoss/package-info.java    | 18 ++++++++++++++++++
 .../templates/main/java/module-info.vm         |  2 +-
 8 files changed, 30 insertions(+), 5 deletions(-)
 rename scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/{ => impl}/IdentityLossReporter.java (85%)
 rename scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/{ => impl}/LossReporterWrapper.java (89%)
 rename scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/{ => impl}/PrimitiveArrayLossReporters.java (82%)
 rename scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/{ => impl}/PrimitiveLossReporters.java (93%)
 create mode 100644 scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/impl/package-info.java
 create mode 100644 scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/package-info.java

diff --git a/scijava/scijava-ops-engine/src/main/java/module-info.java b/scijava/scijava-ops-engine/src/main/java/module-info.java
index dd2776768..20be1ce15 100644
--- a/scijava/scijava-ops-engine/src/main/java/module-info.java
+++ b/scijava/scijava-ops-engine/src/main/java/module-info.java
@@ -21,6 +21,7 @@
 	opens org.scijava.ops.engine.matcher to therapi.runtime.javadoc;
 	opens org.scijava.ops.engine.simplify to therapi.runtime.javadoc;
 	opens org.scijava.ops.engine.impl to therapi.runtime.javadoc, org.scijava;
+	opens org.scijava.ops.engine.conversionLoss.impl to therapi.runtime.javadoc, org.scijava;
 	opens org.scijava.ops.engine.adapt.complexLift to therapi.runtime.javadoc;
 	opens org.scijava.ops.engine.adapt.lift to therapi.runtime.javadoc;
 	opens org.scijava.ops.engine.struct to therapi.runtime.javadoc;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/IdentityLossReporter.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/impl/IdentityLossReporter.java
similarity index 85%
rename from scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/IdentityLossReporter.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/impl/IdentityLossReporter.java
index 4a745906f..979780587 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/IdentityLossReporter.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/impl/IdentityLossReporter.java
@@ -1,8 +1,9 @@
 
-package org.scijava.ops.engine.conversionLoss;
+package org.scijava.ops.engine.conversionLoss.impl;
 
 import org.scijava.ops.api.OpHints;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
+import org.scijava.ops.engine.conversionLoss.LossReporter;
 import org.scijava.ops.spi.Op;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Nil;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/LossReporterWrapper.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/impl/LossReporterWrapper.java
similarity index 89%
rename from scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/LossReporterWrapper.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/impl/LossReporterWrapper.java
index 59de4d504..b27977090 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/LossReporterWrapper.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/impl/LossReporterWrapper.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.engine.conversionLoss;
+package org.scijava.ops.engine.conversionLoss.impl;
 
 import java.lang.reflect.Type;
 import java.util.UUID;
@@ -9,6 +9,7 @@
 import org.scijava.ops.api.OpInfo;
 import org.scijava.ops.api.OpWrapper;
 import org.scijava.ops.engine.BaseOpHints.DependencyMatching;
+import org.scijava.ops.engine.conversionLoss.LossReporter;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.GenericTyped;
 import org.scijava.types.Nil;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/PrimitiveArrayLossReporters.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/impl/PrimitiveArrayLossReporters.java
similarity index 82%
rename from scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/PrimitiveArrayLossReporters.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/impl/PrimitiveArrayLossReporters.java
index 32754b5cc..ae77082c1 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/PrimitiveArrayLossReporters.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/impl/PrimitiveArrayLossReporters.java
@@ -1,7 +1,8 @@
-package org.scijava.ops.engine.conversionLoss;
+package org.scijava.ops.engine.conversionLoss.impl;
 
 import org.scijava.ops.api.OpHints;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
+import org.scijava.ops.engine.conversionLoss.LossReporter;
 import org.scijava.ops.spi.OpCollection;
 import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/PrimitiveLossReporters.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/impl/PrimitiveLossReporters.java
similarity index 93%
rename from scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/PrimitiveLossReporters.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/impl/PrimitiveLossReporters.java
index 2a0f4dee5..8d959c9d3 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/PrimitiveLossReporters.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/impl/PrimitiveLossReporters.java
@@ -1,8 +1,9 @@
 
-package org.scijava.ops.engine.conversionLoss;
+package org.scijava.ops.engine.conversionLoss.impl;
 
 import org.scijava.ops.api.OpHints;
 import org.scijava.ops.engine.BaseOpHints.Simplification;
+import org.scijava.ops.engine.conversionLoss.LossReporter;
 import org.scijava.ops.spi.OpCollection;
 import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/impl/package-info.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/impl/package-info.java
new file mode 100644
index 000000000..6da68b810
--- /dev/null
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/impl/package-info.java
@@ -0,0 +1,2 @@
+
+package org.scijava.ops.engine.conversionLoss.impl;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/package-info.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/package-info.java
new file mode 100644
index 000000000..74cdc1756
--- /dev/null
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/conversionLoss/package-info.java
@@ -0,0 +1,18 @@
+/**
+ * This package is intended to house classes dealing with the calculation of
+ * loss with respect to type conversion and Op simplification.
+ * <p>
+ * <b>This package is {@code exported}, and should be reserved for
+ * interfaces</b>; implementations belong within
+ * {@link org.scijava.ops.engine.conversionLoss.impl}
+ * <p>
+ * NB: These interfaces <b>do not</b> belong in SciJava Ops API as they are an
+ * implementation detail of simplification, which is an aspect of SciJava Ops
+ * Engine.
+ * 
+ * @author Gabriel Selzer
+ * @see org.scijava.ops.engine.conversionLoss.impl
+ * @see org.scijava.ops.engine.simplify
+ */
+
+package org.scijava.ops.engine.conversionLoss;
diff --git a/scijava/scijava-ops-engine/templates/main/java/module-info.vm b/scijava/scijava-ops-engine/templates/main/java/module-info.vm
index 41576a452..859a61dde 100644
--- a/scijava/scijava-ops-engine/templates/main/java/module-info.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/module-info.vm
@@ -8,7 +8,7 @@ module org.scijava.ops.engine {
 ## Determines all packages in the module
 #set($packages = $modulePackages.call("src/main/java/org/scijava"))
 ## Defines the packages that should be exported to org.scijava
-#set($scijavaPackages = ["org.scijava.ops.engine", "org.scijava.ops.engine.impl", "org.scijava.ops.engine.matcher.impl"])
+#set($scijavaPackages = ["org.scijava.ops.engine", "org.scijava.ops.engine.impl", "org.scijava.ops.engine.matcher.impl", "org.scijava.ops.engine.conversionLoss.impl"])
 ## Defines the packages that should be exported to therapi.runtime.javadoc
 #set($therapiPackages = $modulePackages.call("src/main/java/org/scijava"))
 	//TODO: rearrange packages to export only needed classes

From ef98e35c705eb5826d3cb651ae3c96eaa8c9cf2c Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Wed, 28 Jul 2021 12:23:35 -0500
Subject: [PATCH 91/91] Create package-info for org.scijava.ops.engine

---
 .../imagej/ops2/morphology/DistanceTransforms.java   |  2 +-
 .../src/main/java/module-info.java                   |  4 ++--
 .../java/org/scijava/ops/engine/package-info.java    | 12 ++++++++++++
 .../ops/engine/{ => util}/ExceptionUtils.java        |  4 +++-
 .../templates/main/java/module-info.vm               |  4 ++--
 5 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/package-info.java
 rename scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/{ => util}/ExceptionUtils.java (86%)

diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java
index 72e7c06e5..495f50661 100644
--- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java
+++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java
@@ -10,7 +10,7 @@
 
 import org.scijava.function.Computers;
 import org.scijava.function.Inplaces;
-import org.scijava.ops.engine.ExceptionUtils;
+import org.scijava.ops.engine.util.ExceptionUtils;
 import org.scijava.ops.spi.OpCollection;
 import org.scijava.ops.spi.OpField;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops-engine/src/main/java/module-info.java b/scijava/scijava-ops-engine/src/main/java/module-info.java
index 20be1ce15..40e4e563e 100644
--- a/scijava/scijava-ops-engine/src/main/java/module-info.java
+++ b/scijava/scijava-ops-engine/src/main/java/module-info.java
@@ -5,8 +5,8 @@
  * corresponding template in templates/ and rerun bin/generate.groovy.
  */
 
-	//TODO: rearrange packages to export only needed classes
-	exports org.scijava.ops.engine; //contains OpService interface
+
+	exports org.scijava.ops.engine;
 	exports org.scijava.ops.engine.conversionLoss;
 	exports org.scijava.ops.engine.util;
 
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/package-info.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/package-info.java
new file mode 100644
index 000000000..73ae30d27
--- /dev/null
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/package-info.java
@@ -0,0 +1,12 @@
+/**
+ * This package is intended to contain general-purpose classes that <b>do
+ * not</b> belong within SciJava Ops API. Usually, this implies that it is an
+ * implementation detail.
+ * <p>
+ * This package is {@code export}ed; if a class is not intended to be used
+ * outside of SciJava Ops Engine, <b>do not</b> place it in this package.
+ * 
+ * @author Gabriel Selzer
+ */
+
+package org.scijava.ops.engine;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/ExceptionUtils.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/ExceptionUtils.java
similarity index 86%
rename from scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/ExceptionUtils.java
rename to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/ExceptionUtils.java
index 601b4c694..1ab4f1106 100644
--- a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/ExceptionUtils.java
+++ b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/ExceptionUtils.java
@@ -1,4 +1,6 @@
-package org.scijava.ops.engine;
+package org.scijava.ops.engine.util;
+
+import org.scijava.ops.engine.OpExecutionException;
 
 public class ExceptionUtils {
 	// For void methods
diff --git a/scijava/scijava-ops-engine/templates/main/java/module-info.vm b/scijava/scijava-ops-engine/templates/main/java/module-info.vm
index 859a61dde..089320bc7 100644
--- a/scijava/scijava-ops-engine/templates/main/java/module-info.vm
+++ b/scijava/scijava-ops-engine/templates/main/java/module-info.vm
@@ -11,8 +11,8 @@ module org.scijava.ops.engine {
 #set($scijavaPackages = ["org.scijava.ops.engine", "org.scijava.ops.engine.impl", "org.scijava.ops.engine.matcher.impl", "org.scijava.ops.engine.conversionLoss.impl"])
 ## Defines the packages that should be exported to therapi.runtime.javadoc
 #set($therapiPackages = $modulePackages.call("src/main/java/org/scijava"))
-	//TODO: rearrange packages to export only needed classes
-	exports org.scijava.ops.engine; //contains OpService interface
+
+	exports org.scijava.ops.engine;
 	exports org.scijava.ops.engine.conversionLoss;
 	exports org.scijava.ops.engine.util;