http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9265ddf6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 8070538..0248612 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -37,6 +37,7 @@ import 
org.apache.tinkerpop.gremlin.process.traversal.lambda.PredicateTraverser;
 import org.apache.tinkerpop.gremlin.process.traversal.lambda.TrueTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.step.ByModulating;
 import org.apache.tinkerpop.gremlin.process.traversal.step.Mutating;
+import org.apache.tinkerpop.gremlin.process.traversal.step.FromToModulating;
 import org.apache.tinkerpop.gremlin.process.traversal.step.TimesModulating;
 import 
org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent;
 import org.apache.tinkerpop.gremlin.process.traversal.step.branch.BranchStep;
@@ -192,8 +193,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      *
      * @param function the lambda expression that does the functional mapping
      * @return the traversal with an appended {@link LambdaMapStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#general-steps";
 target="_blank">Reference Documentation - General Steps</a>
+     * @since 3.0.0-incubating
      */
     public default <E2> GraphTraversal<S, E2> map(final Function<Traverser<E>, 
E2> function) {
         this.asAdmin().getBytecode().addStep(Symbols.map, function);
@@ -205,8 +206,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      *
      * @param mapTraversal the traversal expression that does the functional 
mapping
      * @return the traversal with an appended {@link LambdaMapStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#general-steps";
 target="_blank">Reference Documentation - General Steps</a>
+     * @since 3.0.0-incubating
      */
     public default <E2> GraphTraversal<S, E2> map(final Traversal<?, E2> 
mapTraversal) {
         this.asAdmin().getBytecode().addStep(Symbols.map, mapTraversal);
@@ -220,8 +221,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * @param function the lambda expression that does the functional mapping
      * @param <E2>     the type of the returned iterator objects
      * @return the traversal with an appended {@link LambdaFlatMapStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#general-steps";
 target="_blank">Reference Documentation - General Steps</a>
+     * @since 3.0.0-incubating
      */
     public default <E2> GraphTraversal<S, E2> flatMap(final 
Function<Traverser<E>, Iterator<E2>> function) {
         this.asAdmin().getBytecode().addStep(Symbols.flatMap, function);
@@ -235,8 +236,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * @param flatMapTraversal the traversal generating objects of type 
<code>E2</code>
      * @param <E2>             the end type of the internal traversal
      * @return the traversal with an appended {@link TraversalFlatMapStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#general-steps";
 target="_blank">Reference Documentation - General Steps</a>
+     * @since 3.0.0-incubating
      */
     public default <E2> GraphTraversal<S, E2> flatMap(final Traversal<?, E2> 
flatMapTraversal) {
         this.asAdmin().getBytecode().addStep(Symbols.flatMap, 
flatMapTraversal);
@@ -247,8 +248,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * Map the {@link Element} to its {@link Element#id}.
      *
      * @return the traversal with an appended {@link IdStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#id-step"; 
target="_blank">Reference Documentation - Id Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, Object> id() {
         this.asAdmin().getBytecode().addStep(Symbols.id);
@@ -259,8 +260,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * Map the {@link Element} to its {@link Element#label}.
      *
      * @return the traversal with an appended {@link LabelStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#label-step";
 target="_blank">Reference Documentation - Label Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, String> label() {
         this.asAdmin().getBytecode().addStep(Symbols.label);
@@ -282,8 +283,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * Map any object to a fixed <code>E</code> value.
      *
      * @return the traversal with an appended {@link ConstantStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#constant-step";
 target="_blank">Reference Documentation - Constant Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2> GraphTraversal<S, E2> constant(final E2 e) {
         this.asAdmin().getBytecode().addStep(Symbols.constant, e);
@@ -295,8 +296,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      *
      * @param vertexIdsOrElements vertices to inject into the traversal
      * @return the traversal with an appended {@link GraphStep}
-     * @since 3.1.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#graph-step";
 target="_blank">Reference Documentation - Graph Step</a>
+     * @since 3.1.0-incubating
      */
     public default GraphTraversal<S, Vertex> V(final Object... 
vertexIdsOrElements) {
         this.asAdmin().getBytecode().addStep(Symbols.V, vertexIdsOrElements);
@@ -309,8 +310,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * @param direction  the direction to traverse from the current vertex
      * @param edgeLabels the edge labels to traverse
      * @return the traversal with an appended {@link VertexStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps";
 target="_blank">Reference Documentation - Vertex Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, Vertex> to(final Direction direction, 
final String... edgeLabels) {
         this.asAdmin().getBytecode().addStep(Symbols.to, direction, 
edgeLabels);
@@ -322,8 +323,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      *
      * @param edgeLabels the edge labels to traverse
      * @return the traversal with an appended {@link VertexStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps";
 target="_blank">Reference Documentation - Vertex Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, Vertex> out(final String... edgeLabels) {
         this.asAdmin().getBytecode().addStep(Symbols.out, edgeLabels);
@@ -335,8 +336,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      *
      * @param edgeLabels the edge labels to traverse
      * @return the traversal with an appended {@link VertexStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps";
 target="_blank">Reference Documentation - Vertex Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, Vertex> in(final String... edgeLabels) {
         this.asAdmin().getBytecode().addStep(Symbols.in, edgeLabels);
@@ -348,8 +349,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      *
      * @param edgeLabels the edge labels to traverse
      * @return the traversal with an appended {@link VertexStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps";
 target="_blank">Reference Documentation - Vertex Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, Vertex> both(final String... edgeLabels) {
         this.asAdmin().getBytecode().addStep(Symbols.both, edgeLabels);
@@ -362,8 +363,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * @param direction  the direction to traverse from the current vertex
      * @param edgeLabels the edge labels to traverse
      * @return the traversal with an appended {@link VertexStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps";
 target="_blank">Reference Documentation - Vertex Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, Edge> toE(final Direction direction, 
final String... edgeLabels) {
         this.asAdmin().getBytecode().addStep(Symbols.toE, direction, 
edgeLabels);
@@ -375,8 +376,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      *
      * @param edgeLabels the edge labels to traverse
      * @return the traversal with an appended {@link VertexStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps";
 target="_blank">Reference Documentation - Vertex Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, Edge> outE(final String... edgeLabels) {
         this.asAdmin().getBytecode().addStep(Symbols.outE, edgeLabels);
@@ -388,8 +389,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      *
      * @param edgeLabels the edge labels to traverse
      * @return the traversal with an appended {@link VertexStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps";
 target="_blank">Reference Documentation - Vertex Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, Edge> inE(final String... edgeLabels) {
         this.asAdmin().getBytecode().addStep(Symbols.inE, edgeLabels);
@@ -401,8 +402,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      *
      * @param edgeLabels the edge labels to traverse
      * @return the traversal with an appended {@link VertexStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps";
 target="_blank">Reference Documentation - Vertex Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, Edge> bothE(final String... edgeLabels) {
         this.asAdmin().getBytecode().addStep(Symbols.bothE, edgeLabels);
@@ -414,8 +415,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      *
      * @param direction the direction to traverser from the current edge
      * @return the traversal with an appended {@link EdgeVertexStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps";
 target="_blank">Reference Documentation - Vertex Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, Vertex> toV(final Direction direction) {
         this.asAdmin().getBytecode().addStep(Symbols.toV, direction);
@@ -426,8 +427,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * Map the {@link Edge} to its incoming/head incident {@link Vertex}.
      *
      * @return the traversal with an appended {@link EdgeVertexStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps";
 target="_blank">Reference Documentation - Vertex Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, Vertex> inV() {
         this.asAdmin().getBytecode().addStep(Symbols.inV);
@@ -438,8 +439,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * Map the {@link Edge} to its outgoing/tail incident {@link Vertex}.
      *
      * @return the traversal with an appended {@link EdgeVertexStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps";
 target="_blank">Reference Documentation - Vertex Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, Vertex> outV() {
         this.asAdmin().getBytecode().addStep(Symbols.outV);
@@ -450,8 +451,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * Map the {@link Edge} to its incident vertices.
      *
      * @return the traversal with an appended {@link EdgeVertexStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps";
 target="_blank">Reference Documentation - Vertex Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, Vertex> bothV() {
         this.asAdmin().getBytecode().addStep(Symbols.bothV);
@@ -462,8 +463,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * Map the {@link Edge} to the incident vertex that was not just traversed 
from in the path history.
      *
      * @return the traversal with an appended {@link EdgeOtherVertexStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#vertex-steps";
 target="_blank">Reference Documentation - Vertex Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, Vertex> otherV() {
         this.asAdmin().getBytecode().addStep(Symbols.otherV);
@@ -474,8 +475,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * Order all the objects in the traversal up to this point and then emit 
them one-by-one in their ordered sequence.
      *
      * @return the traversal with an appended {@link OrderGlobalStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#order-step";
 target="_blank">Reference Documentation - Order Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> order() {
         this.asAdmin().getBytecode().addStep(Symbols.order);
@@ -487,8 +488,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      *
      * @param scope whether the ordering is the current local object or the 
entire global stream.
      * @return the traversal with an appended {@link OrderGlobalStep} or 
{@link OrderLocalStep} depending on the {@code scope}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#order-step";
 target="_blank">Reference Documentation - Order Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> order(final Scope scope) {
         this.asAdmin().getBytecode().addStep(Symbols.order, scope);
@@ -502,8 +503,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * @param propertyKeys the properties to retrieve
      * @param <E2>         the value type of the returned properties
      * @return the traversal with an appended {@link PropertiesStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#properties-step";
 target="_blank">Reference Documentation - Properties Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2> GraphTraversal<S, ? extends Property<E2>> 
properties(final String... propertyKeys) {
         this.asAdmin().getBytecode().addStep(Symbols.properties, propertyKeys);
@@ -517,8 +518,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * @param propertyKeys the properties to retrieve their value from
      * @param <E2>         the value type of the properties
      * @return the traversal with an appended {@link PropertiesStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#values-step";
 target="_blank">Reference Documentation - Values Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2> GraphTraversal<S, E2> values(final String... 
propertyKeys) {
         this.asAdmin().getBytecode().addStep(Symbols.values, propertyKeys);
@@ -532,8 +533,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * @param propertyKeys the properties to retrieve
      * @param <E2>         the value type of the returned properties
      * @return the traversal with an appended {@link PropertyMapStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#propertymap-step";
 target="_blank">Reference Documentation - PropertyMap Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2> GraphTraversal<S, Map<String, E2>> propertyMap(final 
String... propertyKeys) {
         this.asAdmin().getBytecode().addStep(Symbols.propertyMap, 
propertyKeys);
@@ -547,8 +548,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * @param propertyKeys the properties to retrieve
      * @param <E2>         the value type of the returned properties
      * @return the traversal with an appended {@link PropertyMapStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#valuemap-step";
 target="_blank">Reference Documentation - ValueMap Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2> GraphTraversal<S, Map<String, E2>> valueMap(final 
String... propertyKeys) {
         this.asAdmin().getBytecode().addStep(Symbols.valueMap, propertyKeys);
@@ -563,8 +564,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * @param propertyKeys  the properties to retrieve
      * @param <E2>          the value type of the returned properties
      * @return the traversal with an appended {@link PropertyMapStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#valuemap-step";
 target="_blank">Reference Documentation - ValueMap Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2> GraphTraversal<S, Map<String, E2>> valueMap(final 
boolean includeTokens, final String... propertyKeys) {
         this.asAdmin().getBytecode().addStep(Symbols.valueMap, includeTokens, 
propertyKeys);
@@ -593,8 +594,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * Map the {@link Property} to its {@link Property#key}.
      *
      * @return the traversal with an appended {@link PropertyKeyStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#key-step"; 
target="_blank">Reference Documentation - Key Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, String> key() {
         this.asAdmin().getBytecode().addStep(Symbols.key);
@@ -605,8 +606,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * Map the {@link Property} to its {@link Property#value}.
      *
      * @return the traversal with an appended {@link PropertyValueStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#value-step";
 target="_blank">Reference Documentation - Value Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2> GraphTraversal<S, E2> value() {
         this.asAdmin().getBytecode().addStep(Symbols.value);
@@ -617,8 +618,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * Map the {@link Traverser} to its {@link Path} history via {@link 
Traverser#path}.
      *
      * @return the traversal with an appended {@link PathStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#path-step"; 
target="_blank">Reference Documentation - Path Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, Path> path() {
         this.asAdmin().getBytecode().addStep(Symbols.path);
@@ -631,8 +632,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * @param matchTraversals the traversal that maintain variables which must 
hold for the life of the traverser
      * @param <E2>            the type of the obejcts bound in the variables
      * @return the traversal with an appended {@link MatchStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#match-step";
 target="_blank">Reference Documentation - Match Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2> GraphTraversal<S, Map<String, E2>> match(final 
Traversal<?, ?>... matchTraversals) {
         this.asAdmin().getBytecode().addStep(Symbols.match, matchTraversals);
@@ -644,8 +645,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      *
      * @param <E2> the sack value type
      * @return the traversal with an appended {@link SackStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#sack-step"; 
target="_blank">Reference Documentation - Sack Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2> GraphTraversal<S, E2> sack() {
         this.asAdmin().getBytecode().addStep(Symbols.sack);
@@ -657,8 +658,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * traverser.
      *
      * @return the traversal with an appended {@link LoopsStep}
-     * @since 3.1.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#loops-step";
 target="_blank">Reference Documentation - Loops Step</a>
+     * @since 3.1.0-incubating
      */
     public default GraphTraversal<S, Integer> loops() {
         this.asAdmin().getBytecode().addStep(Symbols.loops);
@@ -669,8 +670,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * Projects the current object in the stream into a {@code Map} that is 
keyed by the provided labels.
      *
      * @return the traversal with an appended {@link ProjectStep}
-     * @since 3.2.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#project-step";
 target="_blank">Reference Documentation - Project Step</a>
+     * @since 3.2.0-incubating
      */
     public default <E2> GraphTraversal<S, Map<String, E2>> project(final 
String projectKey, final String... otherProjectKeys) {
         final String[] projectKeys = new String[otherProjectKeys.length + 1];
@@ -689,8 +690,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * @param otherSelectKeys the third+ keys to project
      * @param <E2>            the type of the objects projected
      * @return the traversal with an appended {@link SelectStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#select-step";
 target="_blank">Reference Documentation - Select Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2> GraphTraversal<S, Map<String, E2>> select(final Pop 
pop, final String selectKey1, final String selectKey2, String... 
otherSelectKeys) {
         final String[] selectKeys = new String[otherSelectKeys.length + 2];
@@ -709,8 +710,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * @param otherSelectKeys the third+ keys to project
      * @param <E2>            the type of the objects projected
      * @return the traversal with an appended {@link SelectStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#select-step";
 target="_blank">Reference Documentation - Select Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2> GraphTraversal<S, Map<String, E2>> select(final String 
selectKey1, final String selectKey2, String... otherSelectKeys) {
         final String[] selectKeys = new String[otherSelectKeys.length + 2];
@@ -727,8 +728,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      *
      * @param selectKey the key to project
      * @return the traversal with an appended {@link SelectStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#select-step";
 target="_blank">Reference Documentation - Select Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2> GraphTraversal<S, E2> select(final Pop pop, final 
String selectKey) {
         this.asAdmin().getBytecode().addStep(Symbols.select, pop, selectKey);
@@ -742,8 +743,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      *
      * @param selectKey the key to project
      * @return the traversal with an appended {@link SelectStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#select-step";
 target="_blank">Reference Documentation - Select Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2> GraphTraversal<S, E2> select(final String selectKey) {
         this.asAdmin().getBytecode().addStep(Symbols.select, selectKey);
@@ -755,8 +756,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      *
      * @param column the column to extract
      * @return the traversal with an appended {@link TraversalMapStep}
-     * @since 3.1.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#select-step";
 target="_blank">Reference Documentation - Select Step</a>
+     * @since 3.1.0-incubating
      */
     public default <E2> GraphTraversal<S, Collection<E2>> select(final Column 
column) {
         this.asAdmin().getBytecode().addStep(Symbols.select, column);
@@ -768,8 +769,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * is not one of those types.
      *
      * @return the traversal with an appended {@link UnfoldStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#unfold-step";
 target="_blank">Reference Documentation - Unfold Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2> GraphTraversal<S, E2> unfold() {
         this.asAdmin().getBytecode().addStep(Symbols.unfold);
@@ -780,8 +781,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * Rolls up objects in the stream into an aggregate list.
      *
      * @return the traversal with an appended {@link FoldStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#fold-step"; 
target="_blank">Reference Documentation - Fold Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, List<E>> fold() {
         this.asAdmin().getBytecode().addStep(Symbols.fold);
@@ -791,12 +792,12 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
     /**
      * Rolls up objects in the stream into an aggregate value as defined by a 
{@code seed} and {@code BiFunction}.
      *
-     * @param seed the value to provide as the first argument to the {@code 
foldFunction}
+     * @param seed         the value to provide as the first argument to the 
{@code foldFunction}
      * @param foldFunction the function to fold by where the first argument is 
the {@code seed} or the value returned from subsequent calss and
      *                     the second argument is the value from the stream
      * @return the traversal with an appended {@link FoldStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#fold-step"; 
target="_blank">Reference Documentation - Fold Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2> GraphTraversal<S, E2> fold(final E2 seed, final 
BiFunction<E2, E, E2> foldFunction) {
         this.asAdmin().getBytecode().addStep(Symbols.fold, seed, foldFunction);
@@ -808,8 +809,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * of traversers up to this point).
      *
      * @return the traversal with an appended {@link CountGlobalStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#count-step";
 target="_blank">Reference Documentation - Count Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, Long> count() {
         this.asAdmin().getBytecode().addStep(Symbols.count);
@@ -821,8 +822,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * {@link Scope} (i.e. count the number of traversers up to this point).
      *
      * @return the traversal with an appended {@link CountGlobalStep} or 
{@link CountLocalStep} depending on the {@link Scope}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#count-step";
 target="_blank">Reference Documentation - Count Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, Long> count(final Scope scope) {
         this.asAdmin().getBytecode().addStep(Symbols.count, scope);
@@ -834,8 +835,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * {@link Traverser#bulk} (i.e. sum the traverser values up to this point).
      *
      * @return the traversal with an appended {@link SumGlobalStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#sum-step"; 
target="_blank">Reference Documentation - Sum Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2 extends Number> GraphTraversal<S, E2> sum() {
         this.asAdmin().getBytecode().addStep(Symbols.sum);
@@ -847,8 +848,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * {@link Traverser#bulk} given the specified {@link Scope} (i.e. sum the 
traverser values up to this point).
      *
      * @return the traversal with an appended {@link SumGlobalStep} or {@link 
SumLocalStep} depending on the {@link Scope}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#sum-step"; 
target="_blank">Reference Documentation - Sum Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2 extends Number> GraphTraversal<S, E2> sum(final Scope 
scope) {
         this.asAdmin().getBytecode().addStep(Symbols.sum, scope);
@@ -859,8 +860,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * Determines the largest value in the stream.
      *
      * @return the traversal with an appended {@link MaxGlobalStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#max-step"; 
target="_blank">Reference Documentation - Max Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2 extends Number> GraphTraversal<S, E2> max() {
         this.asAdmin().getBytecode().addStep(Symbols.max);
@@ -871,8 +872,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * Determines the largest value in the stream given the {@link Scope}.
      *
      * @return the traversal with an appended {@link MaxGlobalStep} or {@link 
MaxLocalStep} depending on the {@link Scope}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#max-step"; 
target="_blank">Reference Documentation - Max Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2 extends Number> GraphTraversal<S, E2> max(final Scope 
scope) {
         this.asAdmin().getBytecode().addStep(Symbols.max, scope);
@@ -883,8 +884,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * Determines the smallest value in the stream.
      *
      * @return the traversal with an appended {@link MinGlobalStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#min-step"; 
target="_blank">Reference Documentation - Min Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2 extends Number> GraphTraversal<S, E2> min() {
         this.asAdmin().getBytecode().addStep(Symbols.min);
@@ -895,8 +896,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * Determines the smallest value in the stream given the {@link Scope}.
      *
      * @return the traversal with an appended {@link MinGlobalStep} or {@link 
MinLocalStep} depending on the {@link Scope}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#min-step"; 
target="_blank">Reference Documentation - Min Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2 extends Number> GraphTraversal<S, E2> min(final Scope 
scope) {
         this.asAdmin().getBytecode().addStep(Symbols.min, scope);
@@ -907,8 +908,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * Determines the mean value in the stream.
      *
      * @return the traversal with an appended {@link MeanGlobalStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#mean-step"; 
target="_blank">Reference Documentation - Mean Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2 extends Number> GraphTraversal<S, E2> mean() {
         this.asAdmin().getBytecode().addStep(Symbols.mean);
@@ -919,8 +920,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * Determines the mean value in the stream given the {@link Scope}.
      *
      * @return the traversal with an appended {@link MeanGlobalStep} or {@link 
MeanLocalStep} depending on the {@link Scope}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#mean-step"; 
target="_blank">Reference Documentation - Mean Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2 extends Number> GraphTraversal<S, E2> mean(final Scope 
scope) {
         this.asAdmin().getBytecode().addStep(Symbols.mean, scope);
@@ -932,8 +933,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * {@link #by()} modulators which help specify how the grouping should 
occur.
      *
      * @return the traversal with an appended {@link GroupStep}.
-     * @since 3.1.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#group-step";
 target="_blank">Reference Documentation - Group Step</a>
+     * @since 3.1.0-incubating
      */
     public default <K, V> GraphTraversal<S, Map<K, V>> group() {
         this.asAdmin().getBytecode().addStep(Symbols.group);
@@ -941,8 +942,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
     }
 
     /**
-     * @deprecated As of release 3.1.0, replaced by {@link #group()}
      * @since 3.0.0-incubating
+     * @deprecated As of release 3.1.0, replaced by {@link #group()}
      */
     @Deprecated
     public default <K, V> GraphTraversal<S, Map<K, V>> groupV3d0() {
@@ -955,8 +956,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * object is the key and the value is the count.
      *
      * @return the traversal with an appended {@link GroupCountStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#groupcount-step";
 target="_blank">Reference Documentation - GroupCount Step</a>
+     * @since 3.0.0-incubating
      */
     public default <K> GraphTraversal<S, Map<K, Long>> groupCount() {
         this.asAdmin().getBytecode().addStep(Symbols.groupCount);
@@ -967,8 +968,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * Aggregates the emanating paths into a {@link Tree} data structure.
      *
      * @return the traversal with an appended {@link TreeStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#tree-step"; 
target="_blank">Reference Documentation - Tree Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, Tree> tree() {
         this.asAdmin().getBytecode().addStep(Symbols.tree);
@@ -980,8 +981,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      *
      * @param vertexLabel the label of the {@link Vertex} to add
      * @return the traversal with the {@link AddVertexStep} added
-     * @since 3.1.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#addvertex-step";
 target="_blank">Reference Documentation - AddVertex Step</a>
+     * @since 3.1.0-incubating
      */
     public default GraphTraversal<S, Vertex> addV(final String vertexLabel) {
         this.asAdmin().getBytecode().addStep(Symbols.addV, vertexLabel);
@@ -992,8 +993,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, 
E> {
      * Adds a {@link Vertex} with a default vertex label.
      *
      * @return the traversal with the {@link AddVertexStep} added
-     * @since 3.1.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#addvertex-step";
 target="_blank">Reference Documentation - AddVertex Step</a>
+     * @since 3.1.0-incubating
      */
     public default GraphTraversal<S, Vertex> addV() {
         this.asAdmin().getBytecode().addStep(Symbols.addV);
@@ -1019,8 +1020,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param edgeLabel the label of the newly added edge
      * @return the traversal with the {@link AddEdgeStep} added
-     * @since 3.1.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#addedge-step";
 target="_blank">Reference Documentation - AddEdge Step</a>
+     * @since 3.1.0-incubating
      */
     public default GraphTraversal<S, Edge> addE(final String edgeLabel) {
         this.asAdmin().getBytecode().addStep(Symbols.addE, edgeLabel);
@@ -1033,12 +1034,12 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param toStepLabel the step label of the incoming vertex
      * @return the traversal with the modified {@link AddEdgeStep}
-     * @since 3.1.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#addedge-step";
 target="_blank">Reference Documentation - AddEdge Step</a>
+     * @since 3.1.0-incubating
      */
     public default GraphTraversal<S, E> to(final String toStepLabel) {
         this.asAdmin().getBytecode().addStep(Symbols.to, toStepLabel);
-        ((AddEdgeStep) 
this.asAdmin().getEndStep()).addTo(__.select(toStepLabel));
+        ((FromToModulating) this.asAdmin().getEndStep()).addTo(toStepLabel);
         return this;
     }
 
@@ -1048,12 +1049,12 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param fromStepLabel the step label of the outgoing vertex
      * @return the traversal with the modified {@link AddEdgeStep}
-     * @since 3.1.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#addedge-step";
 target="_blank">Reference Documentation - AddEdge Step</a>
+     * @since 3.1.0-incubating
      */
     public default GraphTraversal<S, E> from(final String fromStepLabel) {
         this.asAdmin().getBytecode().addStep(Symbols.from, fromStepLabel);
-        ((AddEdgeStep) 
this.asAdmin().getEndStep()).addFrom(__.select(fromStepLabel));
+        ((FromToModulating) 
this.asAdmin().getEndStep()).addFrom(fromStepLabel);
         return this;
     }
 
@@ -1063,12 +1064,12 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param toVertex the traversal for selecting the incoming vertex
      * @return the traversal with the modified {@link AddEdgeStep}
-     * @since 3.1.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#addedge-step";
 target="_blank">Reference Documentation - AddEdge Step</a>
+     * @since 3.1.0-incubating
      */
     public default GraphTraversal<S, E> to(final Traversal<E, Vertex> 
toVertex) {
         this.asAdmin().getBytecode().addStep(Symbols.to, toVertex);
-        ((AddEdgeStep) this.asAdmin().getEndStep()).addTo(toVertex);
+        ((FromToModulating) 
this.asAdmin().getEndStep()).addTo(toVertex.asAdmin());
         return this;
     }
 
@@ -1078,12 +1079,12 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param fromVertex the traversal for selecting the outgoing vertex
      * @return the traversal with the modified {@link AddEdgeStep}
-     * @since 3.1.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#addedge-step";
 target="_blank">Reference Documentation - AddEdge Step</a>
+     * @since 3.1.0-incubating
      */
     public default GraphTraversal<S, E> from(final Traversal<E, Vertex> 
fromVertex) {
         this.asAdmin().getBytecode().addStep(Symbols.from, fromVertex);
-        ((AddEdgeStep) this.asAdmin().getEndStep()).addFrom(fromVertex);
+        ((FromToModulating) 
this.asAdmin().getEndStep()).addFrom(fromVertex.asAdmin());
         return this;
     }
 
@@ -1148,8 +1149,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param predicate the filter function to apply
      * @return the traversal with the {@link LambdaFilterStep} added
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#general-steps";
 target="_blank">Reference Documentation - General Steps</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> filter(final Predicate<Traverser<E>> 
predicate) {
         this.asAdmin().getBytecode().addStep(Symbols.filter, predicate);
@@ -1162,8 +1163,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param filterTraversal the filter traversal to apply
      * @return the traversal with the {@link TraversalFilterStep} added
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#general-steps";
 target="_blank">Reference Documentation - General Steps</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> filter(final Traversal<?, ?> 
filterTraversal) {
         this.asAdmin().getBytecode().addStep(Symbols.filter, filterTraversal);
@@ -1175,8 +1176,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param orTraversals filter traversals where at least one must be 
satisfied
      * @return the traversal with an appended {@link OrStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#or-step"; 
target="_blank">Reference Documentation - Or Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> or(final Traversal<?, ?>... 
orTraversals) {
         this.asAdmin().getBytecode().addStep(Symbols.or, orTraversals);
@@ -1188,8 +1189,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param andTraversals filter traversals that must be satisfied
      * @return the traversal with an appended {@link AndStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#and-step"; 
target="_blank">Reference Documentation - And Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> and(final Traversal<?, ?>... 
andTraversals) {
         this.asAdmin().getBytecode().addStep(Symbols.and, andTraversals);
@@ -1201,9 +1202,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param injections the objects to add to the stream
      * @return the traversal with an appended {@link InjectStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#inject-step";
 target="_blank">Reference Documentation - Inject Step</a>
-     *
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> inject(final E... injections) {
         this.asAdmin().getBytecode().addStep(Symbols.inject, injections);
@@ -1216,8 +1216,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      * @param scope       whether the deduplication is on the stream (global) 
or the current object (local).
      * @param dedupLabels if labels are provided, then the scope labels 
determine de-duplication. No labels implies current object.
      * @return the traversal with an appended {@link DedupGlobalStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#dedup-step";
 target="_blank">Reference Documentation - Dedup Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> dedup(final Scope scope, final 
String... dedupLabels) {
         this.asAdmin().getBytecode().addStep(Symbols.dedup, scope, 
dedupLabels);
@@ -1229,8 +1229,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param dedupLabels if labels are provided, then the scoped object's 
labels determine de-duplication. No labels implies current object.
      * @return the traversal with an appended {@link DedupGlobalStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#dedup-step";
 target="_blank">Reference Documentation - Dedup Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> dedup(final String... dedupLabels) {
         this.asAdmin().getBytecode().addStep(Symbols.dedup, dedupLabels);
@@ -1240,13 +1240,13 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
     /**
      * Filters the current object based on the object itself or the path 
history.
      *
-     * @param startKey the key containing the object to filter
+     * @param startKey  the key containing the object to filter
      * @param predicate the filter to apply
      * @return the traversal with an appended {@link WherePredicateStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#where-step";
 target="_blank">Reference Documentation - Where Step</a>
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#using-where-with-match";
 target="_blank">Reference Documentation - Where with Match</a>
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#using-where-with-select";
 target="_blank">Reference Documentation - Where with Select</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> where(final String startKey, final 
P<String> predicate) {
         this.asAdmin().getBytecode().addStep(Symbols.where, startKey, 
predicate);
@@ -1258,10 +1258,10 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param predicate the filter to apply
      * @return the traversal with an appended {@link WherePredicateStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#where-step";
 target="_blank">Reference Documentation - Where Step</a>
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#using-where-with-match";
 target="_blank">Reference Documentation - Where with Match</a>
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#using-where-with-select";
 target="_blank">Reference Documentation - Where with Select</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> where(final P<String> predicate) {
         this.asAdmin().getBytecode().addStep(Symbols.where, predicate);
@@ -1273,10 +1273,10 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param whereTraversal the filter to apply
      * @return the traversal with an appended {@link WherePredicateStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#where-step";
 target="_blank">Reference Documentation - Where Step</a>
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#using-where-with-match";
 target="_blank">Reference Documentation - Where with Match</a>
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#using-where-with-select";
 target="_blank">Reference Documentation - Where with Select</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> where(final Traversal<?, ?> 
whereTraversal) {
         this.asAdmin().getBytecode().addStep(Symbols.where, whereTraversal);
@@ -1289,10 +1289,10 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      * Filters vertices, edges and vertex properties based on their properties.
      *
      * @param propertyKey the key of the property to filter on
-     * @param predicate the filter to apply to the key's value
+     * @param predicate   the filter to apply to the key's value
      * @return the traversal with an appended {@link HasStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#has-step"; 
target="_blank">Reference Documentation - Has Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> has(final String propertyKey, final 
P<?> predicate) {
         this.asAdmin().getBytecode().addStep(Symbols.has, propertyKey, 
predicate);
@@ -1302,11 +1302,11 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
     /**
      * Filters vertices, edges and vertex properties based on their properties.
      *
-     * @param accessor the {@link T} accessor of the property to filter on
+     * @param accessor  the {@link T} accessor of the property to filter on
      * @param predicate the filter to apply to the key's value
      * @return the traversal with an appended {@link HasStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#has-step"; 
target="_blank">Reference Documentation - Has Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> has(final T accessor, final P<?> 
predicate) {
         this.asAdmin().getBytecode().addStep(Symbols.has, accessor, predicate);
@@ -1317,10 +1317,10 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      * Filters vertices, edges and vertex properties based on their properties.
      *
      * @param propertyKey the key of the property to filter on
-     * @param value the value to compare the property value to for equality
+     * @param value       the value to compare the property value to for 
equality
      * @return the traversal with an appended {@link HasStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#has-step"; 
target="_blank">Reference Documentation - Has Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> has(final String propertyKey, final 
Object value) {
         if (value instanceof P)
@@ -1337,10 +1337,10 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      * Filters vertices, edges and vertex properties based on their properties.
      *
      * @param accessor the {@link T} accessor of the property to filter on
-     * @param value the value to compare the accessor value to for equality
+     * @param value    the value to compare the accessor value to for equality
      * @return the traversal with an appended {@link HasStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#has-step"; 
target="_blank">Reference Documentation - Has Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> has(final T accessor, final Object 
value) {
         if (value instanceof P)
@@ -1356,12 +1356,12 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
     /**
      * Filters vertices, edges and vertex properties based on their properties.
      *
-     * @param label the label of the {@link Element}
+     * @param label       the label of the {@link Element}
      * @param propertyKey the key of the property to filter on
-     * @param predicate the filter to apply to the key's value
+     * @param predicate   the filter to apply to the key's value
      * @return the traversal with an appended {@link HasStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#has-step"; 
target="_blank">Reference Documentation - Has Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> has(final String label, final String 
propertyKey, final P<?> predicate) {
         this.asAdmin().getBytecode().addStep(Symbols.has, label, propertyKey, 
predicate);
@@ -1372,12 +1372,12 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
     /**
      * Filters vertices, edges and vertex properties based on their properties.
      *
-     * @param label the label of the {@link Element}
+     * @param label       the label of the {@link Element}
      * @param propertyKey the key of the property to filter on
-     * @param value the value to compare the accessor value to for equality
+     * @param value       the value to compare the accessor value to for 
equality
      * @return the traversal with an appended {@link HasStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#has-step"; 
target="_blank">Reference Documentation - Has Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> has(final String label, final String 
propertyKey, final Object value) {
         this.asAdmin().getBytecode().addStep(Symbols.has, label, propertyKey, 
value);
@@ -1388,11 +1388,11 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
     /**
      * Filters vertices, edges and vertex properties based on their properties.
      *
-     * @param accessor the {@link T} accessor of the property to filter on
+     * @param accessor          the {@link T} accessor of the property to 
filter on
      * @param propertyTraversal the traversal to filter the accessor value by
      * @return the traversal with an appended {@link HasStep}
-     * @since 3.1.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#has-step"; 
target="_blank">Reference Documentation - Has Step</a>
+     * @since 3.1.0-incubating
      */
     public default GraphTraversal<S, E> has(final T accessor, final 
Traversal<?, ?> propertyTraversal) {
         this.asAdmin().getBytecode().addStep(Symbols.has, accessor, 
propertyTraversal);
@@ -1404,11 +1404,11 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
     /**
      * Filters vertices, edges and vertex properties based on their properties.
      *
-     * @param propertyKey the key of the property to filter on
+     * @param propertyKey       the key of the property to filter on
      * @param propertyTraversal the traversal to filter the property value by
      * @return the traversal with an appended {@link HasStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#has-step"; 
target="_blank">Reference Documentation - Has Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> has(final String propertyKey, final 
Traversal<?, ?> propertyTraversal) {
         this.asAdmin().getBytecode().addStep(Symbols.has, propertyKey, 
propertyTraversal);
@@ -1422,8 +1422,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param propertyKey the key of the property to filter on for existence
      * @return the traversal with an appended {@link HasStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#has-step"; 
target="_blank">Reference Documentation - Has Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> has(final String propertyKey) {
         this.asAdmin().getBytecode().addStep(Symbols.has, propertyKey);
@@ -1435,8 +1435,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param propertyKey the key of the property to filter on for existence
      * @return the traversal with an appended {@link HasStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#has-step"; 
target="_blank">Reference Documentation - Has Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> hasNot(final String propertyKey) {
         this.asAdmin().getBytecode().addStep(Symbols.hasNot, propertyKey);
@@ -1446,11 +1446,11 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
     /**
      * Filters vertices, edges and vertex properties based on their label.
      *
-     * @param label the label of the {@link Element}
+     * @param label       the label of the {@link Element}
      * @param otherLabels additional labels of the {@link Element}
      * @return the traversal with an appended {@link HasStep}
-     * @since 3.2.2
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#has-step"; 
target="_blank">Reference Documentation - Has Step</a>
+     * @since 3.2.2
      */
     public default GraphTraversal<S, E> hasLabel(final String label, final 
String... otherLabels) {
         final String[] labels = new String[otherLabels.length + 1];
@@ -1465,8 +1465,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param predicate the filter to apply to the label of the {@link Element}
      * @return the traversal with an appended {@link HasStep}
-     * @since 3.2.4
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#has-step"; 
target="_blank">Reference Documentation - Has Step</a>
+     * @since 3.2.4
      */
     public default GraphTraversal<S, E> hasLabel(final P<String> predicate) {
         this.asAdmin().getBytecode().addStep(Symbols.hasLabel, predicate);
@@ -1476,11 +1476,11 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
     /**
      * Filters vertices, edges and vertex properties based on their identifier.
      *
-     * @param id the identifier of the {@link Element}
+     * @param id       the identifier of the {@link Element}
      * @param otherIds additional identifiers of the {@link Element}
      * @return the traversal with an appended {@link HasStep}
-     * @since 3.2.2
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#has-step"; 
target="_blank">Reference Documentation - Has Step</a>
+     * @since 3.2.2
      */
     public default GraphTraversal<S, E> hasId(final Object id, final Object... 
otherIds) {
         if (id instanceof P)
@@ -1511,8 +1511,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param predicate the filter to apply to the identifier of the {@link 
Element}
      * @return the traversal with an appended {@link HasStep}
-     * @since 3.2.4
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#has-step"; 
target="_blank">Reference Documentation - Has Step</a>
+     * @since 3.2.4
      */
     public default GraphTraversal<S, E> hasId(final P<Object> predicate) {
         this.asAdmin().getBytecode().addStep(Symbols.hasId, predicate);
@@ -1522,11 +1522,11 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
     /**
      * Filters vertices, edges and vertex properties based on their key.
      *
-     * @param label the key of the {@link Element}
+     * @param label       the key of the {@link Element}
      * @param otherLabels additional key of the {@link Element}
      * @return the traversal with an appended {@link HasStep}
-     * @since 3.2.2
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#has-step"; 
target="_blank">Reference Documentation - Has Step</a>
+     * @since 3.2.2
      */
     public default GraphTraversal<S, E> hasKey(final String label, final 
String... otherLabels) {
         final String[] labels = new String[otherLabels.length + 1];
@@ -1541,8 +1541,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param predicate the filter to apply to the key of the {@link Element}
      * @return the traversal with an appended {@link HasStep}
-     * @since 3.2.4
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#has-step"; 
target="_blank">Reference Documentation - Has Step</a>
+     * @since 3.2.4
      */
     public default GraphTraversal<S, E> hasKey(final P<String> predicate) {
         this.asAdmin().getBytecode().addStep(Symbols.hasKey, predicate);
@@ -1552,7 +1552,7 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
     /**
      * Filters vertices, edges and vertex properties based on their value.
      *
-     * @param value the value of the {@link Element}
+     * @param value       the value of the {@link Element}
      * @param otherValues additional values of the {@link Element}
      * @return the traversal with an appended {@link HasStep}
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#has-step"; 
target="_blank">Reference Documentation - Has Step</a>
@@ -1586,8 +1586,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param predicate the filter to apply to the value of the {@link Element}
      * @return the traversal with an appended {@link HasStep}
-     * @since 3.2.4
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#has-step"; 
target="_blank">Reference Documentation - Has Step</a>
+     * @since 3.2.4
      */
     public default GraphTraversal<S, E> hasValue(final P<Object> predicate) {
         this.asAdmin().getBytecode().addStep(Symbols.hasValue, predicate);
@@ -1599,8 +1599,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param predicate the filter to apply
      * @return the traversal with an appended {@link IsStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#is-step"; 
target="_blank">Reference Documentation - Is Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> is(final P<E> predicate) {
         this.asAdmin().getBytecode().addStep(Symbols.is, predicate);
@@ -1612,8 +1612,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param value the value that the object must equal.
      * @return the traversal with an appended {@link IsStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#is-step"; 
target="_blank">Reference Documentation - Is Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> is(final Object value) {
         this.asAdmin().getBytecode().addStep(Symbols.is, value);
@@ -1625,8 +1625,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param notTraversal the traversal to filter by.
      * @return the traversal with an appended {@link NotStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#not-step"; 
target="_blank">Reference Documentation - Not Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> not(final Traversal<?, ?> 
notTraversal) {
         this.asAdmin().getBytecode().addStep(Symbols.not, notTraversal);
@@ -1638,8 +1638,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param probability the probability that the object will pass through
      * @return the traversal with an appended {@link CoinStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#coin-step"; 
target="_blank">Reference Documentation - Coin Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> coin(final double probability) {
         this.asAdmin().getBytecode().addStep(Symbols.coin, probability);
@@ -1650,11 +1650,11 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      * Filter the objects in the traversal by the number of them to pass 
through the stream. Those before the value
      * of {@code low} do not pass through and those that exceed the value of 
{@code high} will end the iteration.
      *
-     * @param low the number at which to start allowing objects through the 
stream
+     * @param low  the number at which to start allowing objects through the 
stream
      * @param high the number at which to end the stream
      * @return the traversal with an appended {@link RangeGlobalStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#range-step";
 target="_blank">Reference Documentation - Range Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> range(final long low, final long high) 
{
         this.asAdmin().getBytecode().addStep(Symbols.range, low, high);
@@ -1667,11 +1667,11 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      * {@code high} will end the iteration.
      *
      * @param scope the scope of how to apply the {@code range}
-     * @param low the number at which to start allowing objects through the 
stream
-     * @param high the number at which to end the stream
+     * @param low   the number at which to start allowing objects through the 
stream
+     * @param high  the number at which to end the stream
      * @return the traversal with an appended {@link RangeGlobalStep} or 
{@link RangeLocalStep} depending on {@code scope}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#range-step";
 target="_blank">Reference Documentation - Range Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2> GraphTraversal<S, E2> range(final Scope scope, final 
long low, final long high) {
         this.asAdmin().getBytecode().addStep(Symbols.range, scope, low, high);
@@ -1686,8 +1686,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param limit the number at which to end the stream
      * @return the traversal with an appended {@link RangeGlobalStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#limit-step";
 target="_blank">Reference Documentation - Limit Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> limit(final long limit) {
         this.asAdmin().getBytecode().addStep(Symbols.limit, limit);
@@ -1701,8 +1701,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      * @param scope the scope of how to apply the {@code limit}
      * @param limit the number at which to end the stream
      * @return the traversal with an appended {@link RangeGlobalStep} or 
{@link RangeLocalStep} depending on {@code scope}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#limit-step";
 target="_blank">Reference Documentation - Limit Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2> GraphTraversal<S, E2> limit(final Scope scope, final 
long limit) {
         this.asAdmin().getBytecode().addStep(Symbols.limit, scope, limit);
@@ -1716,8 +1716,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      * object will be returned.
      *
      * @return the traversal with an appended {@link TailGlobalStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#tail-step"; 
target="_blank">Reference Documentation - Tail Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> tail() {
         this.asAdmin().getBytecode().addStep(Symbols.tail);
@@ -1730,8 +1730,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param limit the number at which to end the stream
      * @return the traversal with an appended {@link TailGlobalStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#tail-step"; 
target="_blank">Reference Documentation - Tail Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> tail(final long limit) {
         this.asAdmin().getBytecode().addStep(Symbols.tail, limit);
@@ -1744,8 +1744,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param scope the scope of how to apply the {@code tail}
      * @return the traversal with an appended {@link TailGlobalStep} or {@link 
TailLocalStep} depending on {@code scope}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#tail-step"; 
target="_blank">Reference Documentation - Tail Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2> GraphTraversal<S, E2> tail(final Scope scope) {
         this.asAdmin().getBytecode().addStep(Symbols.tail, scope);
@@ -1761,8 +1761,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      * @param scope the scope of how to apply the {@code tail}
      * @param limit the number at which to end the stream
      * @return the traversal with an appended {@link TailGlobalStep} or {@link 
TailLocalStep} depending on {@code scope}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#tail-step"; 
target="_blank">Reference Documentation - Tail Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2> GraphTraversal<S, E2> tail(final Scope scope, final 
long limit) {
         this.asAdmin().getBytecode().addStep(Symbols.tail, scope, limit);
@@ -1776,8 +1776,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param timeLimit the count down time
      * @return the traversal with an appended {@link TimeLimitStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#timelimit-step";
 target="_blank">Reference Documentation - TimeLimit Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> timeLimit(final long timeLimit) {
         this.asAdmin().getBytecode().addStep(Symbols.timeLimit, timeLimit);
@@ -1788,8 +1788,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      * Filter the <code>E</code> object if its {@link Traverser#path} is not 
{@link Path#isSimple}.
      *
      * @return the traversal with an appended {@link SimplePathStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#simplepath-step";
 target="_blank">Reference Documentation - SimplePath Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> simplePath() {
         this.asAdmin().getBytecode().addStep(Symbols.simplePath);
@@ -1800,8 +1800,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      * Filter the <code>E</code> object if its {@link Traverser#path} is 
{@link Path#isSimple}.
      *
      * @return the traversal with an appended {@link CyclicPathStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#cyclicpath-step";
 target="_blank">Reference Documentation - CyclicPath Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> cyclicPath() {
         this.asAdmin().getBytecode().addStep(Symbols.cyclicPath);
@@ -1813,8 +1813,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param amountToSample the number of objects to allow
      * @return the traversal with an appended {@link SampleGlobalStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#sample-step";
 target="_blank">Reference Documentation - Sample Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> sample(final int amountToSample) {
         this.asAdmin().getBytecode().addStep(Symbols.sample, amountToSample);
@@ -1824,11 +1824,11 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
     /**
      * Allow some specified number of objects to pass through the stream.
      *
-     * @param scope the scope of how to apply the {@code sample}
+     * @param scope          the scope of how to apply the {@code sample}
      * @param amountToSample the number of objects to allow
      * @return the traversal with an appended {@link SampleGlobalStep} or 
{@link SampleLocalStep} depending on the {@code scope}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#sample-step";
 target="_blank">Reference Documentation - Sample Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> sample(final Scope scope, final int 
amountToSample) {
         this.asAdmin().getBytecode().addStep(Symbols.sample, scope, 
amountToSample);
@@ -1843,8 +1843,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      * to actually take place. In most cases, iteration is best accomplished 
with {@code g.V().drop().iterate()}.
      *
      * @return the traversal with the {@link DropStep} added
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#drop-step"; 
target="_blank">Reference Documentation - Drop Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> drop() {
         this.asAdmin().getBytecode().addStep(Symbols.drop);
@@ -1858,8 +1858,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param consumer the operation to perform at this step in relation to 
the {@link Traverser}
      * @return the traversal with an appended {@link LambdaSideEffectStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#general-steps";
 target="_blank">Reference Documentation - General Steps</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> sideEffect(final 
Consumer<Traverser<E>> consumer) {
         this.asAdmin().getBytecode().addStep(Symbols.sideEffect, consumer);
@@ -1871,8 +1871,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param sideEffectTraversal the operation to perform at this step in 
relation to the {@link Traverser}
      * @return the traversal with an appended {@link TraversalSideEffectStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#general-steps";
 target="_blank">Reference Documentation - General Steps</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> sideEffect(final Traversal<?, ?> 
sideEffectTraversal) {
         this.asAdmin().getBytecode().addStep(Symbols.sideEffect, 
sideEffectTraversal);
@@ -1883,11 +1883,11 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      * Iterates the traversal up to the itself and emits the side-effect 
referenced by the key. If multiple keys are
      * supplied then the side-effects are emitted as a {@code Map}.
      *
-     * @param sideEffectKey the side-effect to emit
+     * @param sideEffectKey  the side-effect to emit
      * @param sideEffectKeys other side-effects to emit
      * @return the traversal with an appended {@link SideEffectCapStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#cap-step"; 
target="_blank">Reference Documentation - Cap Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2> GraphTraversal<S, E2> cap(final String sideEffectKey, 
final String... sideEffectKeys) {
         this.asAdmin().getBytecode().addStep(Symbols.cap, sideEffectKey, 
sideEffectKeys);
@@ -1900,8 +1900,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param sideEffectKey the name of the side-effect key that will hold the 
subgraph
      * @return the traversal with an appended {@link SubgraphStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#subgraph-step";
 target="_blank">Reference Documentation - Subgraph Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, Edge> subgraph(final String 
sideEffectKey) {
         this.asAdmin().getBytecode().addStep(Symbols.subgraph, sideEffectKey);
@@ -1913,8 +1913,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param sideEffectKey the name of the side-effect key that will hold the 
aggregated objects
      * @return the traversal with an appended {@link AggregateStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#aggregate-step";
 target="_blank">Reference Documentation - Aggregate Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> aggregate(final String sideEffectKey) {
         this.asAdmin().getBytecode().addStep(Symbols.aggregate, sideEffectKey);
@@ -1927,8 +1927,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param sideEffectKey the name of the side-effect key that will hold the 
aggregated grouping
      * @return the traversal with an appended {@link GroupStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#group-step";
 target="_blank">Reference Documentation - Group Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> group(final String sideEffectKey) {
         this.asAdmin().getBytecode().addStep(Symbols.group, sideEffectKey);
@@ -1950,8 +1950,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param sideEffectKey the name of the side-effect key that will hold the 
aggregated grouping
      * @return the traversal with an appended {@link GroupCountStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#groupcount-step";
 target="_blank">Reference Documentation - GroupCount Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> groupCount(final String sideEffectKey) 
{
         this.asAdmin().getBytecode().addStep(Symbols.groupCount, 
sideEffectKey);
@@ -1963,8 +1963,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param sideEffectKey the name of the side-effect key that will hold the 
tree
      * @return the traversal with an appended {@link TreeStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#tree-step"; 
target="_blank">Reference Documentation - Tree Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> tree(final String sideEffectKey) {
         this.asAdmin().getBytecode().addStep(Symbols.tree, sideEffectKey);
@@ -1976,8 +1976,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param sackOperator the operator to apply to the sack value
      * @return the traversal with an appended {@link SackStep}.
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#sack-step"; 
target="_blank">Reference Documentation - Sack Step</a>
+     * @since 3.0.0-incubating
      */
     public default <V, U> GraphTraversal<S, E> sack(final BiFunction<V, U, V> 
sackOperator) {
         this.asAdmin().getBytecode().addStep(Symbols.sack, sackOperator);
@@ -1998,8 +1998,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param sideEffectKey the name of the side-effect key that will hold the 
aggregate
      * @return the traversal with an appended {@link StoreStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#store-step";
 target="_blank">Reference Documentation - Store Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> store(final String sideEffectKey) {
         this.asAdmin().getBytecode().addStep(Symbols.store, sideEffectKey);
@@ -2012,8 +2012,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param sideEffectKey the name of the side-effect key within which to 
hold the profile object
      * @return the traversal with an appended {@link ProfileSideEffectStep}
-     * @since 3.2.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#profile-step";
 target="_blank">Reference Documentation - Profile Step</a>
+     * @since 3.2.0-incubating
      */
     public default GraphTraversal<S, E> profile(final String sideEffectKey) {
         this.asAdmin().getBytecode().addStep(Traversal.Symbols.profile, 
sideEffectKey);
@@ -2025,8 +2025,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      * counts, etc.
      *
      * @return the traversal with an appended {@link ProfileSideEffectStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#profile-step";
 target="_blank">Reference Documentation - Profile Step</a>
+     * @since 3.0.0-incubating
      */
     @Override
     public default GraphTraversal<S, TraversalMetrics> profile() {
@@ -2050,8 +2050,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      * @param value       the value for the property
      * @param keyValues   any meta properties to be assigned to this property
      * @return the traversal with the last step modified to add a property
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#addproperty-step";
 target="_blank">AddProperty Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> property(final 
VertexProperty.Cardinality cardinality, final Object key, final Object value, 
final Object... keyValues) {
         if (null == cardinality)
@@ -2084,8 +2084,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      * @param value     the value for the property
      * @param keyValues any meta properties to be assigned to this property
      * @return the traversal with the last step modified to add a property
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#addproperty-step";
 target="_blank">AddProperty Step</a>
+     * @since 3.0.0-incubating
      */
     public default GraphTraversal<S, E> property(final Object key, final 
Object value, final Object... keyValues) {
         return key instanceof VertexProperty.Cardinality ?
@@ -2103,8 +2103,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param branchTraversal the traversal to branch the {@link Traverser} to
      * @return the {@link Traversal} with the {@link BranchStep} added
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#general-steps";
 target="_blank">Reference Documentation - General Steps</a>
+     * @since 3.0.0-incubating
      */
     public default <M, E2> GraphTraversal<S, E2> branch(final Traversal<?, M> 
branchTraversal) {
         this.asAdmin().getBytecode().addStep(Symbols.branch, branchTraversal);
@@ -2118,8 +2118,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param function the traversal to branch the {@link Traverser} to
      * @return the {@link Traversal} with the {@link BranchStep} added
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#general-steps";
 target="_blank">Reference Documentation - General Steps</a>
+     * @since 3.0.0-incubating
      */
     public default <M, E2> GraphTraversal<S, E2> branch(final 
Function<Traverser<E>, M> function) {
         this.asAdmin().getBytecode().addStep(Symbols.branch, function);
@@ -2135,8 +2135,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param choiceTraversal the traversal used to determine the value for 
the branch
      * @return the traversal with the appended {@link ChooseStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#choose-step";
 target="_blank">Reference Documentation - Choose Step</a>
+     * @since 3.0.0-incubating
      */
     public default <M, E2> GraphTraversal<S, E2> choose(final Traversal<?, M> 
choiceTraversal) {
         this.asAdmin().getBytecode().addStep(Symbols.choose, choiceTraversal);
@@ -2148,11 +2148,11 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      * like semantics within a traversal.
      *
      * @param traversalPredicate the traversal used to determine the "if" 
portion of the if-then-else
-     * @param trueChoice the traversal to execute in the event the {@code 
traversalPredicate} returns true
-     * @param falseChoice the traversal to execute in the event the {@code 
traversalPredicate} returns false
+     * @param trueChoice         the traversal to execute in the event the 
{@code traversalPredicate} returns true
+     * @param falseChoice        the traversal to execute in the event the 
{@code traversalPredicate} returns false
      * @return the traversal with the appended {@link ChooseStep}
-     * @since 3.0.0-incubating
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#choose-step";
 target="_blank">Reference Documentation - Choose Step</a>
+     * @since 3.0.0-incubating
      */
     public default <E2> GraphTraversal<S, E2> choose(final Traversal<?, ?> 
traversalPredicate,
                                                      final Traversal<?, E2> 
trueChoice, final Traversal<?, E2> falseChoice) {
@@ -2165,10 +2165,10 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      * like semantics within a traversal.
      *
      * @param traversalPredicate the traversal used to determine the "if" 
portion of the if-then-else
-     * @param trueChoice the traversal to execute in the event the {@code 
traversalPredicate} returns true
+     * @param trueChoice         the traversal to execute in the event the 
{@code traversalPredicate} returns true
      * @return the traversal with the appended {@link ChooseStep}
-     * @since 3.2.4
      * @see <a 
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#choose-step";
 target="_blank">Reference Documentation - Choose Step</a>
+     * @since 3.2.4
      */
     public default <E2> GraphTraversal<S, E2> choose(final Traversal<?, ?> 
traversalPredicate,
                                                      final Traversal<?, E2> 
trueChoice) {
@@ -2183,8 +2183,8 @@ public interface GraphTraversal<S, E> extends 
Traversal<S, E> {
      *
      * @param choiceFunction the function used to determine the value for the 
branch
      * @return the traversal with the appended {@link ChooseStep}
-     * @since 3.0.0-incubating
      * @see <a href="htt

<TRUNCATED>

Reply via email to