diff --git a/core/src/main/java/com/google/googlejavaformat/Doc.java b/core/src/main/java/com/google/googlejavaformat/Doc.java
index 873d5af1a..94694b609 100644
--- a/core/src/main/java/com/google/googlejavaformat/Doc.java
+++ b/core/src/main/java/com/google/googlejavaformat/Doc.java
@@ -271,11 +271,11 @@ public State computeBreaks(CommentsHelper commentsHelper, int maxWidth, State st
     private static void splitByBreaks(List<Doc> docs, List<List<Doc>> splits, List<Break> breaks) {
       splits.clear();
       breaks.clear();
-      splits.add(new ArrayList<Doc>());
+      splits.add(new ArrayList<>());
       for (Doc doc : docs) {
         if (doc instanceof Break) {
           breaks.add((Break) doc);
-          splits.add(new ArrayList<Doc>());
+          splits.add(new ArrayList<>());
         } else {
           getLast(splits).add(doc);
         }
@@ -287,8 +287,7 @@ private State computeBroken(CommentsHelper commentsHelper, int maxWidth, State s
       splitByBreaks(docs, splits, breaks);
 
       state =
-          computeBreakAndSplit(
-              commentsHelper, maxWidth, state, Optional.<Break>absent(), splits.get(0));
+          computeBreakAndSplit(commentsHelper, maxWidth, state, Optional.absent(), splits.get(0));
 
       // Handle following breaks and split.
       for (int i = 0; i < breaks.size(); i++) {
@@ -576,7 +575,7 @@ private Break(FillMode fillMode, String flat, Indent plusIndent, Optional<BreakT
      * @return the new {@code Break}
      */
     public static Break make(FillMode fillMode, String flat, Indent plusIndent) {
-      return new Break(fillMode, flat, plusIndent, Optional.<BreakTag>absent());
+      return new Break(fillMode, flat, plusIndent, Optional.absent());
     }
 
     /**
diff --git a/core/src/main/java/com/google/googlejavaformat/OpsBuilder.java b/core/src/main/java/com/google/googlejavaformat/OpsBuilder.java
index 80aa02277..2de641f4b 100644
--- a/core/src/main/java/com/google/googlejavaformat/OpsBuilder.java
+++ b/core/src/main/java/com/google/googlejavaformat/OpsBuilder.java
@@ -81,7 +81,7 @@ public abstract static class BlankLineWanted {
      * Explicitly preserve blank lines from the input (e.g. before the first member in a class
      * declaration). Overrides conditional blank lines.
      */
-    public static final BlankLineWanted PRESERVE = new SimpleBlankLine(Optional.<Boolean>absent());
+    public static final BlankLineWanted PRESERVE = new SimpleBlankLine(Optional.absent());
 
     /** Is the blank line wanted? */
     public abstract Optional<Boolean> wanted();
@@ -238,9 +238,7 @@ public final void drain() {
       int tokensN = tokens.size();
       while (tokenI < tokensN && inputPosition > tokens.get(tokenI).getTok().getPosition()) {
         Input.Token token = tokens.get(tokenI++);
-        add(
-            Doc.Token.make(
-                token, Doc.Token.RealOrImaginary.IMAGINARY, ZERO, Optional.<Indent>absent()));
+        add(Doc.Token.make(token, Doc.Token.RealOrImaginary.IMAGINARY, ZERO, Optional.absent()));
       }
     }
     this.inputPosition = inputPosition;
@@ -266,7 +264,7 @@ public final Optional<String> peekToken() {
     ImmutableList<? extends Input.Token> tokens = input.getTokens();
     return tokenI < tokens.size()
         ? Optional.of(tokens.get(tokenI).getTok().getOriginalText())
-        : Optional.<String>absent();
+        : Optional.absent();
   }
 
   /**
@@ -276,7 +274,7 @@ public final Optional<String> peekToken() {
    * @param token the optional token
    */
   public final void guessToken(String token) {
-    token(token, Doc.Token.RealOrImaginary.IMAGINARY, ZERO, Optional.<Indent>absent());
+    token(token, Doc.Token.RealOrImaginary.IMAGINARY, ZERO, Optional.absent());
   }
 
   public final void token(
@@ -314,8 +312,7 @@ public final void token(
   public final void op(String op) {
     int opN = op.length();
     for (int i = 0; i < opN; i++) {
-      token(
-          op.substring(i, i + 1), Doc.Token.RealOrImaginary.REAL, ZERO, Optional.<Indent>absent());
+      token(op.substring(i, i + 1), Doc.Token.RealOrImaginary.REAL, ZERO, Optional.absent());
     }
   }
 
@@ -383,7 +380,7 @@ public final void breakToFill(String flat) {
    * @param plusIndent extra indent if taken
    */
   public final void breakOp(Doc.FillMode fillMode, String flat, Indent plusIndent) {
-    breakOp(fillMode, flat, plusIndent, Optional.<BreakTag>absent());
+    breakOp(fillMode, flat, plusIndent, Optional.absent());
   }
 
   /**
@@ -586,8 +583,8 @@ private static boolean isForcedBreak(Op op) {
 
   private static List<Op> makeComment(Input.Tok comment) {
     return comment.isSlashStarComment()
-        ? ImmutableList.<Op>of(Doc.Tok.make(comment))
-        : ImmutableList.<Op>of(Doc.Tok.make(comment), Doc.Break.makeForced());
+        ? ImmutableList.of(Doc.Tok.make(comment))
+        : ImmutableList.of(Doc.Tok.make(comment), Doc.Break.makeForced());
   }
 
   @Override
diff --git a/core/src/main/java/com/google/googlejavaformat/java/DimensionHelpers.java b/core/src/main/java/com/google/googlejavaformat/java/DimensionHelpers.java
index bb4ab5f1c..54edffd88 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/DimensionHelpers.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/DimensionHelpers.java
@@ -115,7 +115,7 @@ private static Tree extractDims(Deque<List<AnnotationTree>> dims, Tree node) {
           return node;
         }
         node = extractDims(dims, annotatedTypeTree.getUnderlyingType());
-        dims.addFirst(ImmutableList.<AnnotationTree>copyOf(annotatedTypeTree.getAnnotations()));
+        dims.addFirst(ImmutableList.copyOf(annotatedTypeTree.getAnnotations()));
         return node;
       default:
         return node;
diff --git a/core/src/main/java/com/google/googlejavaformat/java/Formatter.java b/core/src/main/java/com/google/googlejavaformat/java/Formatter.java
index 90d0f4b23..49c6e8b4e 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/Formatter.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/Formatter.java
@@ -32,7 +32,6 @@
 import com.google.googlejavaformat.Newlines;
 import com.google.googlejavaformat.Op;
 import com.google.googlejavaformat.OpsBuilder;
-import java.io.File;
 import java.io.IOError;
 import java.io.IOException;
 import java.net.URI;
@@ -138,7 +137,7 @@ static void format(
     JCCompilationUnit unit;
     JavacFileManager fileManager = new JavacFileManager(context, true, UTF_8);
     try {
-      fileManager.setLocation(StandardLocation.PLATFORM_CLASS_PATH, ImmutableList.<File>of());
+      fileManager.setLocation(StandardLocation.PLATFORM_CLASS_PATH, ImmutableList.of());
     } catch (IOException e) {
       // impossible
       throw new IOError(e);
diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaInput.java b/core/src/main/java/com/google/googlejavaformat/java/JavaInput.java
index 35ec4de57..35966cd56 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/JavaInput.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/JavaInput.java
@@ -329,7 +329,7 @@ public ImmutableMap<Integer, Integer> getPositionToColumnMap() {
 
   /** Lex the input and build the list of toks. */
   private ImmutableList<Tok> buildToks(String text) throws FormatterException {
-    ImmutableList<Tok> toks = buildToks(text, ImmutableSet.<TokenKind>of());
+    ImmutableList<Tok> toks = buildToks(text, ImmutableSet.of());
     kN = getLast(toks).getIndex();
     computeRanges(toks);
     return toks;
diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
index 0c0a7b332..7de9a6470 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
@@ -263,7 +263,7 @@ boolean isYes() {
   private final Indent.Const plusFour;
 
   private static final ImmutableList<Op> breakList(Optional<BreakTag> breakTag) {
-    return ImmutableList.<Op>of(Doc.Break.make(Doc.FillMode.UNIFIED, " ", ZERO, breakTag));
+    return ImmutableList.of(Doc.Break.make(Doc.FillMode.UNIFIED, " ", ZERO, breakTag));
   }
 
   private static final ImmutableList<Op> breakFillList(Optional<BreakTag> breakTag) {
@@ -274,7 +274,7 @@ private static final ImmutableList<Op> breakFillList(Optional<BreakTag> breakTag
   }
 
   private static final ImmutableList<Op> forceBreakList(Optional<BreakTag> breakTag) {
-    return ImmutableList.<Op>of(Doc.Break.make(FillMode.FORCED, "", Indent.Const.ZERO, breakTag));
+    return ImmutableList.of(Doc.Break.make(FillMode.FORCED, "", Indent.Const.ZERO, breakTag));
   }
 
   private static final ImmutableList<Op> EMPTY_LIST = ImmutableList.of();
@@ -397,7 +397,7 @@ public Void visitClass(ClassTree tree, Void unused) {
   public void visitAnnotationType(ClassTree node) {
     sync(node);
     builder.open(ZERO);
-    visitAndBreakModifiers(node.getModifiers(), Direction.VERTICAL, Optional.<BreakTag>absent());
+    visitAndBreakModifiers(node.getModifiers(), Direction.VERTICAL, Optional.absent());
     builder.open(ZERO);
     token("@");
     token("interface");
@@ -745,7 +745,7 @@ public Void visitEnhancedForLoop(EnhancedForLoopTree node, Void unused) {
         node.getVariable(),
         Optional.of(node.getExpression()),
         ":",
-        Optional.<String>absent());
+        Optional.absent());
     builder.close();
     token(")");
     builder.close();
@@ -779,7 +779,7 @@ private void visitEnumConstantDeclaration(VariableTree enumConstant) {
   public boolean visitEnumDeclaration(ClassTree node) {
     sync(node);
     builder.open(ZERO);
-    visitAndBreakModifiers(node.getModifiers(), Direction.VERTICAL, Optional.<BreakTag>absent());
+    visitAndBreakModifiers(node.getModifiers(), Direction.VERTICAL, Optional.absent());
     builder.open(plusFour);
     token("enum");
     builder.breakOp(" ");
@@ -917,13 +917,13 @@ void visitVariables(
           Optional.of(fragment.getModifiers()),
           fragment.getType(),
           VarArgsOrNot.fromVariable(fragment),
-          ImmutableList.<AnnotationTree>of(),
+          ImmutableList.of(),
           fragment.getName(),
           "",
           "=",
           Optional.fromNullable(fragment.getInitializer()),
           Optional.of(";"),
-          Optional.<ExpressionTree>absent(),
+          Optional.absent(),
           Optional.fromNullable(variableFragmentDims(true, 0, fragment.getType())));
 
     } else {
@@ -958,7 +958,7 @@ public Void visitForLoop(ForLoopTree node, Void unused) {
     if (!node.getInitializer().isEmpty()) {
       if (node.getInitializer().get(0).getKind() == VARIABLE) {
         PeekingIterator<StatementTree> it =
-            Iterators.<StatementTree>peekingIterator(node.getInitializer().iterator());
+            Iterators.peekingIterator(node.getInitializer().iterator());
         visitVariables(
             variableFragments(it, it.next()), DeclarationKind.NONE, Direction.HORIZONTAL);
       } else {
@@ -1235,7 +1235,7 @@ public Void visitAnnotation(AnnotationTree node, Void unused) {
         visitAnnotationArgument((AssignmentTree) argument);
         first = false;
       }
-      builder.breakOp(UNIFIED, "", minusTwo, Optional.<BreakTag>absent());
+      builder.breakOp(UNIFIED, "", minusTwo, Optional.absent());
       builder.close();
       token(")", plusTwo);
       builder.close();
@@ -1312,7 +1312,7 @@ public Void visitMethod(MethodTree node, Void unused) {
         }
       }
     }
-    builder.addAll(visitModifiers(annotations, Direction.VERTICAL, Optional.<BreakTag>absent()));
+    builder.addAll(visitModifiers(annotations, Direction.VERTICAL, Optional.absent()));
 
     Tree baseReturnType = null;
     Deque<List<AnnotationTree>> dims = null;
@@ -1423,7 +1423,7 @@ public Void visitMethod(MethodTree node, Void unused) {
       token(";");
     } else {
       builder.space();
-      builder.token("{", Doc.Token.RealOrImaginary.REAL, plusTwo, Optional.<Indent>of(plusTwo));
+      builder.token("{", Doc.Token.RealOrImaginary.REAL, plusTwo, Optional.of(plusTwo));
     }
     builder.close();
 
@@ -1457,7 +1457,6 @@ public Void visitMethodInvocation(MethodInvocationTree node, Void unused) {
     return null;
   }
 
-
   @Override
   public Void visitMemberSelect(MemberSelectTree node, Void unused) {
     sync(node);
@@ -1757,14 +1756,14 @@ public Void visitTry(TryTree node, Void unused) {
             Optional.of(variableTree.getModifiers()),
             variableTree.getType(),
             VarArgsOrNot.NO,
-            ImmutableList.<AnnotationTree>of(),
+            ImmutableList.of(),
             variableTree.getName(),
             "",
             "=",
             Optional.fromNullable(variableTree.getInitializer()),
-            Optional.<String>absent(),
-            Optional.<ExpressionTree>absent(),
-            Optional.<TypeWithDims>absent());
+            Optional.absent(),
+            Optional.absent(),
+            Optional.absent());
         if (builder.peekToken().equals(Optional.of(";"))) {
           token(";");
           builder.space();
@@ -1808,8 +1807,7 @@ public Void visitTry(TryTree node, Void unused) {
 
   public void visitClassDeclaration(ClassTree node) {
     sync(node);
-    List<Op> breaks =
-        visitModifiers(node.getModifiers(), Direction.VERTICAL, Optional.<BreakTag>absent());
+    List<Op> breaks = visitModifiers(node.getModifiers(), Direction.VERTICAL, Optional.absent());
     boolean hasSuperclassType = node.getExtendsClause() != null;
     boolean hasSuperInterfaceTypes = !node.getImplementsClause().isEmpty();
     builder.addAll(breaks);
@@ -2013,8 +2011,7 @@ private void visitStatement(
 
   private void visitStatements(List<? extends StatementTree> statements) {
     boolean first = true;
-    PeekingIterator<StatementTree> it =
-        Iterators.<StatementTree>peekingIterator(statements.iterator());
+    PeekingIterator<StatementTree> it = Iterators.peekingIterator(statements.iterator());
     dropEmptyDeclarations();
     while (it.hasNext()) {
       StatementTree tree = it.next();
@@ -2055,9 +2052,7 @@ private List<Op> visitModifiers(
       Direction annotationsDirection,
       Optional<BreakTag> declarationAnnotationBreak) {
     return visitModifiers(
-        modifiersTree.getAnnotations(),
-        annotationsDirection,
-        declarationAnnotationBreak);
+        modifiersTree.getAnnotations(), annotationsDirection, declarationAnnotationBreak);
   }
 
   private List<Op> visitModifiers(
@@ -2101,7 +2096,7 @@ private List<Op> visitModifiers(
     first = true;
     while (nextIsModifier() || !annotations.isEmpty()) {
       if (!first) {
-        builder.addAll(breakFillList(Optional.<BreakTag>absent()));
+        builder.addAll(breakFillList(Optional.absent()));
       }
       if (nextIsModifier()) {
         token(builder.peekToken().get());
@@ -2112,7 +2107,7 @@ private List<Op> visitModifiers(
       first = false;
     }
     builder.close();
-    return breakFillList(Optional.<BreakTag>absent());
+    return breakFillList(Optional.absent());
   }
 
   boolean nextIsModifier() {
@@ -2172,8 +2167,7 @@ private void visitUnionType(VariableTree declaration) {
     UnionTypeTree type = (UnionTypeTree) declaration.getType();
     builder.open(ZERO);
     sync(declaration);
-    visitAndBreakModifiers(
-        declaration.getModifiers(), Direction.HORIZONTAL, Optional.<BreakTag>absent());
+    visitAndBreakModifiers(declaration.getModifiers(), Direction.HORIZONTAL, Optional.absent());
     List<? extends Tree> union = type.getTypeAlternatives();
     boolean first = true;
     for (int i = 0; i < union.size() - 1; i++) {
@@ -2193,18 +2187,18 @@ private void visitUnionType(VariableTree declaration) {
     declareOne(
         DeclarationKind.NONE,
         Direction.HORIZONTAL,
-        Optional.<ModifiersTree>absent(),
+        Optional.absent(),
         last,
         VarArgsOrNot.NO, // VarArgsOrNot.valueOf(declaration.isVarargs()),
-        ImmutableList.<AnnotationTree>of(), // declaration.varargsAnnotations(),
+        ImmutableList.of(), // declaration.varargsAnnotations(),
         declaration.getName(),
         "",
         // declaration.extraDimensions(),
         "=",
         Optional.fromNullable(declaration.getInitializer()),
-        Optional.<String>absent(),
-        Optional.<ExpressionTree>absent(),
-        Optional.<TypeWithDims>absent());
+        Optional.absent(),
+        Optional.absent(),
+        Optional.absent());
     builder.close();
   }
 
@@ -2243,14 +2237,14 @@ private void visitFormals(
           Optional.of(receiver.get().getModifiers()),
           receiver.get().getType(),
           VarArgsOrNot.NO,
-          ImmutableList.<AnnotationTree>of(),
+          ImmutableList.of(),
           receiver.get().getName(),
           "",
           "",
-          Optional.<ExpressionTree>absent(),
-          !parameters.isEmpty() ? Optional.of(",") : Optional.<String>absent(),
+          Optional.absent(),
+          !parameters.isEmpty() ? Optional.of(",") : Optional.absent(),
           Optional.of(receiver.get().getNameExpression()),
-          Optional.<TypeWithDims>absent());
+          Optional.absent());
       first = false;
     }
     for (int i = 0; i < parameters.size(); i++) {
@@ -2262,9 +2256,9 @@ private void visitFormals(
           DeclarationKind.PARAMETER,
           Direction.HORIZONTAL,
           parameter,
-          Optional.<ExpressionTree>absent(),
+          Optional.absent(),
           "=",
-          i < parameters.size() - 1 ? Optional.of(",") : Optional.<String>absent());
+          i < parameters.size() - 1 ? Optional.of(",") : Optional.absent());
       first = false;
     }
     builder.close();
@@ -2332,8 +2326,8 @@ private void visitToDeclare(
         equals,
         initializer,
         trailing,
-        Optional.<ExpressionTree>absent(),
-        Optional.<TypeWithDims>absent());
+        Optional.absent(),
+        Optional.absent());
   }
 
   /** Does not omit the leading '<', which should be associated with the type name. */
@@ -2529,10 +2523,7 @@ private void visitRegularDot(List<ExpressionTree> items, boolean needDot) {
   //             .happens())
   //     .thenReturn(result);
   //
-  private boolean fillFirstArgument(
-      ExpressionTree e,
-      List<ExpressionTree> items,
-      Indent indent) {
+  private boolean fillFirstArgument(ExpressionTree e, List<ExpressionTree> items, Indent indent) {
     // is there a trailing dereference?
     if (items.size() < 2) {
       return false;
@@ -2873,8 +2864,7 @@ private int argumentsAreTabular(List<? extends ExpressionTree> arguments) {
       return -1;
     }
     List<List<ExpressionTree>> rows = new ArrayList<>();
-    PeekingIterator<ExpressionTree> it =
-        Iterators.<ExpressionTree>peekingIterator(arguments.iterator());
+    PeekingIterator<ExpressionTree> it = Iterators.peekingIterator(arguments.iterator());
     int start0 = actualColumn(it.peek());
     {
       List<ExpressionTree> row = new ArrayList<>();
@@ -3008,9 +2998,7 @@ int declareOne(
 
     Deque<List<AnnotationTree>> dims =
         new ArrayDeque<>(
-            typeWithDims.isPresent()
-                ? typeWithDims.get().dims
-                : Collections.<List<AnnotationTree>>emptyList());
+            typeWithDims.isPresent() ? typeWithDims.get().dims : Collections.emptyList());
     int baseDims = 0;
 
     builder.open(
@@ -3100,7 +3088,7 @@ int declareOne(
   }
 
   private void maybeAddDims(Deque<List<AnnotationTree>> annotations) {
-    maybeAddDims(new ArrayDeque<ExpressionTree>(), annotations);
+    maybeAddDims(new ArrayDeque<>(), annotations);
   }
 
   /**
@@ -3157,7 +3145,7 @@ private void declareMany(List<VariableTree> fragments, Direction annotationDirec
     ModifiersTree modifiers = fragments.get(0).getModifiers();
     Tree type = fragments.get(0).getType();
 
-    visitAndBreakModifiers(modifiers, annotationDirection, Optional.<BreakTag>absent());
+    visitAndBreakModifiers(modifiers, annotationDirection, Optional.absent());
     builder.open(plusFour);
     builder.open(ZERO);
     TypeWithDims extractedDims = DimensionHelpers.extractDims(type, SortedDims.YES);
@@ -3219,7 +3207,7 @@ void addBodyDeclarations(
       builder.open(plusTwo);
       boolean first = first0.isYes();
       boolean lastOneGotBlankLineBefore = false;
-      PeekingIterator<Tree> it = Iterators.<Tree>peekingIterator(bodyDeclarations.iterator());
+      PeekingIterator<Tree> it = Iterators.peekingIterator(bodyDeclarations.iterator());
       while (it.hasNext()) {
         Tree bodyDeclaration = it.next();
         dropEmptyDeclarations();
@@ -3345,7 +3333,7 @@ private Direction fieldAnnotationDirection(ModifiersTree modifiers) {
    * @param token the {@link String} to wrap in a {@link Doc.Token}
    */
   final void token(String token) {
-    builder.token(token, Doc.Token.RealOrImaginary.REAL, ZERO, Optional.<Indent>absent());
+    builder.token(token, Doc.Token.RealOrImaginary.REAL, ZERO, Optional.absent());
   }
 
   /**
@@ -3356,16 +3344,13 @@ final void token(String token) {
    */
   final void token(String token, Indent plusIndentCommentsBefore) {
     builder.token(
-        token, Doc.Token.RealOrImaginary.REAL, plusIndentCommentsBefore, Optional.<Indent>absent());
+        token, Doc.Token.RealOrImaginary.REAL, plusIndentCommentsBefore, Optional.absent());
   }
 
   /** Emit a {@link Doc.Token}, and breaks and indents trailing javadoc or block comments. */
   final void tokenBreakTrailingComment(String token, Indent breakAndIndentTrailingComment) {
     builder.token(
-        token,
-        Doc.Token.RealOrImaginary.REAL,
-        ZERO,
-        Optional.<Indent>of(breakAndIndentTrailingComment));
+        token, Doc.Token.RealOrImaginary.REAL, ZERO, Optional.of(breakAndIndentTrailingComment));
   }
 
   private void markForPartialFormat() {