Refactored the source folders.

21 files changed, 0 insertions, 3532 deletions

diff --git a/src/lombok/javac/HandlerLibrary.java b/src/lombok/javac/HandlerLibrary.java
deleted file mode 100644
index bbe9dec0..00000000
--- a/src/lombok/javac/HandlerLibrary.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.javac;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.ServiceConfigurationError;
-import java.util.ServiceLoader;
-
-import javax.annotation.processing.Messager;
-import javax.tools.Diagnostic;
-
-import lombok.core.PrintAST;
-import lombok.core.SpiLoadUtil;
-import lombok.core.TypeLibrary;
-import lombok.core.TypeResolver;
-import lombok.core.AnnotationValues.AnnotationValueDecodeFail;
-
-import com.sun.tools.javac.tree.JCTree.JCAnnotation;
-import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
-
-/**
- * This class tracks 'handlers' and knows how to invoke them for any given AST node.
- * 
- * This class can find the handlers (via SPI discovery) and will set up the given AST node, such as
- * building an AnnotationValues instance.
- */
-public class HandlerLibrary {
-	private final TypeLibrary typeLibrary = new TypeLibrary();
-	private final Map<String, AnnotationHandlerContainer<?>> annotationHandlers = new HashMap<String, AnnotationHandlerContainer<?>>();
-	private final Collection<JavacASTVisitor> visitorHandlers = new ArrayList<JavacASTVisitor>();
-	private final Messager messager;
-	private boolean skipPrintAST = true;
-	
-	/**
-	 * Creates a new HandlerLibrary that will report any problems or errors to the provided messager.
-	 * You probably want to use {@link #load(Messager)} instead.
-	 */
-	public HandlerLibrary(Messager messager) {
-		this.messager = messager;
-	}
-	
-	private static class AnnotationHandlerContainer<T extends Annotation> {
-		private JavacAnnotationHandler<T> handler;
-		private Class<T> annotationClass;
-		
-		AnnotationHandlerContainer(JavacAnnotationHandler<T> handler, Class<T> annotationClass) {
-			this.handler = handler;
-			this.annotationClass = annotationClass;
-		}
-		
-		public boolean handle(final JavacNode node) {
-			return handler.handle(Javac.createAnnotation(annotationClass, node), (JCAnnotation)node.get(), node);
-		}
-	}
-	
-	/**
-	 * Creates a new HandlerLibrary that will report any problems or errors to the provided messager,
-	 * then uses SPI discovery to load all annotation and visitor based handlers so that future calls
-	 * to the handle methods will defer to these handlers.
-	 */
-	public static HandlerLibrary load(Messager messager) {
-		HandlerLibrary library = new HandlerLibrary(messager);
-		
-		loadAnnotationHandlers(library);
-		loadVisitorHandlers(library);
-		
-		return library;
-	}
-	
-	/** Uses SPI Discovery to find implementations of {@link JavacAnnotationHandler}. */
-	@SuppressWarnings("unchecked")
-	private static void loadAnnotationHandlers(HandlerLibrary lib) {
-		//No, that seemingly superfluous reference to JavacAnnotationHandler's classloader is not in fact superfluous!
-		Iterator<JavacAnnotationHandler> it = ServiceLoader.load(JavacAnnotationHandler.class,
-				JavacAnnotationHandler.class.getClassLoader()).iterator();
-		while (it.hasNext()) {
-			try {
-				JavacAnnotationHandler<?> handler = it.next();
-				Class<? extends Annotation> annotationClass =
-					SpiLoadUtil.findAnnotationClass(handler.getClass(), JavacAnnotationHandler.class);
-				AnnotationHandlerContainer<?> container = new AnnotationHandlerContainer(handler, annotationClass);
-				if (lib.annotationHandlers.put(container.annotationClass.getName(), container) != null) {
-					lib.javacWarning("Duplicate handlers for annotation type: " + container.annotationClass.getName());
-				}
-				lib.typeLibrary.addType(container.annotationClass.getName());
-			} catch (ServiceConfigurationError e) {
-				lib.javacWarning("Can't load Lombok annotation handler for javac", e);
-			}
-		}
-	}
-	
-	/** Uses SPI Discovery to find implementations of {@link JavacASTVisitor}. */
-	private static void loadVisitorHandlers(HandlerLibrary lib) {
-		//No, that seemingly superfluous reference to JavacASTVisitor's classloader is not in fact superfluous!
-		Iterator<JavacASTVisitor> it = ServiceLoader.load(JavacASTVisitor.class,
-				JavacASTVisitor.class.getClassLoader()).iterator();
-		while (it.hasNext()) {
-			try {
-				JavacASTVisitor handler = it.next();
-				lib.visitorHandlers.add(handler);
-			} catch (ServiceConfigurationError e) {
-				lib.javacWarning("Can't load Lombok visitor handler for javac", e);
-			}
-		}
-	}
-	
-	/** Generates a warning in the Messager that was used to initialize this HandlerLibrary. */
-	public void javacWarning(String message) {
-		javacWarning(message, null);
-	}
-	
-	/** Generates a warning in the Messager that was used to initialize this HandlerLibrary. */
-	public void javacWarning(String message, Throwable t) {
-		messager.printMessage(Diagnostic.Kind.WARNING, message + (t == null ? "" : (": " + t)));
-	}
-	
-	/** Generates an error in the Messager that was used to initialize this HandlerLibrary. */
-	public void javacError(String message) {
-		javacError(message, null);
-	}
-	
-	/** Generates an error in the Messager that was used to initialize this HandlerLibrary. */
-	public void javacError(String message, Throwable t) {
-		messager.printMessage(Diagnostic.Kind.ERROR, message + (t == null ? "" : (": " + t)));
-		if (t != null) t.printStackTrace();
-	}
-	
-	/**
-	 * Handles the provided annotation node by first finding a qualifying instance of
-	 * {@link JavacAnnotationHandler} and if one exists, calling it with a freshly cooked up
-	 * instance of {@link lombok.core.AnnotationValues}.
-	 * 
-	 * Note that depending on the printASTOnly flag, the {@link lombok.core.PrintAST} annotation
-	 * will either be silently skipped, or everything that isn't {@code PrintAST} will be skipped.
-	 * 
-	 * The HandlerLibrary will attempt to guess if the given annotation node represents a lombok annotation.
-	 * For example, if {@code lombok.*} is in the import list, then this method will guess that
-	 * {@code Getter} refers to {@code lombok.Getter}, presuming that {@link lombok.javac.handlers.HandleGetter}
-	 * has been loaded.
-	 * 
-	 * @param unit The Compilation Unit that contains the Annotation AST Node.
-	 * @param node The Lombok AST Node representing the Annotation AST Node.
-	 * @param annotation 'node.get()' - convenience parameter.
-	 */
-	public boolean handleAnnotation(JCCompilationUnit unit, JavacNode node, JCAnnotation annotation) {
-		TypeResolver resolver = new TypeResolver(typeLibrary, node.getPackageDeclaration(), node.getImportStatements());
-		String rawType = annotation.annotationType.toString();
-		boolean handled = false;
-		for (String fqn : resolver.findTypeMatches(node, rawType)) {
-			boolean isPrintAST = fqn.equals(PrintAST.class.getName());
-			if (isPrintAST == skipPrintAST) continue;
-			AnnotationHandlerContainer<?> container = annotationHandlers.get(fqn);
-			if (container == null) continue;
-			
-			try {
-				handled |= container.handle(node);
-			} catch (AnnotationValueDecodeFail fail) {
-				fail.owner.setError(fail.getMessage(), fail.idx);
-			} catch (Throwable t) {
-				String sourceName = "(unknown).java";
-				if (unit != null && unit.sourcefile != null) sourceName = unit.sourcefile.getName();
-				javacError(String.format("Lombok annotation handler %s failed on " + sourceName, container.handler.getClass()), t);
-			}
-		}
-		
-		return handled;
-	}
-	
-	/**
-	 * Will call all registered {@link JavacASTVisitor} instances.
-	 */
-	public void callASTVisitors(JavacAST ast) {
-		for (JavacASTVisitor visitor : visitorHandlers) try {
-			ast.traverse(visitor);
-		} catch (Throwable t) {
-			javacError(String.format("Lombok visitor handler %s failed", visitor.getClass()), t);
-		}
-	}
-	
-	/**
-	 * Lombok does not currently support triggering annotations in a specified order; the order is essentially
-	 * random right now. This lack of order is particularly annoying for the {@code PrintAST} annotation,
-	 * which is almost always intended to run last. Hence, this hack, which lets it in fact run last.
-	 * 
-	 * @see #skipAllButPrintAST()
-	 */
-	public void skipPrintAST() {
-		skipPrintAST = true;
-	}
-	
-	/** @see #skipPrintAST() */
-	public void skipAllButPrintAST() {
-		skipPrintAST = false;
-	}
-}
diff --git a/src/lombok/javac/Javac.java b/src/lombok/javac/Javac.java
deleted file mode 100644
index 58a24207..00000000
--- a/src/lombok/javac/Javac.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.javac;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import lombok.core.AnnotationValues;
-import lombok.core.TypeLibrary;
-import lombok.core.TypeResolver;
-import lombok.core.AST.Kind;
-import lombok.core.AnnotationValues.AnnotationValue;
-
-import com.sun.tools.javac.tree.JCTree.JCAnnotation;
-import com.sun.tools.javac.tree.JCTree.JCAssign;
-import com.sun.tools.javac.tree.JCTree.JCExpression;
-import com.sun.tools.javac.tree.JCTree.JCFieldAccess;
-import com.sun.tools.javac.tree.JCTree.JCIdent;
-import com.sun.tools.javac.tree.JCTree.JCLiteral;
-import com.sun.tools.javac.tree.JCTree.JCNewArray;
-import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
-
-/**
- * Container for static utility methods relevant to lombok's operation on javac.
- */
-public class Javac {
-	private Javac() {
-		//prevent instantiation
-	}
-	
-	/**
-	 * Checks if the Annotation AST Node provided is likely to be an instance of the provided annotation type.
-	 * 
-	 * @param type An actual annotation type, such as {@code lombok.Getter.class}.
-	 * @param node A Lombok AST node representing an annotation in source code.
-	 */
-	public static boolean annotationTypeMatches(Class<? extends Annotation> type, JavacNode node) {
-		if (node.getKind() != Kind.ANNOTATION) return false;
-		String typeName = ((JCAnnotation)node.get()).annotationType.toString();
-		
-		TypeLibrary library = new TypeLibrary();
-		library.addType(type.getName());
-		TypeResolver resolver = new TypeResolver(library, node.getPackageDeclaration(), node.getImportStatements());
-		Collection<String> typeMatches = resolver.findTypeMatches(node, typeName);
-		
-		for (String match : typeMatches) {
-			if (match.equals(type.getName())) return true;
-		}
-		
-		return false;
-	}
-	
-	/**
-	 * Creates an instance of {@code AnnotationValues} for the provided AST Node.
-	 * 
-	 * @param type An annotation class type, such as {@code lombok.Getter.class}.
-	 * @param node A Lombok AST node representing an annotation in source code.
-	 */
-	public static <A extends Annotation> AnnotationValues<A> createAnnotation(Class<A> type, final JavacNode node) {
-		Map<String, AnnotationValue> values = new HashMap<String, AnnotationValue>();
-		JCAnnotation anno = (JCAnnotation) node.get();
-		List<JCExpression> arguments = anno.getArguments();
-		for (Method m : type.getDeclaredMethods()) {
-			if (!Modifier.isPublic(m.getModifiers())) continue;
-			String name = m.getName();
-			List<String> raws = new ArrayList<String>();
-			List<Object> guesses = new ArrayList<Object>();
-			final List<DiagnosticPosition> positions = new ArrayList<DiagnosticPosition>();
-			boolean isExplicit = false;
-			
-			for (JCExpression arg : arguments) {
-				String mName;
-				JCExpression rhs;
-				
-				if (arg instanceof JCAssign) {
-					JCAssign assign = (JCAssign) arg;
-					mName = assign.lhs.toString();
-					rhs = assign.rhs;
-				} else {
-					rhs = arg;
-					mName = "value";
-				}
-				
-				if (!mName.equals(name)) continue;
-				isExplicit = true;
-				if (rhs instanceof JCNewArray) {
-					List<JCExpression> elems = ((JCNewArray)rhs).elems;
-					for (JCExpression inner : elems) {
-						raws.add(inner.toString());
-						guesses.add(calculateGuess(inner));
-						positions.add(inner.pos());
-					}
-				} else {
-					raws.add(rhs.toString());
-					guesses.add(calculateGuess(rhs));
-					positions.add(rhs.pos());
-				}
-			}
-			
-			values.put(name, new AnnotationValue(node, raws, guesses, isExplicit) {
-				@Override public void setError(String message, int valueIdx) {
-					if (valueIdx < 0) node.addError(message);
-					else node.addError(message, positions.get(valueIdx));
-				}
-				@Override public void setWarning(String message, int valueIdx) {
-					if (valueIdx < 0) node.addWarning(message);
-					else node.addWarning(message, positions.get(valueIdx));
-				}
-			});
-		}
-		
-		return new AnnotationValues<A>(type, values, node);
-	}
-	
-	/**
-	 * Turns an expression into a guessed intended literal. Only works for literals, as you can imagine.
-	 * 
-	 * Will for example turn a TrueLiteral into 'Boolean.valueOf(true)'.
-	 */
-	private static Object calculateGuess(JCExpression expr) {
-		if (expr instanceof JCLiteral) {
-			JCLiteral lit = (JCLiteral)expr;
-			if (lit.getKind() == com.sun.source.tree.Tree.Kind.BOOLEAN_LITERAL) {
-				return ((Number)lit.value).intValue() == 0 ? false : true;
-			}
-			return lit.value;
-		} else if (expr instanceof JCIdent || expr instanceof JCFieldAccess) {
-			String x = expr.toString();
-			if (x.endsWith(".class")) x = x.substring(0, x.length() - 6);
-			else {
-				int idx = x.lastIndexOf('.');
-				if (idx > -1) x = x.substring(idx + 1);
-			}
-			return x;
-		} else return null;
-	}
-}
diff --git a/src/lombok/javac/JavacAST.java b/src/lombok/javac/JavacAST.java
deleted file mode 100644
index f2c83fb8..00000000
--- a/src/lombok/javac/JavacAST.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.javac;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import javax.annotation.processing.Messager;
-import javax.tools.Diagnostic;
-import javax.tools.JavaFileObject;
-
-import lombok.core.AST;
-
-import com.sun.source.util.Trees;
-import com.sun.tools.javac.code.Symtab;
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.tree.TreeMaker;
-import com.sun.tools.javac.tree.JCTree.JCAnnotation;
-import com.sun.tools.javac.tree.JCTree.JCBlock;
-import com.sun.tools.javac.tree.JCTree.JCClassDecl;
-import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
-import com.sun.tools.javac.tree.JCTree.JCExpression;
-import com.sun.tools.javac.tree.JCTree.JCFieldAccess;
-import com.sun.tools.javac.tree.JCTree.JCImport;
-import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
-import com.sun.tools.javac.tree.JCTree.JCStatement;
-import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.Log;
-import com.sun.tools.javac.util.Name;
-import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
-
-/**
- * Wraps around javac's internal AST view to add useful features as well as the ability to visit parents from children,
- * something javac's own AST system does not offer.
- */
-public class JavacAST extends AST<JavacAST, JavacNode, JCTree> {
-	private final Messager messager;
-	private final Name.Table nameTable;
-	private final TreeMaker treeMaker;
-	private final Symtab symtab;
-	private final Log log;
-	private final Context context;
-	
-	/**
-	 * Creates a new JavacAST of the provided Compilation Unit.
-	 * 
-	 * @param trees The trees instance to use to inspect the compilation unit. Generate via:
-	 *   {@code Trees.getInstance(env)}
-	 * @param messager A Messager for warning and error reporting.
-	 * @param context A Context object for interfacing with the compiler.
-	 * @param top The compilation unit, which serves as the top level node in the tree to be built.
-	 */
-	public JavacAST(Trees trees, Messager messager, Context context, JCCompilationUnit top) {
-		super(top.sourcefile == null ? null : top.sourcefile.toString());
-		setTop(buildCompilationUnit(top));
-		this.context = context;
-		this.messager = messager;
-		this.log = Log.instance(context);
-		this.nameTable = Name.Table.instance(context);
-		this.treeMaker = TreeMaker.instance(context);
-		this.symtab = Symtab.instance(context);
-	}
-	
-	public Context getContext() {
-		return context;
-	}
-	
-	/** {@inheritDoc} */
-	@Override public String getPackageDeclaration() {
-		JCCompilationUnit unit = (JCCompilationUnit)top().get();
-		return unit.pid instanceof JCFieldAccess ? unit.pid.toString() : null;
-	}
-	
-	/** {@inheritDoc} */
-	@Override public Collection<String> getImportStatements() {
-		List<String> imports = new ArrayList<String>();
-		JCCompilationUnit unit = (JCCompilationUnit)top().get();
-		for (JCTree def : unit.defs) {
-			if (def instanceof JCImport) {
-				imports.add(((JCImport)def).qualid.toString());
-			}
-		}
-		
-		return imports;
-	}
-	
-	/**
-	 * Runs through the entire AST, starting at the compilation unit, calling the provided visitor's visit methods
-	 * for each node, depth first.
-	 */
-	public void traverse(JavacASTVisitor visitor) {
-		top().traverse(visitor);
-	}
-	
-	void traverseChildren(JavacASTVisitor visitor, JavacNode node) {
-		for (JavacNode child : new ArrayList<JavacNode>(node.down())) {
-			child.traverse(visitor);
-		}
-	}
-	
-	/** @return A Name object generated for the proper name table belonging to this AST. */
-	public Name toName(String name) {
-		return nameTable.fromString(name);
-	}
-	
-	/** @return A TreeMaker instance that you can use to create new AST nodes. */
-	public TreeMaker getTreeMaker() {
-		return treeMaker;
-	}
-	
-	/** @return The symbol table used by this AST for symbols. */
-	public Symtab getSymbolTable() {
-		return symtab;
-	}
-	
-	/** {@inheritDoc} */
-	@Override protected JavacNode buildTree(JCTree node, Kind kind) {
-		switch (kind) {
-		case COMPILATION_UNIT:
-			return buildCompilationUnit((JCCompilationUnit) node);
-		case TYPE:
-			return buildType((JCClassDecl) node);
-		case FIELD:
-			return buildField((JCVariableDecl) node);
-		case INITIALIZER:
-			return buildInitializer((JCBlock) node);
-		case METHOD:
-			return buildMethod((JCMethodDecl) node);
-		case ARGUMENT:
-			return buildLocalVar((JCVariableDecl) node, kind);
-		case LOCAL:
-			return buildLocalVar((JCVariableDecl) node, kind);
-		case STATEMENT:
-			return buildStatementOrExpression(node);
-		case ANNOTATION:
-			return buildAnnotation((JCAnnotation) node);
-		default:
-			throw new AssertionError("Did not expect: " + kind);
-		}
-	}
-	
-	private JavacNode buildCompilationUnit(JCCompilationUnit top) {
-		List<JavacNode> childNodes = new ArrayList<JavacNode>();
-		for (JCTree s : top.defs) {
-			if (s instanceof JCClassDecl) {
-				addIfNotNull(childNodes, buildType((JCClassDecl)s));
-			} // else they are import statements, which we don't care about. Or Skip objects, whatever those are.
-		}
-		
-		return new JavacNode(this, top, childNodes, Kind.COMPILATION_UNIT);
-	}
-	
-	private JavacNode buildType(JCClassDecl type) {
-		if (setAndGetAsHandled(type)) return null;
-		List<JavacNode> childNodes = new ArrayList<JavacNode>();
-		
-		for (JCTree def : type.defs) {
-			for (JCAnnotation annotation : type.mods.annotations) addIfNotNull(childNodes, buildAnnotation(annotation));
-			/* A def can be:
-			 *   JCClassDecl for inner types
-			 *   JCMethodDecl for constructors and methods
-			 *   JCVariableDecl for fields
-			 *   JCBlock for (static) initializers
-			 */
-			if (def instanceof JCMethodDecl) addIfNotNull(childNodes, buildMethod((JCMethodDecl)def));
-			else if (def instanceof JCClassDecl) addIfNotNull(childNodes, buildType((JCClassDecl)def));
-			else if (def instanceof JCVariableDecl) addIfNotNull(childNodes, buildField((JCVariableDecl)def));
-			else if (def instanceof JCBlock) addIfNotNull(childNodes, buildInitializer((JCBlock)def));
-		}
-		
-		return putInMap(new JavacNode(this, type, childNodes, Kind.TYPE));
-	}
-	
-	private JavacNode buildField(JCVariableDecl field) {
-		if (setAndGetAsHandled(field)) return null;
-		List<JavacNode> childNodes = new ArrayList<JavacNode>();
-		for (JCAnnotation annotation : field.mods.annotations) addIfNotNull(childNodes, buildAnnotation(annotation));
-		addIfNotNull(childNodes, buildExpression(field.init));
-		return putInMap(new JavacNode(this, field, childNodes, Kind.FIELD));
-	}
-	
-	private JavacNode buildLocalVar(JCVariableDecl local, Kind kind) {
-		if (setAndGetAsHandled(local)) return null;
-		List<JavacNode> childNodes = new ArrayList<JavacNode>();
-		for (JCAnnotation annotation : local.mods.annotations) addIfNotNull(childNodes, buildAnnotation(annotation));
-		addIfNotNull(childNodes, buildExpression(local.init));
-		return putInMap(new JavacNode(this, local, childNodes, kind));
-	}
-	
-	private JavacNode buildInitializer(JCBlock initializer) {
-		if (setAndGetAsHandled(initializer)) return null;
-		List<JavacNode> childNodes = new ArrayList<JavacNode>();
-		for (JCStatement statement: initializer.stats) addIfNotNull(childNodes, buildStatement(statement));
-		return putInMap(new JavacNode(this, initializer, childNodes, Kind.INITIALIZER));
-	}
-	
-	private JavacNode buildMethod(JCMethodDecl method) {
-		if (setAndGetAsHandled(method)) return null;
-		List<JavacNode> childNodes = new ArrayList<JavacNode>();
-		for (JCAnnotation annotation : method.mods.annotations) addIfNotNull(childNodes, buildAnnotation(annotation));
-		for (JCVariableDecl param : method.params) addIfNotNull(childNodes, buildLocalVar(param, Kind.ARGUMENT));
-		if (method.body != null && method.body.stats != null) {
-			for (JCStatement statement : method.body.stats) addIfNotNull(childNodes, buildStatement(statement));
-		}
-		return putInMap(new JavacNode(this, method, childNodes, Kind.METHOD));
-	}
-	
-	private JavacNode buildAnnotation(JCAnnotation annotation) {
-		if (setAndGetAsHandled(annotation)) return null;
-		return putInMap(new JavacNode(this, annotation, null, Kind.ANNOTATION));
-	}
-	
-	private JavacNode buildExpression(JCExpression expression) {
-		return buildStatementOrExpression(expression);
-	}
-	
-	private JavacNode buildStatement(JCStatement statement) {
-		return buildStatementOrExpression(statement);
-	}
-	
-	private JavacNode buildStatementOrExpression(JCTree statement) {
-		if (statement == null) return null;
-		if (statement instanceof JCAnnotation) return null;
-		if (statement instanceof JCClassDecl) return buildType((JCClassDecl)statement);
-		if (statement instanceof JCVariableDecl) return buildLocalVar((JCVariableDecl)statement, Kind.LOCAL);
-		
-		if (setAndGetAsHandled(statement)) return null;
-		
-		return drill(statement);
-	}
-	
-	private JavacNode drill(JCTree statement) {
-		List<JavacNode> childNodes = new ArrayList<JavacNode>();
-		for (FieldAccess fa : fieldsOf(statement.getClass())) childNodes.addAll(buildWithField(JavacNode.class, statement, fa));
-		return putInMap(new JavacNode(this, statement, childNodes, Kind.STATEMENT));
-	}
-	
-	/** For javac, both JCExpression and JCStatement are considered as valid children types. */
-	@Override
-	protected Collection<Class<? extends JCTree>> getStatementTypes() {
-		Collection<Class<? extends JCTree>> collection = new ArrayList<Class<? extends JCTree>>(2);
-		collection.add(JCStatement.class);
-		collection.add(JCExpression.class);
-		return collection;
-	}
-	
-	private static void addIfNotNull(Collection<JavacNode> nodes, JavacNode node) {
-		if (node != null) nodes.add(node);
-	}
-	
-	/** Supply either a position or a node (in that case, position of the node is used) */
-	void printMessage(Diagnostic.Kind kind, String message, JavacNode node, DiagnosticPosition pos) {
-		JavaFileObject oldSource = null;
-		JavaFileObject newSource = null;
-		JCTree astObject = node == null ? null : node.get();
-		JCCompilationUnit top = (JCCompilationUnit) top().get();
-		newSource = top.sourcefile;
-		if (newSource != null) {
-			oldSource = log.useSource(newSource);
-			if (pos == null) pos = astObject.pos();
-		}
-		try {
-			switch (kind) {
-			case ERROR:
-				increaseErrorCount(messager);
-				boolean prev = log.multipleErrors;
-				log.multipleErrors = true;
-				try {
-					log.error(pos, "proc.messager", message);
-				} finally {
-					log.multipleErrors = prev;
-				}
-				break;
-			default:
-			case WARNING:
-				log.warning(pos, "proc.messager", message);
-				break;
-			}
-		} finally {
-			if (oldSource != null) log.useSource(oldSource);
-		}
-	}
-	
-	/** {@inheritDoc} */
-	@Override protected void setElementInASTCollection(Field field, Object refField, List<Collection<?>> chain, Collection<?> collection, int idx, JCTree newN) throws IllegalAccessException {
-		com.sun.tools.javac.util.List<?> list = setElementInConsList(chain, collection, ((List<?>)collection).get(idx), newN);
-		field.set(refField, list);
-	}
-	
-	private com.sun.tools.javac.util.List<?> setElementInConsList(List<Collection<?>> chain, Collection<?> current, Object oldO, Object newO) {
-		com.sun.tools.javac.util.List<?> oldL = (com.sun.tools.javac.util.List<?>) current;
-		com.sun.tools.javac.util.List<?> newL = replaceInConsList(oldL, oldO, newO);
-		if (chain.isEmpty()) return newL;
-		List<Collection<?>> reducedChain = new ArrayList<Collection<?>>(chain);
-		Collection<?> newCurrent = reducedChain.remove(reducedChain.size() -1);
-		return setElementInConsList(reducedChain, newCurrent, oldL, newL);
-	}
-	
-	private com.sun.tools.javac.util.List<?> replaceInConsList(com.sun.tools.javac.util.List<?> oldL, Object oldO, Object newO) {
-		boolean repl = false;
-		Object[] a = oldL.toArray();
-		for (int i = 0; i < a.length; i++) {
-			if (a[i] == oldO) {
-				a[i] = newO;
-				repl = true;
-			}
-		}
-		
-		if (repl) return com.sun.tools.javac.util.List.<Object>from(a);
-		return oldL;
-	}
-	
-	private void increaseErrorCount(Messager m) {
-		try {
-			Field f = m.getClass().getDeclaredField("errorCount");
-			f.setAccessible(true);
-			if (f.getType() == int.class) {
-				int val = ((Number)f.get(m)).intValue();
-				f.set(m, val +1);
-			}
-		} catch (Throwable t) {
-			//Very unfortunate, but in most cases it still works fine, so we'll silently swallow it.
-		}
-	}
-}
diff --git a/src/lombok/javac/JavacASTAdapter.java b/src/lombok/javac/JavacASTAdapter.java
deleted file mode 100644
index 41bc46d3..00000000
--- a/src/lombok/javac/JavacASTAdapter.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.javac;
-
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.tree.JCTree.JCAnnotation;
-import com.sun.tools.javac.tree.JCTree.JCBlock;
-import com.sun.tools.javac.tree.JCTree.JCClassDecl;
-import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
-import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
-import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
-
-/**
- * Standard adapter for the {@link JavacASTVisitor} interface. Every method on that interface
- * has been implemented with an empty body. Override whichever methods you need.
- */
-public class JavacASTAdapter implements JavacASTVisitor {
-	/** {@inheritDoc} */
-	@Override public void visitCompilationUnit(JavacNode top, JCCompilationUnit unit) {}
-	
-	/** {@inheritDoc} */
-	@Override public void endVisitCompilationUnit(JavacNode top, JCCompilationUnit unit) {}
-	
-	/** {@inheritDoc} */
-	@Override public void visitType(JavacNode typeNode, JCClassDecl type) {}
-	
-	/** {@inheritDoc} */
-	@Override public void visitAnnotationOnType(JCClassDecl type, JavacNode annotationNode, JCAnnotation annotation) {}
-	
-	/** {@inheritDoc} */
-	@Override public void endVisitType(JavacNode typeNode, JCClassDecl type) {}
-	
-	/** {@inheritDoc} */
-	@Override public void visitField(JavacNode fieldNode, JCVariableDecl field) {}
-	
-	/** {@inheritDoc} */
-	@Override public void visitAnnotationOnField(JCVariableDecl field, JavacNode annotationNode, JCAnnotation annotation) {}
-	
-	/** {@inheritDoc} */
-	@Override public void endVisitField(JavacNode fieldNode, JCVariableDecl field) {}
-	
-	/** {@inheritDoc} */
-	@Override public void visitInitializer(JavacNode initializerNode, JCBlock initializer) {}
-	
-	/** {@inheritDoc} */
-	@Override public void endVisitInitializer(JavacNode initializerNode, JCBlock initializer) {}
-	
-	/** {@inheritDoc} */
-	@Override public void visitMethod(JavacNode methodNode, JCMethodDecl method) {}
-	
-	/** {@inheritDoc} */
-	@Override public void visitAnnotationOnMethod(JCMethodDecl method, JavacNode annotationNode, JCAnnotation annotation) {}
-	
-	/** {@inheritDoc} */
-	@Override public void endVisitMethod(JavacNode methodNode, JCMethodDecl method) {}
-	
-	/** {@inheritDoc} */
-	@Override public void visitMethodArgument(JavacNode argumentNode, JCVariableDecl argument, JCMethodDecl method) {}
-	
-	/** {@inheritDoc} */
-	@Override public void visitAnnotationOnMethodArgument(JCVariableDecl argument, JCMethodDecl method, JavacNode annotationNode, JCAnnotation annotation) {}
-	/** {@inheritDoc} */
-	@Override public void endVisitMethodArgument(JavacNode argumentNode, JCVariableDecl argument, JCMethodDecl method) {}
-	
-	/** {@inheritDoc} */
-	@Override public void visitLocal(JavacNode localNode, JCVariableDecl local) {}
-	
-	/** {@inheritDoc} */
-	@Override public void visitAnnotationOnLocal(JCVariableDecl local, JavacNode annotationNode, JCAnnotation annotation) {}
-	
-	/** {@inheritDoc} */
-	@Override public void endVisitLocal(JavacNode localNode, JCVariableDecl local) {}
-	
-	/** {@inheritDoc} */
-	@Override public void visitStatement(JavacNode statementNode, JCTree statement) {}
-	
-	/** {@inheritDoc} */
-	@Override public void endVisitStatement(JavacNode statementNode, JCTree statement) {}
-}
diff --git a/src/lombok/javac/JavacASTVisitor.java b/src/lombok/javac/JavacASTVisitor.java
deleted file mode 100644
index 3c5887a7..00000000
--- a/src/lombok/javac/JavacASTVisitor.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.javac;
-
-import java.io.PrintStream;
-
-import com.sun.tools.javac.code.Flags;
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.tree.JCTree.JCAnnotation;
-import com.sun.tools.javac.tree.JCTree.JCBlock;
-import com.sun.tools.javac.tree.JCTree.JCClassDecl;
-import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
-import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
-import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
-
-/**
- * Implement so you can ask any JavacAST.LombokNode to traverse depth-first through all children,
- * calling the appropriate visit and endVisit methods.
- */
-public interface JavacASTVisitor {
-	/**
-	 * Called at the very beginning and end.
-	 */
-	void visitCompilationUnit(JavacNode top, JCCompilationUnit unit);
-	void endVisitCompilationUnit(JavacNode top, JCCompilationUnit unit);
-	
-	/**
-	 * Called when visiting a type (a class, interface, annotation, enum, etcetera).
-	 */
-	void visitType(JavacNode typeNode, JCClassDecl type);
-	void visitAnnotationOnType(JCClassDecl type, JavacNode annotationNode, JCAnnotation annotation);
-	void endVisitType(JavacNode typeNode, JCClassDecl type);
-	
-	/**
-	 * Called when visiting a field of a class.
-	 */
-	void visitField(JavacNode fieldNode, JCVariableDecl field);
-	void visitAnnotationOnField(JCVariableDecl field, JavacNode annotationNode, JCAnnotation annotation);
-	void endVisitField(JavacNode fieldNode, JCVariableDecl field);
-	
-	/**
-	 * Called for static and instance initializers. You can tell the difference via the isStatic() method.
-	 */
-	void visitInitializer(JavacNode initializerNode, JCBlock initializer);
-	void endVisitInitializer(JavacNode initializerNode, JCBlock initializer);
-	
-	/**
-	 * Called for both methods and constructors.
-	 */
-	void visitMethod(JavacNode methodNode, JCMethodDecl method);
-	void visitAnnotationOnMethod(JCMethodDecl method, JavacNode annotationNode, JCAnnotation annotation);
-	void endVisitMethod(JavacNode methodNode, JCMethodDecl method);
-	
-	/**
-	 * Visits a method argument.
-	 */
-	void visitMethodArgument(JavacNode argumentNode, JCVariableDecl argument, JCMethodDecl method);
-	void visitAnnotationOnMethodArgument(JCVariableDecl argument, JCMethodDecl method, JavacNode annotationNode, JCAnnotation annotation);
-	void endVisitMethodArgument(JavacNode argumentNode, JCVariableDecl argument, JCMethodDecl method);
-	
-	/**
-	 * Visits a local declaration - that is, something like 'int x = 10;' on the method level. Also called
-	 * for method parameters.
-	 */
-	void visitLocal(JavacNode localNode, JCVariableDecl local);
-	void visitAnnotationOnLocal(JCVariableDecl local, JavacNode annotationNode, JCAnnotation annotation);
-	void endVisitLocal(JavacNode localNode, JCVariableDecl local);
-	
-	/**
-	 * Visits a statement that isn't any of the other visit methods (e.g. JCClassDecl).
-	 * The statement object is guaranteed to be either a JCStatement or a JCExpression.
-	 */
-	void visitStatement(JavacNode statementNode, JCTree statement);
-	void endVisitStatement(JavacNode statementNode, JCTree statement);
-	
-	/**
-	 * Prints the structure of an AST.
-	 */
-	public static class Printer implements JavacASTVisitor {
-		private final PrintStream out;
-		private final boolean printContent;
-		private int disablePrinting = 0;
-		private int indent = 0;
-		
-		/**
-		 * @param printContent if true, bodies are printed directly, as java code,
-		 * instead of a tree listing of every AST node inside it.
-		 */
-		public Printer(boolean printContent) {
-			this(printContent, System.out);
-		}
-		
-		/**
-		 * @param printContent if true, bodies are printed directly, as java code,
-		 * instead of a tree listing of every AST node inside it.
-		 * @param out write output to this stream. You must close it yourself. flush() is called after every line.
-		 * 
-		 * @see java.io.PrintStream#flush()
-		 */
-		public Printer(boolean printContent, PrintStream out) {
-			this.printContent = printContent;
-			this.out = out;
-		}
-		
-		private void forcePrint(String text, Object... params) {
-			StringBuilder sb = new StringBuilder();
-			for (int i = 0; i < indent; i++) sb.append("  ");
-			out.printf(sb.append(text).append('\n').toString(), params);
-			out.flush();
-		}
-		
-		private void print(String text, Object... params) {
-			if (disablePrinting == 0) forcePrint(text, params);
-		}
-		
-		@Override public void visitCompilationUnit(JavacNode LombokNode, JCCompilationUnit unit) {
-			out.println("---------------------------------------------------------");
-			
-			print("<CU %s>", LombokNode.getFileName());
-			indent++;
-		}
-		
-		@Override public void endVisitCompilationUnit(JavacNode node, JCCompilationUnit unit) {
-			indent--;
-			print("</CUD>");
-		}
-		
-		@Override public void visitType(JavacNode node, JCClassDecl type) {
-			print("<TYPE %s>", type.name);
-			indent++;
-			if (printContent) {
-				print("%s", type);
-				disablePrinting++;
-			}
-		}
-		
-		@Override public void visitAnnotationOnType(JCClassDecl type, JavacNode node, JCAnnotation annotation) {
-			forcePrint("<ANNOTATION: %s />", annotation);
-		}
-		
-		@Override public void endVisitType(JavacNode node, JCClassDecl type) {
-			if (printContent) disablePrinting--;
-			indent--;
-			print("</TYPE %s>", type.name);
-		}
-		
-		@Override public void visitInitializer(JavacNode node, JCBlock initializer) {
-			print("<%s INITIALIZER>",
-					initializer.isStatic() ? "static" : "instance");
-			indent++;
-			if (printContent) {
-				print("%s", initializer);
-				disablePrinting++;
-			}
-		}
-		
-		@Override public void endVisitInitializer(JavacNode node, JCBlock initializer) {
-			if (printContent) disablePrinting--;
-			indent--;
-			print("</%s INITIALIZER>", initializer.isStatic() ? "static" : "instance");
-		}
-		
-		@Override public void visitField(JavacNode node, JCVariableDecl field) {
-			print("<FIELD %s %s>", field.vartype, field.name);
-			indent++;
-			if (printContent) {
-				if (field.init != null) print("%s", field.init);
-				disablePrinting++;
-			}
-		}
-		
-		@Override public void visitAnnotationOnField(JCVariableDecl field, JavacNode node, JCAnnotation annotation) {
-			forcePrint("<ANNOTATION: %s />", annotation);
-		}
-		
-		@Override public void endVisitField(JavacNode node, JCVariableDecl field) {
-			if (printContent) disablePrinting--;
-			indent--;
-			print("</FIELD %s %s>", field.vartype, field.name);
-		}
-		
-		@Override public void visitMethod(JavacNode node, JCMethodDecl method) {
-			final String type;
-			if (method.name.contentEquals("<init>")) {
-				if ((method.mods.flags & Flags.GENERATEDCONSTR) != 0) {
-					type = "DEFAULTCONSTRUCTOR";
-				} else type = "CONSTRUCTOR";
-			} else type = "METHOD";
-			print("<%s %s> returns: %s", type, method.name, method.restype);
-			indent++;
-			if (printContent) {
-				if (method.body == null) print("(ABSTRACT)");
-				else print("%s", method.body);
-				disablePrinting++;
-			}
-		}
-		
-		@Override public void visitAnnotationOnMethod(JCMethodDecl method, JavacNode node, JCAnnotation annotation) {
-			forcePrint("<ANNOTATION: %s />", annotation);
-		}
-		
-		@Override public void endVisitMethod(JavacNode node, JCMethodDecl method) {
-			if (printContent) disablePrinting--;
-			indent--;
-			print("</%s %s>", "XMETHOD", method.name);
-		}
-		
-		@Override public void visitMethodArgument(JavacNode node, JCVariableDecl arg, JCMethodDecl method) {
-			print("<METHODARG %s %s>", arg.vartype, arg.name);
-			indent++;
-		}
-		
-		@Override public void visitAnnotationOnMethodArgument(JCVariableDecl arg, JCMethodDecl method, JavacNode nodeAnnotation, JCAnnotation annotation) {
-			forcePrint("<ANNOTATION: %s />", annotation);
-		}
-		
-		@Override public void endVisitMethodArgument(JavacNode node, JCVariableDecl arg, JCMethodDecl method) {
-			indent--;
-			print("</METHODARG %s %s>", arg.vartype, arg.name);
-		}
-		
-		@Override public void visitLocal(JavacNode node, JCVariableDecl local) {
-			print("<LOCAL %s %s>", local.vartype, local.name);
-			indent++;
-		}
-		
-		@Override public void visitAnnotationOnLocal(JCVariableDecl local, JavacNode node, JCAnnotation annotation) {
-			print("<ANNOTATION: %s />", annotation);
-		}
-		
-		@Override public void endVisitLocal(JavacNode node, JCVariableDecl local) {
-			indent--;
-			print("</LOCAL %s %s>", local.vartype, local.name);
-		}
-		
-		@Override public void visitStatement(JavacNode node, JCTree statement) {
-			print("<%s>", statement.getClass());
-			indent++;
-			print("%s", statement);
-		}
-		
-		@Override public void endVisitStatement(JavacNode node, JCTree statement) {
-			indent--;
-			print("</%s>", statement.getClass());
-		}
-	}
-}
diff --git a/src/lombok/javac/JavacAnnotationHandler.java b/src/lombok/javac/JavacAnnotationHandler.java
deleted file mode 100644
index 5b6fe4ce..00000000
--- a/src/lombok/javac/JavacAnnotationHandler.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.javac;
-
-import java.lang.annotation.Annotation;
-
-import lombok.core.AnnotationValues;
-
-import com.sun.tools.javac.tree.JCTree.JCAnnotation;
-
-/**
- * Implement this interface if you want to be triggered for a specific annotation.
- * 
- * You MUST replace 'T' with a specific annotation type, such as:
- * 
- * {@code public class HandleGetter implements JavacAnnotationHandler<Getter>}
- * 
- * Because this generics parameter is inspected to figure out which class you're interested in.
- * 
- * You also need to register yourself via SPI discovery as being an implementation of {@code JavacAnnotationHandler}.
- */
-public interface JavacAnnotationHandler<T extends Annotation> {
-	/**
-	 * Called when an annotation is found that is likely to match the annotation you're interested in.
-	 * 
-	 * Be aware that you'll be called for ANY annotation node in the source that looks like a match. There is,
-	 * for example, no guarantee that the annotation node belongs to a method, even if you set your
-	 * TargetType in the annotation to methods only.
-	 * 
-	 * @param annotation The actual annotation - use this object to retrieve the annotation parameters.
-	 * @param ast The javac AST node representing the annotation.
-	 * @param annotationNode The Lombok AST wrapper around the 'ast' parameter. You can use this object
-	 * to travel back up the chain (something javac AST can't do) to the parent of the annotation, as well
-	 * as access useful methods such as generating warnings or errors focused on the annotation.
-	 * @return {@code true} if you don't want to be called again about this annotation during this
-	 * compile session (you've handled it), or {@code false} to indicate you aren't done yet.
-	 */
-	boolean handle(AnnotationValues<T> annotation, JCAnnotation ast, JavacNode annotationNode);
-}
diff --git a/src/lombok/javac/JavacNode.java b/src/lombok/javac/JavacNode.java
deleted file mode 100644
index a0ee2789..00000000
--- a/src/lombok/javac/JavacNode.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.javac;
-
-import java.util.List;
-
-import javax.tools.Diagnostic;
-
-import lombok.core.AST.Kind;
-
-import com.sun.tools.javac.code.Symtab;
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.tree.TreeMaker;
-import com.sun.tools.javac.tree.JCTree.JCAnnotation;
-import com.sun.tools.javac.tree.JCTree.JCBlock;
-import com.sun.tools.javac.tree.JCTree.JCClassDecl;
-import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
-import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
-import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.Name;
-import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
-
-/**
- * Javac specific version of the LombokNode class.
- */
-public class JavacNode extends lombok.core.LombokNode<JavacAST, JavacNode, JCTree> {
-	/**
-	 * Passes through to the parent constructor.
-	 */
-	public JavacNode(JavacAST ast, JCTree node, List<JavacNode> children, Kind kind) {
-		super(ast, node, children, kind);
-	}
-	
-	/**
-	 * Visits this node and all child nodes depth-first, calling the provided visitor's visit methods.
-	 */
-	public void traverse(JavacASTVisitor visitor) {
-		switch (this.getKind()) {
-		case COMPILATION_UNIT:
-			visitor.visitCompilationUnit(this, (JCCompilationUnit)get());
-			ast.traverseChildren(visitor, this);
-			visitor.endVisitCompilationUnit(this, (JCCompilationUnit)get());
-			break;
-		case TYPE:
-			visitor.visitType(this, (JCClassDecl)get());
-			ast.traverseChildren(visitor, this);
-			visitor.endVisitType(this, (JCClassDecl)get());
-			break;
-		case FIELD:
-			visitor.visitField(this, (JCVariableDecl)get());
-			ast.traverseChildren(visitor, this);
-			visitor.endVisitField(this, (JCVariableDecl)get());
-			break;
-		case METHOD:
-			visitor.visitMethod(this, (JCMethodDecl)get());
-			ast.traverseChildren(visitor, this);
-			visitor.endVisitMethod(this, (JCMethodDecl)get());
-			break;
-		case INITIALIZER:
-			visitor.visitInitializer(this, (JCBlock)get());
-			ast.traverseChildren(visitor, this);
-			visitor.endVisitInitializer(this, (JCBlock)get());
-			break;
-		case ARGUMENT:
-			JCMethodDecl parentMethod = (JCMethodDecl) up().get();
-			visitor.visitMethodArgument(this, (JCVariableDecl)get(), parentMethod);
-			ast.traverseChildren(visitor, this);
-			visitor.endVisitMethodArgument(this, (JCVariableDecl)get(), parentMethod);
-			break;
-		case LOCAL:
-			visitor.visitLocal(this, (JCVariableDecl)get());
-			ast.traverseChildren(visitor, this);
-			visitor.endVisitLocal(this, (JCVariableDecl)get());
-			break;
-		case STATEMENT:
-			visitor.visitStatement(this, get());
-			ast.traverseChildren(visitor, this);
-			visitor.endVisitStatement(this, get());
-			break;
-		case ANNOTATION:
-			switch (up().getKind()) {
-			case TYPE:
-				visitor.visitAnnotationOnType((JCClassDecl)up().get(), this, (JCAnnotation)get());
-				break;
-			case FIELD:
-				visitor.visitAnnotationOnField((JCVariableDecl)up().get(), this, (JCAnnotation)get());
-				break;
-			case METHOD:
-				visitor.visitAnnotationOnMethod((JCMethodDecl)up().get(), this, (JCAnnotation)get());
-				break;
-			case ARGUMENT:
-				JCVariableDecl argument = (JCVariableDecl)up().get();
-				JCMethodDecl method = (JCMethodDecl)up().up().get();
-				visitor.visitAnnotationOnMethodArgument(argument, method, this, (JCAnnotation)get());
-				break;
-			case LOCAL:
-				visitor.visitAnnotationOnLocal((JCVariableDecl)up().get(), this, (JCAnnotation)get());
-				break;
-			default:
-				throw new AssertionError("Annotion not expected as child of a " + up().getKind());
-			}
-			break;
-		default:
-			throw new AssertionError("Unexpected kind during node traversal: " + getKind());
-		}
-	}
-	
-	/** {@inheritDoc} */
-	@Override public String getName() {
-		final Name n;
-		
-		if (node instanceof JCClassDecl) n = ((JCClassDecl)node).name;
-		else if (node instanceof JCMethodDecl) n = ((JCMethodDecl)node).name;
-		else if (node instanceof JCVariableDecl) n = ((JCVariableDecl)node).name;
-		else n = null;
-		
-		return n == null ? null : n.toString();
-	}
-	
-	/** {@inheritDoc} */
-	@Override protected boolean calculateIsStructurallySignificant() {
-		if (node instanceof JCClassDecl) return true;
-		if (node instanceof JCMethodDecl) return true;
-		if (node instanceof JCVariableDecl) return true;
-		if (node instanceof JCCompilationUnit) return true;
-		return false;
-	}
-	
-	/**
-	 * Convenient shortcut to the owning JavacAST object's getTreeMaker method.
-	 * 
-	 * @see JavacAST#getTreeMaker()
-	 */
-	public TreeMaker getTreeMaker() {
-		return ast.getTreeMaker();
-	}
-	
-	/**
-	 * Convenient shortcut to the owning JavacAST object's getSymbolTable method.
-	 * 
-	 * @see JavacAST#getSymbolTable()
-	 */
-	public Symtab getSymbolTable() {
-		return ast.getSymbolTable();
-	}
-	
-	/**
-	 * Convenient shortcut to the owning JavacAST object's getContext method.
-	 * 
-	 * @see JavacAST#getContext()
-	 */
-	public Context getContext() {
-		return ast.getContext();
-	}
-	
-	/**
-	 * Convenient shortcut to the owning JavacAST object's toName method.
-	 * 
-	 * @see JavacAST#toName(String)
-	 */
-	public Name toName(String name) {
-		return ast.toName(name);
-	}
-	
-	/**
-	 * Generates an compiler error focused on the AST node represented by this node object.
-	 */
-	@Override public void addError(String message) {
-		ast.printMessage(Diagnostic.Kind.ERROR, message, this, null);
-	}
-	
-	/**
-	 * Generates an compiler error focused on the AST node represented by this node object.
-	 */
-	public void addError(String message, DiagnosticPosition pos) {
-		ast.printMessage(Diagnostic.Kind.ERROR, message, null, pos);
-	}
-	
-	/**
-	 * Generates a compiler warning focused on the AST node represented by this node object.
-	 */
-	@Override public void addWarning(String message) {
-		ast.printMessage(Diagnostic.Kind.WARNING, message, this, null);
-	}
-	
-	/**
-	 * Generates a compiler warning focused on the AST node represented by this node object.
-	 */
-	public void addWarning(String message, DiagnosticPosition pos) {
-		ast.printMessage(Diagnostic.Kind.WARNING, message, null, pos);
-	}
-}
diff --git a/src/lombok/javac/apt/Processor.java b/src/lombok/javac/apt/Processor.java
deleted file mode 100644
index 9c851762..00000000
--- a/src/lombok/javac/apt/Processor.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.javac.apt;
-
-import java.util.ArrayList;
-import java.util.IdentityHashMap;
-import java.util.List;
-import java.util.Set;
-
-import javax.annotation.processing.AbstractProcessor;
-import javax.annotation.processing.ProcessingEnvironment;
-import javax.annotation.processing.RoundEnvironment;
-import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.annotation.processing.SupportedSourceVersion;
-import javax.lang.model.SourceVersion;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.TypeElement;
-import javax.tools.Diagnostic.Kind;
-
-import lombok.javac.HandlerLibrary;
-import lombok.javac.JavacAST;
-import lombok.javac.JavacASTAdapter;
-import lombok.javac.JavacNode;
-
-import com.sun.source.util.TreePath;
-import com.sun.source.util.Trees;
-import com.sun.tools.javac.processing.JavacProcessingEnvironment;
-import com.sun.tools.javac.tree.JCTree.JCAnnotation;
-import com.sun.tools.javac.tree.JCTree.JCClassDecl;
-import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
-import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
-import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
-
-
-/**
- * This Annotation Processor is the standard injection mechanism for lombok-enabling the javac compiler.
- * 
- * Due to lots of changes in the core javac code, as well as lombok's heavy usage of non-public API, this
- * code only works for the javac v1.6 compiler; it definitely won't work for javac v1.5, and it probably
- * won't work for javac v1.7 without modifications.
- * 
- * To actually enable lombok in a javac compilation run, this class should be in the classpath when
- * running javac; that's the only requirement.
- */
-@SupportedAnnotationTypes("*")
-@SupportedSourceVersion(SourceVersion.RELEASE_6)
-public class Processor extends AbstractProcessor {
-	private ProcessingEnvironment rawProcessingEnv;
-	private JavacProcessingEnvironment processingEnv;
-	private HandlerLibrary handlers;
-	private Trees trees;
-	private String errorToShow;
-	
-	/** {@inheritDoc} */
-	@Override public void init(ProcessingEnvironment procEnv) {
-		super.init(procEnv);
-		this.rawProcessingEnv = procEnv;
-		String className = procEnv.getClass().getName();
-		if (className.startsWith("org.eclipse.jdt.")) {
-			errorToShow = "You should not install lombok.jar as an annotation processor in eclipse. Instead, run lombok.jar as a java application and follow the instructions.";
-			procEnv.getMessager().printMessage(Kind.WARNING, errorToShow);
-			this.processingEnv = null;
-		} else if (!procEnv.getClass().getName().equals("com.sun.tools.javac.processing.JavacProcessingEnvironment")) {
-			procEnv.getMessager().printMessage(Kind.WARNING, "You aren't using a compiler based around javac v1.6, so lombok will not work properly.\n" +
-					"Your processor class is: " + className);
-			this.processingEnv = null;
-			this.errorToShow = null;
-		} else {
-			this.processingEnv = (JavacProcessingEnvironment) procEnv;
-			handlers = HandlerLibrary.load(procEnv.getMessager());
-			trees = Trees.instance(procEnv);
-			this.errorToShow = null;
-		}
-	}
-	
-	/** {@inheritDoc} */
-	@Override public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
-		if (processingEnv == null) {
-			if (errorToShow != null) {
-				Set<? extends Element> rootElements = roundEnv.getRootElements();
-				if (!rootElements.isEmpty()) {
-					rawProcessingEnv.getMessager().printMessage(Kind.WARNING, errorToShow, rootElements.iterator().next());
-					errorToShow = null;
-				}
-			}
-			return false;
-		}
-		
-		IdentityHashMap<JCCompilationUnit, Void> units = new IdentityHashMap<JCCompilationUnit, Void>();
-		for (Element element : roundEnv.getRootElements()) {
-			JCCompilationUnit unit = toUnit(element);
-			if (unit != null) units.put(unit, null);
-		}
-		
-		List<JavacAST> asts = new ArrayList<JavacAST>();
-		
-		for (JCCompilationUnit unit : units.keySet()) asts.add(
-				new JavacAST(trees, processingEnv.getMessager(), processingEnv.getContext(), unit));
-		
-		handlers.skipPrintAST();
-		for (JavacAST ast : asts) {
-			ast.traverse(new AnnotationVisitor());
-			handlers.callASTVisitors(ast);
-		}
-		
-		handlers.skipAllButPrintAST();
-		for (JavacAST ast : asts) {
-			ast.traverse(new AnnotationVisitor());
-		}
-		return false;
-	}
-	
-	private class AnnotationVisitor extends JavacASTAdapter {
-		@Override public void visitAnnotationOnType(JCClassDecl type, JavacNode annotationNode, JCAnnotation annotation) {
-			if (annotationNode.isHandled()) return;
-			JCCompilationUnit top = (JCCompilationUnit) annotationNode.top().get();
-			boolean handled = handlers.handleAnnotation(top, annotationNode, annotation);
-			if (handled) annotationNode.setHandled();
-		}
-		
-		@Override public void visitAnnotationOnField(JCVariableDecl field, JavacNode annotationNode, JCAnnotation annotation) {
-			if (annotationNode.isHandled()) return;
-			JCCompilationUnit top = (JCCompilationUnit) annotationNode.top().get();
-			boolean handled = handlers.handleAnnotation(top, annotationNode, annotation);
-			if (handled) annotationNode.setHandled();
-		}
-		
-		@Override public void visitAnnotationOnMethod(JCMethodDecl method, JavacNode annotationNode, JCAnnotation annotation) {
-			if (annotationNode.isHandled()) return;
-			JCCompilationUnit top = (JCCompilationUnit) annotationNode.top().get();
-			boolean handled = handlers.handleAnnotation(top, annotationNode, annotation);
-			if (handled) annotationNode.setHandled();
-		}
-		
-		@Override public void visitAnnotationOnMethodArgument(JCVariableDecl argument, JCMethodDecl method, JavacNode annotationNode, JCAnnotation annotation) {
-			if (annotationNode.isHandled()) return;
-			JCCompilationUnit top = (JCCompilationUnit) annotationNode.top().get();
-			boolean handled = handlers.handleAnnotation(top, annotationNode, annotation);
-			if (handled) annotationNode.setHandled();
-		}
-		
-		@Override public void visitAnnotationOnLocal(JCVariableDecl local, JavacNode annotationNode, JCAnnotation annotation) {
-			if (annotationNode.isHandled()) return;
-			JCCompilationUnit top = (JCCompilationUnit) annotationNode.top().get();
-			boolean handled = handlers.handleAnnotation(top, annotationNode, annotation);
-			if (handled) annotationNode.setHandled();
-		}
-	}
-	
-	private JCCompilationUnit toUnit(Element element) {
-		TreePath path = trees == null ? null : trees.getPath(element);
-		if (path == null) return null;
-		
-		return (JCCompilationUnit) path.getCompilationUnit();
-	}
-}
diff --git a/src/lombok/javac/apt/package-info.java b/src/lombok/javac/apt/package-info.java
deleted file mode 100644
index 0c47c40f..00000000
--- a/src/lombok/javac/apt/package-info.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/**
- * Contains the mechanism that instruments javac as an annotation processor.
- */
-package lombok.javac.apt;
diff --git a/src/lombok/javac/handlers/HandleCleanup.java b/src/lombok/javac/handlers/HandleCleanup.java
deleted file mode 100644
index 88a8e1d7..00000000
--- a/src/lombok/javac/handlers/HandleCleanup.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.javac.handlers;
-
-import lombok.Cleanup;
-import lombok.core.AnnotationValues;
-import lombok.core.AST.Kind;
-import lombok.javac.JavacAnnotationHandler;
-import lombok.javac.JavacNode;
-
-import org.mangosdk.spi.ProviderFor;
-
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.tree.TreeMaker;
-import com.sun.tools.javac.tree.JCTree.JCAnnotation;
-import com.sun.tools.javac.tree.JCTree.JCAssign;
-import com.sun.tools.javac.tree.JCTree.JCBlock;
-import com.sun.tools.javac.tree.JCTree.JCCase;
-import com.sun.tools.javac.tree.JCTree.JCCatch;
-import com.sun.tools.javac.tree.JCTree.JCExpression;
-import com.sun.tools.javac.tree.JCTree.JCExpressionStatement;
-import com.sun.tools.javac.tree.JCTree.JCFieldAccess;
-import com.sun.tools.javac.tree.JCTree.JCIdent;
-import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
-import com.sun.tools.javac.tree.JCTree.JCStatement;
-import com.sun.tools.javac.tree.JCTree.JCTypeCast;
-import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
-import com.sun.tools.javac.util.List;
-import com.sun.tools.javac.util.Name;
-
-/**
- * Handles the {@code lombok.Cleanup} annotation for javac.
- */
-@ProviderFor(JavacAnnotationHandler.class)
-public class HandleCleanup implements JavacAnnotationHandler<Cleanup> {
-	@Override public boolean handle(AnnotationValues<Cleanup> annotation, JCAnnotation ast, JavacNode annotationNode) {
-		String cleanupName = annotation.getInstance().value();
-		if (cleanupName.length() == 0) {
-			annotationNode.addError("cleanupName cannot be the empty string.");
-			return true;
-		}
-		
-		if (annotationNode.up().getKind() != Kind.LOCAL) {
-			annotationNode.addError("@Cleanup is legal only on local variable declarations.");
-			return true;
-		}
-		
-		JCVariableDecl decl = (JCVariableDecl)annotationNode.up().get();
-		
-		if (decl.init == null) {
-			annotationNode.addError("@Cleanup variable declarations need to be initialized.");
-			return true;
-		}
-		
-		JavacNode ancestor = annotationNode.up().directUp();
-		JCTree blockNode = ancestor.get();
-		
-		final List<JCStatement> statements;
-		if (blockNode instanceof JCBlock) {
-			statements = ((JCBlock)blockNode).stats;
-		} else if (blockNode instanceof JCCase) {
-			statements = ((JCCase)blockNode).stats;
-		} else if (blockNode instanceof JCMethodDecl) {
-			statements = ((JCMethodDecl)blockNode).body.stats;
-		} else {
-			annotationNode.addError("@Cleanup is legal only on a local variable declaration inside a block.");
-			return true;
-		}
-		
-		boolean seenDeclaration = false;
-		List<JCStatement> tryBlock = List.nil();
-		List<JCStatement> newStatements = List.nil();
-		for (JCStatement statement : statements) {
-			if (!seenDeclaration) {
-				if (statement == decl) seenDeclaration = true;
-				newStatements = newStatements.append(statement);
-			} else {
-				tryBlock = tryBlock.append(statement);
-			}
-		}
-		
-		if (!seenDeclaration) {
-			annotationNode.addError("LOMBOK BUG: Can't find this local variable declaration inside its parent.");
-			return true;
-		}
-		
-		doAssignmentCheck(annotationNode, tryBlock, decl.name);
-		
-		TreeMaker maker = annotationNode.getTreeMaker();
-		JCFieldAccess cleanupCall = maker.Select(maker.Ident(decl.name), annotationNode.toName(cleanupName));
-		List<JCStatement> finalizerBlock = List.<JCStatement>of(maker.Exec(
-				maker.Apply(List.<JCExpression>nil(), cleanupCall, List.<JCExpression>nil())));
-		
-		JCBlock finalizer = maker.Block(0, finalizerBlock);
-		newStatements = newStatements.append(maker.Try(maker.Block(0, tryBlock), List.<JCCatch>nil(), finalizer));
-		
-		if (blockNode instanceof JCBlock) {
-			((JCBlock)blockNode).stats = newStatements;
-		} else if (blockNode instanceof JCCase) {
-			((JCCase)blockNode).stats = newStatements;
-		} else if (blockNode instanceof JCMethodDecl) {
-			((JCMethodDecl)blockNode).body.stats = newStatements;
-		} else throw new AssertionError("Should not get here");
-		
-		ancestor.rebuild();
-		
-		return true;
-	}
-	
-	private void doAssignmentCheck(JavacNode node, List<JCStatement> statements, Name name) {
-		for (JCStatement statement : statements) doAssignmentCheck0(node, statement, name);
-	}
-	
-	private void doAssignmentCheck0(JavacNode node, JCTree statement, Name name) {
-		if (statement instanceof JCAssign) doAssignmentCheck0(node, ((JCAssign)statement).rhs, name);
-		if (statement instanceof JCExpressionStatement) doAssignmentCheck0(node,
-				((JCExpressionStatement)statement).expr, name);
-		if (statement instanceof JCVariableDecl) doAssignmentCheck0(node, ((JCVariableDecl)statement).init, name);
-		if (statement instanceof JCTypeCast) doAssignmentCheck0(node, ((JCTypeCast)statement).expr, name);
-		if (statement instanceof JCIdent) {
-			if (((JCIdent)statement).name.contentEquals(name)) {
-				JavacNode problemNode = node.getNodeFor(statement);
-				if (problemNode != null) problemNode.addWarning(
-				"You're assigning an auto-cleanup variable to something else. This is a bad idea.");
-			}
-		}
-	}
-}
diff --git a/src/lombok/javac/handlers/HandleData.java b/src/lombok/javac/handlers/HandleData.java
deleted file mode 100644
index eef7f78d..00000000
--- a/src/lombok/javac/handlers/HandleData.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.javac.handlers;
-
-import static lombok.javac.handlers.JavacHandlerUtil.*;
-
-import java.lang.reflect.Modifier;
-
-import lombok.Data;
-import lombok.core.AnnotationValues;
-import lombok.core.TransformationsUtil;
-import lombok.core.AST.Kind;
-import lombok.javac.JavacAnnotationHandler;
-import lombok.javac.JavacNode;
-import lombok.javac.handlers.JavacHandlerUtil.MemberExistsResult;
-
-import org.mangosdk.spi.ProviderFor;
-
-import com.sun.tools.javac.code.Flags;
-import com.sun.tools.javac.tree.TreeMaker;
-import com.sun.tools.javac.tree.JCTree.JCAnnotation;
-import com.sun.tools.javac.tree.JCTree.JCAssign;
-import com.sun.tools.javac.tree.JCTree.JCBlock;
-import com.sun.tools.javac.tree.JCTree.JCClassDecl;
-import com.sun.tools.javac.tree.JCTree.JCExpression;
-import com.sun.tools.javac.tree.JCTree.JCFieldAccess;
-import com.sun.tools.javac.tree.JCTree.JCIdent;
-import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
-import com.sun.tools.javac.tree.JCTree.JCModifiers;
-import com.sun.tools.javac.tree.JCTree.JCReturn;
-import com.sun.tools.javac.tree.JCTree.JCStatement;
-import com.sun.tools.javac.tree.JCTree.JCTypeApply;
-import com.sun.tools.javac.tree.JCTree.JCTypeParameter;
-import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
-import com.sun.tools.javac.util.List;
-
-/**
- * Handles the {@code lombok.Data} annotation for javac.
- */
-@ProviderFor(JavacAnnotationHandler.class)
-public class HandleData implements JavacAnnotationHandler<Data> {
-	@Override public boolean handle(AnnotationValues<Data> annotation, JCAnnotation ast, JavacNode annotationNode) {
-		JavacNode typeNode = annotationNode.up();
-		JCClassDecl typeDecl = null;
-		if (typeNode.get() instanceof JCClassDecl) typeDecl = (JCClassDecl)typeNode.get();
-		long flags = typeDecl == null ? 0 : typeDecl.mods.flags;
-		boolean notAClass = (flags & (Flags.INTERFACE | Flags.ENUM | Flags.ANNOTATION)) != 0;
-		
-		if (typeDecl == null || notAClass) {
-			annotationNode.addError("@Data is only supported on a class.");
-			return false;
-		}
-		
-		List<JavacNode> nodesForConstructor = List.nil();
-		for (JavacNode child : typeNode.down()) {
-			if (child.getKind() != Kind.FIELD) continue;
-			JCVariableDecl fieldDecl = (JCVariableDecl) child.get();
-			//Skip fields that start with $
-			if (fieldDecl.name.toString().startsWith("$")) continue;
-			long fieldFlags = fieldDecl.mods.flags;
-			//Skip static fields.
-			if ((fieldFlags & Flags.STATIC) != 0) continue;
-			boolean isFinal = (fieldFlags & Flags.FINAL) != 0;
-			boolean isNonNull = !findAnnotations(child, TransformationsUtil.NON_NULL_PATTERN).isEmpty();
-			if ((isFinal || isNonNull) && fieldDecl.init == null) nodesForConstructor = nodesForConstructor.append(child);
-			new HandleGetter().generateGetterForField(child, annotationNode.get());
-			if (!isFinal) new HandleSetter().generateSetterForField(child, annotationNode.get());
-		}
-		
-		new HandleToString().generateToStringForType(typeNode, annotationNode);
-		new HandleEqualsAndHashCode().generateEqualsAndHashCodeForType(typeNode, annotationNode);
-		
-		String staticConstructorName = annotation.getInstance().staticConstructor();
-		
-		if (constructorExists(typeNode) == MemberExistsResult.NOT_EXISTS) {
-			JCMethodDecl constructor = createConstructor(staticConstructorName.equals(""), typeNode, nodesForConstructor);
-			injectMethod(typeNode, constructor);
-		}
-		
-		if (!staticConstructorName.isEmpty() && methodExists("of", typeNode) == MemberExistsResult.NOT_EXISTS) {
-			JCMethodDecl staticConstructor = createStaticConstructor(staticConstructorName, typeNode, nodesForConstructor);
-			injectMethod(typeNode, staticConstructor);
-		}
-		
-		return true;
-	}
-	
-	private JCMethodDecl createConstructor(boolean isPublic, JavacNode typeNode, List<JavacNode> fields) {
-		TreeMaker maker = typeNode.getTreeMaker();
-		JCClassDecl type = (JCClassDecl) typeNode.get();
-		
-		List<JCStatement> nullChecks = List.nil();
-		List<JCStatement> assigns = List.nil();
-		List<JCVariableDecl> params = List.nil();
-		
-		for (JavacNode fieldNode : fields) {
-			JCVariableDecl field = (JCVariableDecl) fieldNode.get();
-			List<JCAnnotation> nonNulls = findAnnotations(fieldNode, TransformationsUtil.NON_NULL_PATTERN);
-			List<JCAnnotation> nullables = findAnnotations(fieldNode, TransformationsUtil.NULLABLE_PATTERN);
-			JCVariableDecl param = maker.VarDef(maker.Modifiers(Flags.FINAL, nonNulls.appendList(nullables)), field.name, field.vartype, null);
-			params = params.append(param);
-			JCFieldAccess thisX = maker.Select(maker.Ident(fieldNode.toName("this")), field.name);
-			JCAssign assign = maker.Assign(thisX, maker.Ident(field.name));
-			assigns = assigns.append(maker.Exec(assign));
-			
-			if (!nonNulls.isEmpty()) {
-				JCStatement nullCheck = generateNullCheck(maker, fieldNode);
-				if (nullCheck != null) nullChecks = nullChecks.append(nullCheck);
-			}
-		}
-		
-		JCModifiers mods = maker.Modifiers(isPublic ? Modifier.PUBLIC : Modifier.PRIVATE);
-		return maker.MethodDef(mods, typeNode.toName("<init>"),
-				null, type.typarams, params, List.<JCExpression>nil(), maker.Block(0L, nullChecks.appendList(assigns)), null);
-	}
-	
-	private JCMethodDecl createStaticConstructor(String name, JavacNode typeNode, List<JavacNode> fields) {
-		TreeMaker maker = typeNode.getTreeMaker();
-		JCClassDecl type = (JCClassDecl) typeNode.get();
-		
-		JCModifiers mods = maker.Modifiers(Flags.STATIC | Flags.PUBLIC);
-		
-		JCExpression returnType, constructorType;
-		
-		List<JCTypeParameter> typeParams = List.nil();
-		List<JCVariableDecl> params = List.nil();
-		List<JCExpression> typeArgs1 = List.nil();
-		List<JCExpression> typeArgs2 = List.nil();
-		List<JCExpression> args = List.nil();
-		
-		if (!type.typarams.isEmpty()) {
-			for (JCTypeParameter param : type.typarams) {
-				typeArgs1 = typeArgs1.append(maker.Ident(param.name));
-				typeArgs2 = typeArgs2.append(maker.Ident(param.name));
-				typeParams = typeParams.append(maker.TypeParameter(param.name, param.bounds));
-			}
-			returnType = maker.TypeApply(maker.Ident(type.name), typeArgs1);
-			constructorType = maker.TypeApply(maker.Ident(type.name), typeArgs2);
-		} else {
-			returnType = maker.Ident(type.name);
-			constructorType = maker.Ident(type.name);
-		}
-		
-		for (JavacNode fieldNode : fields) {
-			JCVariableDecl field = (JCVariableDecl) fieldNode.get();
-			JCExpression pType;
-			if (field.vartype instanceof JCIdent) pType = maker.Ident(((JCIdent)field.vartype).name);
-			else if (field.vartype instanceof JCTypeApply) {
-				JCTypeApply typeApply = (JCTypeApply) field.vartype;
-				List<JCExpression> tArgs = List.nil();
-				for (JCExpression arg : typeApply.arguments) tArgs = tArgs.append(arg);
-				pType = maker.TypeApply(typeApply.clazz, tArgs);
-			} else {
-				pType = field.vartype;
-			}
-			List<JCAnnotation> nonNulls = findAnnotations(fieldNode, TransformationsUtil.NON_NULL_PATTERN);
-			List<JCAnnotation> nullables = findAnnotations(fieldNode, TransformationsUtil.NULLABLE_PATTERN);
-			JCVariableDecl param = maker.VarDef(maker.Modifiers(Flags.FINAL, nonNulls.appendList(nullables)), field.name, pType, null);
-			params = params.append(param);
-			args = args.append(maker.Ident(field.name));
-		}
-		JCReturn returnStatement = maker.Return(maker.NewClass(null, List.<JCExpression>nil(), constructorType, args, null));
-		JCBlock body = maker.Block(0, List.<JCStatement>of(returnStatement));
-		
-		return maker.MethodDef(mods, typeNode.toName(name), returnType, typeParams, params, List.<JCExpression>nil(), body, null);
-	}
-}
diff --git a/src/lombok/javac/handlers/HandleEqualsAndHashCode.java b/src/lombok/javac/handlers/HandleEqualsAndHashCode.java
deleted file mode 100644
index 61a4ef63..00000000
--- a/src/lombok/javac/handlers/HandleEqualsAndHashCode.java
+++ /dev/null
@@ -1,447 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.javac.handlers;
-
-import static lombok.javac.handlers.JavacHandlerUtil.*;
-import lombok.EqualsAndHashCode;
-import lombok.core.AnnotationValues;
-import lombok.core.AST.Kind;
-import lombok.javac.Javac;
-import lombok.javac.JavacAnnotationHandler;
-import lombok.javac.JavacNode;
-
-import org.mangosdk.spi.ProviderFor;
-
-import com.sun.tools.javac.code.BoundKind;
-import com.sun.tools.javac.code.Flags;
-import com.sun.tools.javac.code.TypeTags;
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.tree.TreeMaker;
-import com.sun.tools.javac.tree.JCTree.JCAnnotation;
-import com.sun.tools.javac.tree.JCTree.JCArrayTypeTree;
-import com.sun.tools.javac.tree.JCTree.JCBinary;
-import com.sun.tools.javac.tree.JCTree.JCBlock;
-import com.sun.tools.javac.tree.JCTree.JCClassDecl;
-import com.sun.tools.javac.tree.JCTree.JCExpression;
-import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
-import com.sun.tools.javac.tree.JCTree.JCMethodInvocation;
-import com.sun.tools.javac.tree.JCTree.JCModifiers;
-import com.sun.tools.javac.tree.JCTree.JCPrimitiveTypeTree;
-import com.sun.tools.javac.tree.JCTree.JCStatement;
-import com.sun.tools.javac.tree.JCTree.JCTypeParameter;
-import com.sun.tools.javac.tree.JCTree.JCUnary;
-import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
-import com.sun.tools.javac.util.List;
-import com.sun.tools.javac.util.Name;
-
-/**
- * Handles the {@code lombok.EqualsAndHashCode} annotation for javac.
- */
-@ProviderFor(JavacAnnotationHandler.class)
-public class HandleEqualsAndHashCode implements JavacAnnotationHandler<EqualsAndHashCode> {
-	private void checkForBogusFieldNames(JavacNode type, AnnotationValues<EqualsAndHashCode> annotation) {
-		if (annotation.isExplicit("exclude")) {
-			for (int i : createListOfNonExistentFields(List.from(annotation.getInstance().exclude()), type, true, true)) {
-				annotation.setWarning("exclude", "This field does not exist, or would have been excluded anyway.", i);
-			}
-		}
-		if (annotation.isExplicit("of")) {
-			for (int i : createListOfNonExistentFields(List.from(annotation.getInstance().of()), type, false, false)) {
-				annotation.setWarning("of", "This field does not exist.", i);
-			}
-		}
-	}
-	
-	@Override public boolean handle(AnnotationValues<EqualsAndHashCode> annotation, JCAnnotation ast, JavacNode annotationNode) {
-		EqualsAndHashCode ann = annotation.getInstance();
-		List<String> excludes = List.from(ann.exclude());
-		List<String> includes = List.from(ann.of());
-		JavacNode typeNode = annotationNode.up();
-		
-		checkForBogusFieldNames(typeNode, annotation);
-		
-		Boolean callSuper = ann.callSuper();
-		if (!annotation.isExplicit("callSuper")) callSuper = null;
-		if (!annotation.isExplicit("exclude")) excludes = null;
-		if (!annotation.isExplicit("of")) includes = null;
-		
-		if (excludes != null && includes != null) {
-			excludes = null;
-			annotation.setWarning("exclude", "exclude and of are mutually exclusive; the 'exclude' parameter will be ignored.");
-		}
-		
-		return generateMethods(typeNode, annotationNode, excludes, includes, callSuper, true);
-	}
-	
-	public void generateEqualsAndHashCodeForType(JavacNode typeNode, JavacNode errorNode) {
-		for (JavacNode child : typeNode.down()) {
-			if (child.getKind() == Kind.ANNOTATION) {
-				if (Javac.annotationTypeMatches(EqualsAndHashCode.class, child)) {
-					//The annotation will make it happen, so we can skip it.
-					return;
-				}
-			}
-		}
-		
-		generateMethods(typeNode, errorNode, null, null, null, false);
-	}
-	
-	private boolean generateMethods(JavacNode typeNode, JavacNode errorNode, List<String> excludes, List<String> includes,
-			Boolean callSuper, boolean whineIfExists) {
-		boolean notAClass = true;
-		if (typeNode.get() instanceof JCClassDecl) {
-			long flags = ((JCClassDecl)typeNode.get()).mods.flags;
-			notAClass = (flags & (Flags.INTERFACE | Flags.ANNOTATION | Flags.ENUM)) != 0;
-		}
-		
-		if (notAClass) {
-			errorNode.addError("@EqualsAndHashCode is only supported on a class.");
-			return false;
-		}
-		
-		boolean isDirectDescendantOfObject = true;
-		boolean implicitCallSuper = callSuper == null;
-		if (callSuper == null) {
-			try {
-				callSuper = ((Boolean)EqualsAndHashCode.class.getMethod("callSuper").getDefaultValue()).booleanValue();
-			} catch (Exception ignore) {
-				throw new InternalError("Lombok bug - this cannot happen - can't find callSuper field in EqualsAndHashCode annotation.");
-			}
-		}
-		
-		JCTree extending = ((JCClassDecl)typeNode.get()).extending;
-		if (extending != null) {
-			String p = extending.toString();
-			isDirectDescendantOfObject = p.equals("Object") || p.equals("java.lang.Object");
-		}
-		
-		if (isDirectDescendantOfObject && callSuper) {
-			errorNode.addError("Generating equals/hashCode with a supercall to java.lang.Object is pointless.");
-			return true;
-		}
-		
-		if (!isDirectDescendantOfObject && !callSuper && implicitCallSuper) {
-			errorNode.addWarning("Generating equals/hashCode implementation but without a call to superclass, even though this class does not extend java.lang.Object. If this is intentional, add '@EqualsAndHashCode(callSuper=false)' to your type.");
-		}
-		
-		List<JavacNode> nodesForEquality = List.nil();
-		if (includes != null) {
-			for (JavacNode child : typeNode.down()) {
-				if (child.getKind() != Kind.FIELD) continue;
-				JCVariableDecl fieldDecl = (JCVariableDecl) child.get();
-				if (includes.contains(fieldDecl.name.toString())) nodesForEquality = nodesForEquality.append(child);
-			}
-		} else {
-			for (JavacNode child : typeNode.down()) {
-				if (child.getKind() != Kind.FIELD) continue;
-				JCVariableDecl fieldDecl = (JCVariableDecl) child.get();
-				//Skip static fields.
-				if ((fieldDecl.mods.flags & Flags.STATIC) != 0) continue;
-				//Skip transient fields.
-				if ((fieldDecl.mods.flags & Flags.TRANSIENT) != 0) continue;
-				//Skip excluded fields.
-				if (excludes != null && excludes.contains(fieldDecl.name.toString())) continue;
-				//Skip fields that start with $
-				if (fieldDecl.name.toString().startsWith("$")) continue;
-				nodesForEquality = nodesForEquality.append(child);
-			}
-		}
-		
-		switch (methodExists("hashCode", typeNode)) {
-		case NOT_EXISTS:
-			JCMethodDecl method = createHashCode(typeNode, nodesForEquality, callSuper);
-			injectMethod(typeNode, method);
-			break;
-		case EXISTS_BY_LOMBOK:
-			break;
-		default:
-		case EXISTS_BY_USER:
-			if (whineIfExists) {
-				errorNode.addWarning("Not generating hashCode(): A method with that name already exists");
-			}
-			break;
-		}
-		
-		switch (methodExists("equals", typeNode)) {
-		case NOT_EXISTS:
-			JCMethodDecl method = createEquals(typeNode, nodesForEquality, callSuper);
-			injectMethod(typeNode, method);
-			break;
-		case EXISTS_BY_LOMBOK:
-			break;
-		default:
-		case EXISTS_BY_USER:
-			if (whineIfExists) {
-				errorNode.addWarning("Not generating equals(Object other): A method with that name already exists");
-			}
-			break;
-		}
-		
-		return true;
-	}
-	
-	private JCMethodDecl createHashCode(JavacNode typeNode, List<JavacNode> fields, boolean callSuper) {
-		TreeMaker maker = typeNode.getTreeMaker();
-		
-		JCAnnotation overrideAnnotation = maker.Annotation(chainDots(maker, typeNode, "java", "lang", "Override"), List.<JCExpression>nil());
-		JCModifiers mods = maker.Modifiers(Flags.PUBLIC, List.of(overrideAnnotation));
-		JCExpression returnType = maker.TypeIdent(TypeTags.INT);
-		List<JCStatement> statements = List.nil();
-		
-		Name primeName = typeNode.toName("PRIME");
-		Name resultName = typeNode.toName("result");
-		/* final int PRIME = 31; */ {
-			if (!fields.isEmpty() || callSuper) {
-				statements = statements.append(maker.VarDef(maker.Modifiers(Flags.FINAL),
-						primeName, maker.TypeIdent(TypeTags.INT), maker.Literal(31)));
-			}
-		}
-		
-		/* int result = 1; */ {
-			statements = statements.append(maker.VarDef(maker.Modifiers(0), resultName, maker.TypeIdent(TypeTags.INT), maker.Literal(1)));
-		}
-		
-		List<JCExpression> intoResult = List.nil();
-		
-		if (callSuper) {
-			JCMethodInvocation callToSuper = maker.Apply(List.<JCExpression>nil(),
-					maker.Select(maker.Ident(typeNode.toName("super")), typeNode.toName("hashCode")),
-					List.<JCExpression>nil());
-			intoResult = intoResult.append(callToSuper);
-		}
-		
-		int tempCounter = 0;
-		for (JavacNode fieldNode : fields) {
-			JCVariableDecl field = (JCVariableDecl) fieldNode.get();
-			JCExpression fType = field.vartype;
-			JCExpression thisDotField = maker.Select(maker.Ident(typeNode.toName("this")), field.name);
-			JCExpression thisDotFieldClone = maker.Select(maker.Ident(typeNode.toName("this")), field.name);
-			if (fType instanceof JCPrimitiveTypeTree) {
-				switch (((JCPrimitiveTypeTree)fType).getPrimitiveTypeKind()) {
-				case BOOLEAN:
-					/* this.fieldName ? 1231 : 1237 */
-					intoResult = intoResult.append(maker.Conditional(thisDotField, maker.Literal(1231), maker.Literal(1237)));
-					break;
-				case LONG:
-					intoResult = intoResult.append(longToIntForHashCode(maker, thisDotField, thisDotFieldClone));
-					break;
-				case FLOAT:
-					/* Float.floatToIntBits(this.fieldName) */
-					intoResult = intoResult.append(maker.Apply(
-							List.<JCExpression>nil(),
-							chainDots(maker, typeNode, "java", "lang", "Float", "floatToIntBits"),
-							List.of(thisDotField)));
-					break;
-				case DOUBLE:
-					/* longToIntForHashCode(Double.doubleToLongBits(this.fieldName)) */
-					Name tempVar = typeNode.toName("temp" + (++tempCounter));
-					JCExpression init = maker.Apply(
-							List.<JCExpression>nil(),
-							chainDots(maker, typeNode, "java", "lang", "Double", "doubleToLongBits"),
-							List.of(thisDotField));
-					statements = statements.append(
-							maker.VarDef(maker.Modifiers(Flags.FINAL), tempVar, maker.TypeIdent(TypeTags.LONG), init));
-					intoResult = intoResult.append(longToIntForHashCode(maker, maker.Ident(tempVar), maker.Ident(tempVar)));
-					break;
-				default:
-				case BYTE:
-				case SHORT:
-				case INT:
-				case CHAR:
-					/* just the field */
-					intoResult = intoResult.append(thisDotField);
-					break;
-				}
-			} else if (fType instanceof JCArrayTypeTree) {
-				/* java.util.Arrays.deepHashCode(this.fieldName) //use just hashCode() for primitive arrays. */
-				boolean multiDim = ((JCArrayTypeTree)fType).elemtype instanceof JCArrayTypeTree;
-				boolean primitiveArray = ((JCArrayTypeTree)fType).elemtype instanceof JCPrimitiveTypeTree;
-				boolean useDeepHC = multiDim || !primitiveArray;
-				
-				JCExpression hcMethod = chainDots(maker, typeNode, "java", "util", "Arrays", useDeepHC ? "deepHashCode" : "hashCode");
-				intoResult = intoResult.append(
-						maker.Apply(List.<JCExpression>nil(), hcMethod, List.of(thisDotField)));
-			} else /* objects */ {
-				/* this.fieldName == null ? 0 : this.fieldName.hashCode() */
-				JCExpression hcCall = maker.Apply(List.<JCExpression>nil(), maker.Select(thisDotField, typeNode.toName("hashCode")),
-						List.<JCExpression>nil());
-				JCExpression thisEqualsNull = maker.Binary(JCTree.EQ, thisDotField, maker.Literal(TypeTags.BOT, null));
-				intoResult = intoResult.append(
-						maker.Conditional(thisEqualsNull, maker.Literal(0), hcCall));
-			}
-		}
-		
-		/* fold each intoResult entry into:
-		   result = result * PRIME + (item); */
-		for (JCExpression expr : intoResult) {
-			JCExpression mult = maker.Binary(JCTree.MUL, maker.Ident(resultName), maker.Ident(primeName));
-			JCExpression add = maker.Binary(JCTree.PLUS, mult, expr);
-			statements = statements.append(maker.Exec(maker.Assign(maker.Ident(resultName), add)));
-		}
-		
-		/* return result; */ {
-			statements = statements.append(maker.Return(maker.Ident(resultName)));
-		}
-		
-		JCBlock body = maker.Block(0, statements);
-		return maker.MethodDef(mods, typeNode.toName("hashCode"), returnType,
-				List.<JCTypeParameter>nil(), List.<JCVariableDecl>nil(), List.<JCExpression>nil(), body, null);
-	}
-	
-	/** The 2 references must be clones of each other. */
-	private JCExpression longToIntForHashCode(TreeMaker maker, JCExpression ref1, JCExpression ref2) {
-		/* (int)(ref >>> 32 ^ ref) */
-		JCExpression shift = maker.Binary(JCTree.USR, ref1, maker.Literal(32));
-		JCExpression xorBits = maker.Binary(JCTree.BITXOR, shift, ref2);
-		return maker.TypeCast(maker.TypeIdent(TypeTags.INT), xorBits);
-	}
-	
-	private JCMethodDecl createEquals(JavacNode typeNode, List<JavacNode> fields, boolean callSuper) {
-		TreeMaker maker = typeNode.getTreeMaker();
-		JCClassDecl type = (JCClassDecl) typeNode.get();
-		
-		Name oName = typeNode.toName("o");
-		Name otherName = typeNode.toName("other");
-		Name thisName = typeNode.toName("this");
-		
-		JCAnnotation overrideAnnotation = maker.Annotation(chainDots(maker, typeNode, "java", "lang", "Override"), List.<JCExpression>nil());
-		JCModifiers mods = maker.Modifiers(Flags.PUBLIC, List.of(overrideAnnotation));
-		JCExpression objectType = maker.Type(typeNode.getSymbolTable().objectType);
-		JCExpression returnType = maker.TypeIdent(TypeTags.BOOLEAN);
-		
-		List<JCStatement> statements = List.nil();
-		List<JCVariableDecl> params = List.of(maker.VarDef(maker.Modifiers(Flags.FINAL), oName, objectType, null));
-		
-		/* if (o == this) return true; */ {
-			statements = statements.append(maker.If(maker.Binary(JCTree.EQ, maker.Ident(oName),
-					maker.Ident(thisName)), returnBool(maker, true), null));
-		}
-		
-		/* if (o == null) return false; */ {
-			statements = statements.append(maker.If(maker.Binary(JCTree.EQ, maker.Ident(oName),
-					maker.Literal(TypeTags.BOT, null)), returnBool(maker, false), null));
-		}
-		
-		/* if (o.getClass() != this.getClass()) return false; */ {
-			Name getClass = typeNode.toName("getClass");
-			List<JCExpression> exprNil = List.nil();
-			JCExpression oGetClass = maker.Apply(exprNil, maker.Select(maker.Ident(oName), getClass), exprNil);
-			JCExpression thisGetClass = maker.Apply(exprNil, maker.Select(maker.Ident(thisName), getClass), exprNil);
-			statements = statements.append(
-					maker.If(maker.Binary(JCTree.NE, oGetClass, thisGetClass), returnBool(maker, false), null));
-		}
-		
-		/* if (!super.equals(o)) return false; */
-		if (callSuper) {
-			JCMethodInvocation callToSuper = maker.Apply(List.<JCExpression>nil(),
-					maker.Select(maker.Ident(typeNode.toName("super")), typeNode.toName("equals")),
-					List.<JCExpression>of(maker.Ident(oName)));
-			JCUnary superNotEqual = maker.Unary(JCTree.NOT, callToSuper);
-			statements = statements.append(maker.If(superNotEqual, returnBool(maker, false), null));
-		}
-		
-		/* MyType<?> other = (MyType<?>) o; */ {
-			final JCExpression selfType1, selfType2;
-			List<JCExpression> wildcards1 = List.nil();
-			List<JCExpression> wildcards2 = List.nil();
-			for (int i = 0 ; i < type.typarams.length() ; i++) {
-				wildcards1 = wildcards1.append(maker.Wildcard(maker.TypeBoundKind(BoundKind.UNBOUND), null));
-				wildcards2 = wildcards2.append(maker.Wildcard(maker.TypeBoundKind(BoundKind.UNBOUND), null));
-			}
-			
-			if (type.typarams.isEmpty()) {
-				selfType1 = maker.Ident(type.name);
-				selfType2 = maker.Ident(type.name);
-			} else {
-				selfType1 = maker.TypeApply(maker.Ident(type.name), wildcards1);
-				selfType2 = maker.TypeApply(maker.Ident(type.name), wildcards2);
-			}
-			
-			statements = statements.append(
-					maker.VarDef(maker.Modifiers(Flags.FINAL), otherName, selfType1, maker.TypeCast(selfType2, maker.Ident(oName))));
-		}
-		
-		for (JavacNode fieldNode : fields) {
-			JCVariableDecl field = (JCVariableDecl) fieldNode.get();
-			JCExpression fType = field.vartype;
-			JCExpression thisDotField = maker.Select(maker.Ident(thisName), field.name);
-			JCExpression otherDotField = maker.Select(maker.Ident(otherName), field.name);
-			if (fType instanceof JCPrimitiveTypeTree) {
-				switch (((JCPrimitiveTypeTree)fType).getPrimitiveTypeKind()) {
-				case FLOAT:
-					/* if (Float.compare(this.fieldName, other.fieldName) != 0) return false; */
-					statements = statements.append(generateCompareFloatOrDouble(thisDotField, otherDotField, maker, typeNode, false));
-					break;
-				case DOUBLE:
-					/* if (Double(this.fieldName, other.fieldName) != 0) return false; */
-					statements = statements.append(generateCompareFloatOrDouble(thisDotField, otherDotField, maker, typeNode, true));
-					break;
-				default:
-					/* if (this.fieldName != other.fieldName) return false; */
-					statements = statements.append(
-							maker.If(maker.Binary(JCTree.NE, thisDotField, otherDotField), returnBool(maker, false), null));
-					break;
-				}
-			} else if (fType instanceof JCArrayTypeTree) {
-				/* if (!java.util.Arrays.deepEquals(this.fieldName, other.fieldName)) return false; //use equals for primitive arrays. */
-				boolean multiDim = ((JCArrayTypeTree)fType).elemtype instanceof JCArrayTypeTree;
-				boolean primitiveArray = ((JCArrayTypeTree)fType).elemtype instanceof JCPrimitiveTypeTree;
-				boolean useDeepEquals = multiDim || !primitiveArray;
-				
-				JCExpression eqMethod = chainDots(maker, typeNode, "java", "util", "Arrays", useDeepEquals ? "deepEquals" : "equals");
-				List<JCExpression> args = List.of(thisDotField, otherDotField);
-				statements = statements.append(maker.If(maker.Unary(JCTree.NOT,
-						maker.Apply(List.<JCExpression>nil(), eqMethod, args)), returnBool(maker, false), null));
-			} else /* objects */ {
-				/* if (this.fieldName == null ? other.fieldName != null : !this.fieldName.equals(other.fieldName)) return false; */
-				JCExpression thisEqualsNull = maker.Binary(JCTree.EQ, thisDotField, maker.Literal(TypeTags.BOT, null));
-				JCExpression otherNotEqualsNull = maker.Binary(JCTree.NE, otherDotField, maker.Literal(TypeTags.BOT, null));
-				JCExpression thisEqualsThat = maker.Apply(
-						List.<JCExpression>nil(), maker.Select(thisDotField, typeNode.toName("equals")), List.of(otherDotField));
-				JCExpression fieldsAreNotEqual = maker.Conditional(thisEqualsNull, otherNotEqualsNull, maker.Unary(JCTree.NOT, thisEqualsThat));
-				statements = statements.append(maker.If(fieldsAreNotEqual, returnBool(maker, false), null));
-			}
-		}
-		
-		/* return true; */ {
-			statements = statements.append(returnBool(maker, true));
-		}
-		
-		JCBlock body = maker.Block(0, statements);
-		return maker.MethodDef(mods, typeNode.toName("equals"), returnType, List.<JCTypeParameter>nil(), params, List.<JCExpression>nil(), body, null);
-	}
-	
-	private JCStatement generateCompareFloatOrDouble(JCExpression thisDotField, JCExpression otherDotField,
-			TreeMaker maker, JavacNode node, boolean isDouble) {
-		/* if (Float.compare(fieldName, other.fieldName) != 0) return false; */
-		JCExpression clazz = chainDots(maker, node, "java", "lang", isDouble ? "Double" : "Float");
-		List<JCExpression> args = List.of(thisDotField, otherDotField);
-		JCBinary compareCallEquals0 = maker.Binary(JCTree.NE, maker.Apply(
-				List.<JCExpression>nil(), maker.Select(clazz, node.toName("compare")), args), maker.Literal(0));
-		return maker.If(compareCallEquals0, returnBool(maker, false), null);
-	}
-	
-	private JCStatement returnBool(TreeMaker maker, boolean bool) {
-		return maker.Return(maker.Literal(TypeTags.BOOLEAN, bool ? 1 : 0));
-	}
-	
-}
diff --git a/src/lombok/javac/handlers/HandleGetter.java b/src/lombok/javac/handlers/HandleGetter.java
deleted file mode 100644
index e60e426d..00000000
--- a/src/lombok/javac/handlers/HandleGetter.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.javac.handlers;
-
-import static lombok.javac.handlers.JavacHandlerUtil.*;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.core.AnnotationValues;
-import lombok.core.TransformationsUtil;
-import lombok.core.AST.Kind;
-import lombok.javac.Javac;
-import lombok.javac.JavacAnnotationHandler;
-import lombok.javac.JavacNode;
-
-import org.mangosdk.spi.ProviderFor;
-
-import com.sun.tools.javac.code.Flags;
-import com.sun.tools.javac.tree.TreeMaker;
-import com.sun.tools.javac.tree.JCTree.JCAnnotation;
-import com.sun.tools.javac.tree.JCTree.JCBlock;
-import com.sun.tools.javac.tree.JCTree.JCExpression;
-import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
-import com.sun.tools.javac.tree.JCTree.JCStatement;
-import com.sun.tools.javac.tree.JCTree.JCTypeParameter;
-import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
-import com.sun.tools.javac.util.List;
-import com.sun.tools.javac.util.Name;
-import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
-
-/**
- * Handles the {@code lombok.Getter} annotation for javac.
- */
-@ProviderFor(JavacAnnotationHandler.class)
-public class HandleGetter implements JavacAnnotationHandler<Getter> {
-	/**
-	 * Generates a getter on the stated field.
-	 * 
-	 * Used by {@link HandleData}.
-	 * 
-	 * The difference between this call and the handle method is as follows:
-	 * 
-	 * If there is a {@code lombok.Getter} annotation on the field, it is used and the
-	 * same rules apply (e.g. warning if the method already exists, stated access level applies).
-	 * If not, the getter is still generated if it isn't already there, though there will not
-	 * be a warning if its already there. The default access level is used.
-	 * 
-	 * @param fieldNode The node representing the field you want a getter for.
-	 * @param pos The node responsible for generating the getter (the {@code @Data} or {@code @Getter} annotation).
-	 */
-	public void generateGetterForField(JavacNode fieldNode, DiagnosticPosition pos) {
-		for (JavacNode child : fieldNode.down()) {
-			if (child.getKind() == Kind.ANNOTATION) {
-				if (Javac.annotationTypeMatches(Getter.class, child)) {
-					//The annotation will make it happen, so we can skip it.
-					return;
-				}
-			}
-		}
-		
-		createGetterForField(AccessLevel.PUBLIC, fieldNode, fieldNode, false);
-	}
-	
-	@Override public boolean handle(AnnotationValues<Getter> annotation, JCAnnotation ast, JavacNode annotationNode) {
-		JavacNode fieldNode = annotationNode.up();
-		AccessLevel level = annotation.getInstance().value();
-		if (level == AccessLevel.NONE) return true;
-		
-		return createGetterForField(level, fieldNode, annotationNode, true);
-	}
-	
-	private boolean createGetterForField(AccessLevel level,
-			JavacNode fieldNode, JavacNode errorNode, boolean whineIfExists) {
-		if (fieldNode.getKind() != Kind.FIELD) {
-			errorNode.addError("@Getter is only supported on a field.");
-			return true;
-		}
-		
-		JCVariableDecl fieldDecl = (JCVariableDecl)fieldNode.get();
-		String methodName = toGetterName(fieldDecl);
-		
-		for (String altName : toAllGetterNames(fieldDecl)) {
-			switch (methodExists(altName, fieldNode)) {
-			case EXISTS_BY_LOMBOK:
-				return true;
-			case EXISTS_BY_USER:
-				if (whineIfExists) {
-					String altNameExpl = "";
-					if (!altName.equals(methodName)) altNameExpl = String.format(" (%s)", altName);
-					errorNode.addWarning(
-						String.format("Not generating %s(): A method with that name already exists%s", methodName, altNameExpl));
-				}
-				return true;
-			default:
-			case NOT_EXISTS:
-				//continue scanning the other alt names.
-			}
-		}
-		
-		long access = toJavacModifier(level) | (fieldDecl.mods.flags & Flags.STATIC);
-		
-		injectMethod(fieldNode.up(), createGetter(access, fieldNode, fieldNode.getTreeMaker()));
-		
-		return true;
-	}
-	
-	private JCMethodDecl createGetter(long access, JavacNode field, TreeMaker treeMaker) {
-		JCVariableDecl fieldNode = (JCVariableDecl) field.get();
-		JCStatement returnStatement = treeMaker.Return(treeMaker.Ident(fieldNode.getName()));
-		
-		JCBlock methodBody = treeMaker.Block(0, List.of(returnStatement));
-		Name methodName = field.toName(toGetterName(fieldNode));
-		JCExpression methodType = fieldNode.type != null ? treeMaker.Type(fieldNode.type) : fieldNode.vartype;
-		
-		List<JCTypeParameter> methodGenericParams = List.nil();
-		List<JCVariableDecl> parameters = List.nil();
-		List<JCExpression> throwsClauses = List.nil();
-		JCExpression annotationMethodDefaultValue = null;
-		
-		List<JCAnnotation> nonNulls = findAnnotations(field, TransformationsUtil.NON_NULL_PATTERN);
-		List<JCAnnotation> nullables = findAnnotations(field, TransformationsUtil.NULLABLE_PATTERN);
-		return treeMaker.MethodDef(treeMaker.Modifiers(access, nonNulls.appendList(nullables)), methodName, methodType,
-				methodGenericParams, parameters, throwsClauses, methodBody, annotationMethodDefaultValue);
-	}
-}
diff --git a/src/lombok/javac/handlers/HandlePrintAST.java b/src/lombok/javac/handlers/HandlePrintAST.java
deleted file mode 100644
index 4c25694b..00000000
--- a/src/lombok/javac/handlers/HandlePrintAST.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.javac.handlers;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.PrintStream;
-
-import org.mangosdk.spi.ProviderFor;
-
-import com.sun.tools.javac.tree.JCTree.JCAnnotation;
-
-import lombok.Lombok;
-import lombok.core.AnnotationValues;
-import lombok.core.PrintAST;
-import lombok.javac.JavacASTVisitor;
-import lombok.javac.JavacAnnotationHandler;
-import lombok.javac.JavacNode;
-
-/**
- * Handles the {@code lombok.core.PrintAST} annotation for javac.
- */
-@ProviderFor(JavacAnnotationHandler.class)
-public class HandlePrintAST implements JavacAnnotationHandler<PrintAST> {
-	@Override public boolean handle(AnnotationValues<PrintAST> annotation, JCAnnotation ast, JavacNode annotationNode) {
-		PrintStream stream = System.out;
-		String fileName = annotation.getInstance().outfile();
-		if (fileName.length() > 0) try {
-			stream = new PrintStream(new File(fileName));
-		} catch (FileNotFoundException e) {
-			Lombok.sneakyThrow(e);
-		}
-		
-		annotationNode.up().traverse(new JavacASTVisitor.Printer(annotation.getInstance().printContent(), stream));
-		
-		return true;
-	}
-}
diff --git a/src/lombok/javac/handlers/HandleSetter.java b/src/lombok/javac/handlers/HandleSetter.java
deleted file mode 100644
index 84032e9c..00000000
--- a/src/lombok/javac/handlers/HandleSetter.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.javac.handlers;
-
-import static lombok.javac.handlers.JavacHandlerUtil.*;
-import lombok.AccessLevel;
-import lombok.Setter;
-import lombok.core.AnnotationValues;
-import lombok.core.TransformationsUtil;
-import lombok.core.AST.Kind;
-import lombok.javac.Javac;
-import lombok.javac.JavacAnnotationHandler;
-import lombok.javac.JavacNode;
-
-import org.mangosdk.spi.ProviderFor;
-
-import com.sun.tools.javac.code.Flags;
-import com.sun.tools.javac.tree.TreeMaker;
-import com.sun.tools.javac.tree.JCTree.JCAnnotation;
-import com.sun.tools.javac.tree.JCTree.JCAssign;
-import com.sun.tools.javac.tree.JCTree.JCBlock;
-import com.sun.tools.javac.tree.JCTree.JCExpression;
-import com.sun.tools.javac.tree.JCTree.JCFieldAccess;
-import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
-import com.sun.tools.javac.tree.JCTree.JCStatement;
-import com.sun.tools.javac.tree.JCTree.JCTypeParameter;
-import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
-import com.sun.tools.javac.util.List;
-import com.sun.tools.javac.util.Name;
-import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
-
-/**
- * Handles the {@code lombok.Setter} annotation for javac.
- */
-@ProviderFor(JavacAnnotationHandler.class)
-public class HandleSetter implements JavacAnnotationHandler<Setter> {
-	/**
-	 * Generates a setter on the stated field.
-	 * 
-	 * Used by {@link HandleData}.
-	 * 
-	 * The difference between this call and the handle method is as follows:
-	 * 
-	 * If there is a {@code lombok.Setter} annotation on the field, it is used and the
-	 * same rules apply (e.g. warning if the method already exists, stated access level applies).
-	 * If not, the setter is still generated if it isn't already there, though there will not
-	 * be a warning if its already there. The default access level is used.
-	 * 
-	 * @param fieldNode The node representing the field you want a setter for.
-	 * @param pos The node responsible for generating the setter (the {@code @Data} or {@code @Setter} annotation).
-	 */
-	public void generateSetterForField(JavacNode fieldNode, DiagnosticPosition pos) {
-		for (JavacNode child : fieldNode.down()) {
-			if (child.getKind() == Kind.ANNOTATION) {
-				if (Javac.annotationTypeMatches(Setter.class, child)) {
-					//The annotation will make it happen, so we can skip it.
-					return;
-				}
-			}
-		}
-		
-		createSetterForField(AccessLevel.PUBLIC, fieldNode, fieldNode, false);
-	}
-	
-	@Override public boolean handle(AnnotationValues<Setter> annotation, JCAnnotation ast, JavacNode annotationNode) {
-		JavacNode fieldNode = annotationNode.up();
-		AccessLevel level = annotation.getInstance().value();
-		if (level == AccessLevel.NONE) return true;
-		
-		return createSetterForField(level, fieldNode, annotationNode, true);
-	}
-	
-	private boolean createSetterForField(AccessLevel level,
-			JavacNode fieldNode, JavacNode errorNode, boolean whineIfExists) {
-		if (fieldNode.getKind() != Kind.FIELD) {
-			fieldNode.addError("@Setter is only supported on a field.");
-			return true;
-		}
-		
-		JCVariableDecl fieldDecl = (JCVariableDecl)fieldNode.get();
-		String methodName = toSetterName(fieldDecl);
-		
-		switch (methodExists(methodName, fieldNode)) {
-		case EXISTS_BY_LOMBOK:
-			return true;
-		case EXISTS_BY_USER:
-			if (whineIfExists) errorNode.addWarning(
-					String.format("Not generating %s(%s %s): A method with that name already exists",
-					methodName, fieldDecl.vartype, fieldDecl.name));
-			return true;
-		default:
-		case NOT_EXISTS:
-			//continue with creating the setter
-		}
-		
-		long access = toJavacModifier(level) | (fieldDecl.mods.flags & Flags.STATIC);
-		
-		injectMethod(fieldNode.up(), createSetter(access, fieldNode, fieldNode.getTreeMaker()));
-		
-		return true;
-	}
-	
-	private JCMethodDecl createSetter(long access, JavacNode field, TreeMaker treeMaker) {
-		JCVariableDecl fieldDecl = (JCVariableDecl) field.get();
-		
-		JCFieldAccess thisX = treeMaker.Select(treeMaker.Ident(field.toName("this")), fieldDecl.name);
-		JCAssign assign = treeMaker.Assign(thisX, treeMaker.Ident(fieldDecl.name));
-		
-		List<JCStatement> statements;
-		List<JCAnnotation> nonNulls = findAnnotations(field, TransformationsUtil.NON_NULL_PATTERN);
-		List<JCAnnotation> nullables = findAnnotations(field, TransformationsUtil.NULLABLE_PATTERN);
-		
-		if (nonNulls.isEmpty()) {
-			statements = List.<JCStatement>of(treeMaker.Exec(assign));
-		} else {
-			JCStatement nullCheck = generateNullCheck(treeMaker, field);
-			if (nullCheck != null) statements = List.<JCStatement>of(nullCheck, treeMaker.Exec(assign));
-			else statements = List.<JCStatement>of(treeMaker.Exec(assign));
-		}
-		
-		JCBlock methodBody = treeMaker.Block(0, statements);
-		Name methodName = field.toName(toSetterName(fieldDecl));
-		JCVariableDecl param = treeMaker.VarDef(treeMaker.Modifiers(Flags.FINAL, nonNulls.appendList(nullables)), fieldDecl.name, fieldDecl.vartype, null);
-		JCExpression methodType = treeMaker.Type(field.getSymbolTable().voidType);
-		
-		List<JCTypeParameter> methodGenericParams = List.nil();
-		List<JCVariableDecl> parameters = List.of(param);
-		List<JCExpression> throwsClauses = List.nil();
-		JCExpression annotationMethodDefaultValue = null;
-		
-		return treeMaker.MethodDef(treeMaker.Modifiers(access, List.<JCAnnotation>nil()), methodName, methodType,
-				methodGenericParams, parameters, throwsClauses, methodBody, annotationMethodDefaultValue);
-	}
-}
diff --git a/src/lombok/javac/handlers/HandleSneakyThrows.java b/src/lombok/javac/handlers/HandleSneakyThrows.java
deleted file mode 100644
index e7879dd1..00000000
--- a/src/lombok/javac/handlers/HandleSneakyThrows.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.javac.handlers;
-
-import static lombok.javac.handlers.JavacHandlerUtil.chainDots;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import lombok.SneakyThrows;
-import lombok.core.AnnotationValues;
-import lombok.javac.JavacAnnotationHandler;
-import lombok.javac.JavacNode;
-
-import org.mangosdk.spi.ProviderFor;
-
-import com.sun.tools.javac.code.Flags;
-import com.sun.tools.javac.tree.TreeMaker;
-import com.sun.tools.javac.tree.JCTree.JCAnnotation;
-import com.sun.tools.javac.tree.JCTree.JCBlock;
-import com.sun.tools.javac.tree.JCTree.JCExpression;
-import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
-import com.sun.tools.javac.tree.JCTree.JCStatement;
-import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
-import com.sun.tools.javac.util.List;
-
-/**
- * Handles the {@code lombok.SneakyThrows} annotation for javac.
- */
-@ProviderFor(JavacAnnotationHandler.class)
-public class HandleSneakyThrows implements JavacAnnotationHandler<SneakyThrows> {
-	@Override public boolean handle(AnnotationValues<SneakyThrows> annotation, JCAnnotation ast, JavacNode annotationNode) {
-		Collection<String> exceptionNames = annotation.getRawExpressions("value");
-		
-		List<JCExpression> memberValuePairs = ast.getArguments();
-		if (memberValuePairs == null || memberValuePairs.size() == 0) return false;
-		
-		java.util.List<String> exceptions = new ArrayList<String>();
-		for (String exception : exceptionNames) {
-			if (exception.endsWith(".class")) exception = exception.substring(0, exception.length() - 6);
-			exceptions.add(exception);
-		}
-		
-		JavacNode owner = annotationNode.up();
-		switch (owner.getKind()) {
-		case METHOD:
-			return handleMethod(annotationNode, (JCMethodDecl)owner.get(), exceptions);
-		default:
-			annotationNode.addError("@SneakyThrows is legal only on methods and constructors.");
-			return true;
-		}
-	}
-	
-	private boolean handleMethod(JavacNode annotation, JCMethodDecl method, Collection<String> exceptions) {
-		JavacNode methodNode = annotation.up();
-		
-		if ( (method.mods.flags & Flags.ABSTRACT) != 0) {
-			annotation.addError("@SneakyThrows can only be used on concrete methods.");
-			return true;
-		}
-		
-		if (method.body == null) return false;
-		
-		List<JCStatement> contents = method.body.stats;
-		
-		for (String exception : exceptions) {
-			contents = List.of(buildTryCatchBlock(methodNode, contents, exception));
-		}
-		
-		method.body.stats = contents;
-		methodNode.rebuild();
-		
-		return true;
-	}
-
-	private JCStatement buildTryCatchBlock(JavacNode node, List<JCStatement> contents, String exception) {
-		TreeMaker maker = node.getTreeMaker();
-		
-		JCBlock tryBlock = maker.Block(0, contents);
-		
-		JCExpression varType = chainDots(maker, node, exception.split("\\."));
-		
-		JCVariableDecl catchParam = maker.VarDef(maker.Modifiers(0), node.toName("$ex"), varType, null);
-		JCExpression lombokLombokSneakyThrowNameRef = chainDots(maker, node, "lombok", "Lombok", "sneakyThrow");
-		JCBlock catchBody = maker.Block(0, List.<JCStatement>of(maker.Throw(maker.Apply(
-				List.<JCExpression>nil(), lombokLombokSneakyThrowNameRef,
-				List.<JCExpression>of(maker.Ident(node.toName("$ex")))))));
-		
-		return maker.Try(tryBlock, List.of(maker.Catch(catchParam, catchBody)), null);
-	}
-}
diff --git a/src/lombok/javac/handlers/HandleSynchronized.java b/src/lombok/javac/handlers/HandleSynchronized.java
deleted file mode 100644
index c86d99c6..00000000
--- a/src/lombok/javac/handlers/HandleSynchronized.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.javac.handlers;
-
-import static lombok.javac.handlers.JavacHandlerUtil.*;
-
-import org.mangosdk.spi.ProviderFor;
-
-import com.sun.tools.javac.code.Flags;
-import com.sun.tools.javac.code.TypeTags;
-import com.sun.tools.javac.tree.TreeMaker;
-import com.sun.tools.javac.tree.JCTree.JCAnnotation;
-import com.sun.tools.javac.tree.JCTree.JCExpression;
-import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
-import com.sun.tools.javac.tree.JCTree.JCNewArray;
-import com.sun.tools.javac.tree.JCTree.JCStatement;
-import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
-import com.sun.tools.javac.util.List;
-
-import lombok.Synchronized;
-import lombok.core.AnnotationValues;
-import lombok.core.AST.Kind;
-import lombok.javac.JavacAnnotationHandler;
-import lombok.javac.JavacNode;
-
-/**
- * Handles the {@code lombok.Synchronized} annotation for javac.
- */
-@ProviderFor(JavacAnnotationHandler.class)
-public class HandleSynchronized implements JavacAnnotationHandler<Synchronized> {
-	private static final String INSTANCE_LOCK_NAME = "$lock";
-	private static final String STATIC_LOCK_NAME = "$LOCK";
-	
-	@Override public boolean handle(AnnotationValues<Synchronized> annotation, JCAnnotation ast, JavacNode annotationNode) {
-		JavacNode methodNode = annotationNode.up();
-		
-		if (methodNode == null || methodNode.getKind() != Kind.METHOD || !(methodNode.get() instanceof JCMethodDecl)) {
-			annotationNode.addError("@Synchronized is legal only on methods.");
-			return true;
-		}
-		
-		JCMethodDecl method = (JCMethodDecl)methodNode.get();
-		
-		if ((method.mods.flags & Flags.ABSTRACT) != 0) {
-			annotationNode.addError("@Synchronized is legal only on concrete methods.");
-			return true;
-		}
-		boolean isStatic = (method.mods.flags & Flags.STATIC) != 0;
-		String lockName = annotation.getInstance().value();
-		boolean autoMake = false;
-		if (lockName.length() == 0) {
-			autoMake = true;
-			lockName = isStatic ? STATIC_LOCK_NAME : INSTANCE_LOCK_NAME;
-		}
-		
-		TreeMaker maker = methodNode.getTreeMaker();
-		
-		if (fieldExists(lockName, methodNode) == MemberExistsResult.NOT_EXISTS) {
-			if (!autoMake) {
-				annotationNode.addError("The field " + lockName + " does not exist.");
-				return true;
-			}
-			JCExpression objectType = chainDots(maker, methodNode, "java", "lang", "Object");
-			//We use 'new Object[0];' because quite unlike 'new Object();', empty arrays *ARE* serializable!
-			JCNewArray newObjectArray = maker.NewArray(chainDots(maker, methodNode, "java", "lang", "Object"),
-					List.<JCExpression>of(maker.Literal(TypeTags.INT, 0)), null);
-			JCVariableDecl fieldDecl = maker.VarDef(
-					maker.Modifiers(Flags.FINAL | (isStatic ? Flags.STATIC : 0)),
-					methodNode.toName(lockName), objectType, newObjectArray);
-			injectField(methodNode.up(), fieldDecl);
-		}
-		
-		if (method.body == null) return false;
-		
-		JCExpression lockNode = maker.Ident(methodNode.toName(lockName));
-		
-		method.body = maker.Block(0, List.<JCStatement>of(maker.Synchronized(lockNode, method.body)));
-		
-		methodNode.rebuild();
-		
-		return true;
-	}
-}
diff --git a/src/lombok/javac/handlers/HandleToString.java b/src/lombok/javac/handlers/HandleToString.java
deleted file mode 100644
index f7251ab8..00000000
--- a/src/lombok/javac/handlers/HandleToString.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.javac.handlers;
-
-import static lombok.javac.handlers.JavacHandlerUtil.*;
-
-import lombok.ToString;
-import lombok.core.AnnotationValues;
-import lombok.core.AST.Kind;
-import lombok.javac.Javac;
-import lombok.javac.JavacAnnotationHandler;
-import lombok.javac.JavacNode;
-
-import org.mangosdk.spi.ProviderFor;
-
-import com.sun.tools.javac.code.Flags;
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.tree.TreeMaker;
-import com.sun.tools.javac.tree.JCTree.JCAnnotation;
-import com.sun.tools.javac.tree.JCTree.JCArrayTypeTree;
-import com.sun.tools.javac.tree.JCTree.JCBlock;
-import com.sun.tools.javac.tree.JCTree.JCClassDecl;
-import com.sun.tools.javac.tree.JCTree.JCExpression;
-import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
-import com.sun.tools.javac.tree.JCTree.JCMethodInvocation;
-import com.sun.tools.javac.tree.JCTree.JCModifiers;
-import com.sun.tools.javac.tree.JCTree.JCPrimitiveTypeTree;
-import com.sun.tools.javac.tree.JCTree.JCStatement;
-import com.sun.tools.javac.tree.JCTree.JCTypeParameter;
-import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
-import com.sun.tools.javac.util.List;
-
-/**
- * Handles the {@code ToString} annotation for javac.
- */
-@ProviderFor(JavacAnnotationHandler.class)
-public class HandleToString implements JavacAnnotationHandler<ToString> {
-	private void checkForBogusFieldNames(JavacNode type, AnnotationValues<ToString> annotation) {
-		if (annotation.isExplicit("exclude")) {
-			for (int i : createListOfNonExistentFields(List.from(annotation.getInstance().exclude()), type, true, false)) {
-				annotation.setWarning("exclude", "This field does not exist, or would have been excluded anyway.", i);
-			}
-		}
-		if (annotation.isExplicit("of")) {
-			for (int i : createListOfNonExistentFields(List.from(annotation.getInstance().of()), type, false, false)) {
-				annotation.setWarning("of", "This field does not exist.", i);
-			}
-		}
-	}
-	
-	@Override public boolean handle(AnnotationValues<ToString> annotation, JCAnnotation ast, JavacNode annotationNode) {
-		ToString ann = annotation.getInstance();
-		List<String> excludes = List.from(ann.exclude());
-		List<String> includes = List.from(ann.of());
-		JavacNode typeNode = annotationNode.up();
-		
-		checkForBogusFieldNames(typeNode, annotation);
-		
-		Boolean callSuper = ann.callSuper();
-		
-		if (!annotation.isExplicit("callSuper")) callSuper = null;
-		if (!annotation.isExplicit("exclude")) excludes = null;
-		if (!annotation.isExplicit("of")) includes = null;
-		
-		if (excludes != null && includes != null) {
-			excludes = null;
-			annotation.setWarning("exclude", "exclude and of are mutually exclusive; the 'exclude' parameter will be ignored.");
-		}
-		
-		return generateToString(typeNode, annotationNode, excludes, includes, ann.includeFieldNames(), callSuper, true);
-	}
-	
-	public void generateToStringForType(JavacNode typeNode, JavacNode errorNode) {
-		for (JavacNode child : typeNode.down()) {
-			if (child.getKind() == Kind.ANNOTATION) {
-				if (Javac.annotationTypeMatches(ToString.class, child)) {
-					//The annotation will make it happen, so we can skip it.
-					return;
-				}
-			}
-		}
-		
-		boolean includeFieldNames = true;
-		try {
-			includeFieldNames = ((Boolean)ToString.class.getMethod("includeFieldNames").getDefaultValue()).booleanValue();
-		} catch (Exception ignore) {}
-		generateToString(typeNode, errorNode, null, null, includeFieldNames, null, false);
-	}
-	
-	private boolean generateToString(JavacNode typeNode, JavacNode errorNode, List<String> excludes, List<String> includes,
-			boolean includeFieldNames, Boolean callSuper, boolean whineIfExists) {
-		boolean notAClass = true;
-		if (typeNode.get() instanceof JCClassDecl) {
-			long flags = ((JCClassDecl)typeNode.get()).mods.flags;
-			notAClass = (flags & (Flags.INTERFACE | Flags.ANNOTATION | Flags.ENUM)) != 0;
-		}
-		
-		if (callSuper == null) {
-			try {
-				callSuper = ((Boolean)ToString.class.getMethod("callSuper").getDefaultValue()).booleanValue();
-			} catch (Exception ignore) {}
-		}
-		
-		if (notAClass) {
-			errorNode.addError("@ToString is only supported on a class.");
-			return false;
-		}
-		
-		List<JavacNode> nodesForToString = List.nil();
-		if (includes != null) {
-			for (JavacNode child : typeNode.down()) {
-				if (child.getKind() != Kind.FIELD) continue;
-				JCVariableDecl fieldDecl = (JCVariableDecl) child.get();
-				if (includes.contains(fieldDecl.name.toString())) nodesForToString = nodesForToString.append(child);
-			}
-		} else {
-			for (JavacNode child : typeNode.down()) {
-				if (child.getKind() != Kind.FIELD) continue;
-				JCVariableDecl fieldDecl = (JCVariableDecl) child.get();
-				//Skip static fields.
-				if ((fieldDecl.mods.flags & Flags.STATIC) != 0) continue;
-				//Skip excluded fields.
-				if (excludes != null && excludes.contains(fieldDecl.name.toString())) continue;
-				//Skip fields that start with $.
-				if (fieldDecl.name.toString().startsWith("$")) continue;
-				nodesForToString = nodesForToString.append(child);
-			}
-		}
-		
-		switch (methodExists("toString", typeNode)) {
-		case NOT_EXISTS:
-			JCMethodDecl method = createToString(typeNode, nodesForToString, includeFieldNames, callSuper);
-			injectMethod(typeNode, method);
-			return true;
-		case EXISTS_BY_LOMBOK:
-			return true;
-		default:
-		case EXISTS_BY_USER:
-			if (whineIfExists) {
-				errorNode.addWarning("Not generating toString(): A method with that name already exists");
-			}
-			return true;
-		}
-
-	}
-	
-	private JCMethodDecl createToString(JavacNode typeNode, List<JavacNode> fields, boolean includeFieldNames, boolean callSuper) {
-		TreeMaker maker = typeNode.getTreeMaker();
-		
-		JCAnnotation overrideAnnotation = maker.Annotation(chainDots(maker, typeNode, "java", "lang", "Override"), List.<JCExpression>nil());
-		JCModifiers mods = maker.Modifiers(Flags.PUBLIC, List.of(overrideAnnotation));
-		JCExpression returnType = chainDots(maker, typeNode, "java", "lang", "String");
-		
-		boolean first = true;
-		
-		String typeName = ((JCClassDecl) typeNode.get()).name.toString();
-		String infix = ", ";
-		String suffix = ")";
-		String prefix;
-		if (callSuper) {
-			prefix = typeName + "(super=";
-		} else if (fields.isEmpty()) {
-			prefix = typeName + "()";
-		} else if (includeFieldNames) {
-			prefix = typeName + "(" + ((JCVariableDecl)fields.iterator().next().get()).name.toString() + "=";
-		} else {
-			prefix = typeName + "(";
-		}
-		
-		JCExpression current = maker.Literal(prefix);
-		
-		if (callSuper) {
-			JCMethodInvocation callToSuper = maker.Apply(List.<JCExpression>nil(),
-					maker.Select(maker.Ident(typeNode.toName("super")), typeNode.toName("toString")),
-					List.<JCExpression>nil());
-			current = maker.Binary(JCTree.PLUS, current, callToSuper);
-			first = false;
-		}
-		
-		for (JavacNode fieldNode : fields) {
-			JCVariableDecl field = (JCVariableDecl) fieldNode.get();
-			JCExpression expr;
-			
-			if (field.vartype instanceof JCArrayTypeTree) {
-				boolean multiDim = ((JCArrayTypeTree)field.vartype).elemtype instanceof JCArrayTypeTree;
-				boolean primitiveArray = ((JCArrayTypeTree)field.vartype).elemtype instanceof JCPrimitiveTypeTree;
-				boolean useDeepTS = multiDim || !primitiveArray;
-				
-				JCExpression hcMethod = chainDots(maker, typeNode, "java", "util", "Arrays", useDeepTS ? "deepToString" : "toString");
-				expr = maker.Apply(List.<JCExpression>nil(), hcMethod, List.<JCExpression>of(maker.Ident(field.name)));
-			} else expr = maker.Ident(field.name);
-			
-			if (first) {
-				current = maker.Binary(JCTree.PLUS, current, expr);
-				first = false;
-				continue;
-			}
-			
-			if (includeFieldNames) {
-				current = maker.Binary(JCTree.PLUS, current, maker.Literal(infix + fieldNode.getName() + "="));
-			} else {
-				current = maker.Binary(JCTree.PLUS, current, maker.Literal(infix));
-			}
-			
-			current = maker.Binary(JCTree.PLUS, current, expr);
-		}
-		
-		if (!first) current = maker.Binary(JCTree.PLUS, current, maker.Literal(suffix));
-		
-		JCStatement returnStatement = maker.Return(current);
-		
-		JCBlock body = maker.Block(0, List.of(returnStatement));
-		
-		return maker.MethodDef(mods, typeNode.toName("toString"), returnType,
-				List.<JCTypeParameter>nil(), List.<JCVariableDecl>nil(), List.<JCExpression>nil(), body, null);
-	}
-	
-}
diff --git a/src/lombok/javac/handlers/JavacHandlerUtil.java b/src/lombok/javac/handlers/JavacHandlerUtil.java
deleted file mode 100644
index 34d8b849..00000000
--- a/src/lombok/javac/handlers/JavacHandlerUtil.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.javac.handlers;
-
-import java.util.regex.Pattern;
-
-import lombok.AccessLevel;
-import lombok.core.TransformationsUtil;
-import lombok.core.AST.Kind;
-import lombok.javac.JavacNode;
-
-import com.sun.tools.javac.code.Flags;
-import com.sun.tools.javac.code.TypeTags;
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.tree.TreeMaker;
-import com.sun.tools.javac.tree.JCTree.JCAnnotation;
-import com.sun.tools.javac.tree.JCTree.JCClassDecl;
-import com.sun.tools.javac.tree.JCTree.JCExpression;
-import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
-import com.sun.tools.javac.tree.JCTree.JCStatement;
-import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
-import com.sun.tools.javac.util.List;
-import com.sun.tools.javac.util.Name;
-
-/**
- * Container for static utility methods useful to handlers written for javac.
- */
-public class JavacHandlerUtil {
-	private JavacHandlerUtil() {
-		//Prevent instantiation
-	}
-	
-	/**
-	 * Checks if the given expression (that really ought to refer to a type expression) represents a primitive type.
-	 */
-	public static boolean isPrimitive(JCExpression ref) {
-		String typeName = ref.toString();
-		return TransformationsUtil.PRIMITIVE_TYPE_NAME_PATTERN.matcher(typeName).matches();
-	}
-	
-	/**
-	 * Translates the given field into all possible getter names.
-	 * Convenient wrapper around {@link TransformationsUtil#toAllGetterNames(CharSequence, boolean)}.
-	 */
-	public static java.util.List<String> toAllGetterNames(JCVariableDecl field) {
-		CharSequence fieldName = field.name;
-		
-		boolean isBoolean = field.vartype.toString().equals("boolean");
-		
-		return TransformationsUtil.toAllGetterNames(fieldName, isBoolean);
-	}
-	
-	/**
-	 * @return the likely getter name for the stated field. (e.g. private boolean foo; to isFoo).
-	 * 
-	 * Convenient wrapper around {@link TransformationsUtil#toGetterName(CharSequence, boolean)}.
-	 */
-	public static String toGetterName(JCVariableDecl field) {
-		CharSequence fieldName = field.name;
-		
-		boolean isBoolean = field.vartype.toString().equals("boolean");
-		
-		return TransformationsUtil.toGetterName(fieldName, isBoolean);
-	}
-	
-	/**
-	 * @return the likely setter name for the stated field. (e.g. private boolean foo; to setFoo).
-	 * 
-	 * Convenient wrapper around {@link TransformationsUtil#toSetterName(CharSequence)}.
-	 */
-	public static String toSetterName(JCVariableDecl field) {
-		CharSequence fieldName = field.name;
-		
-		return TransformationsUtil.toSetterName(fieldName);
-	}
-	
-	/** Serves as return value for the methods that check for the existence of fields and methods. */
-	public enum MemberExistsResult {
-		NOT_EXISTS, EXISTS_BY_USER, EXISTS_BY_LOMBOK;
-	}
-	
-	/**
-	 * Checks if there is a field with the provided name.
-	 * 
-	 * @param fieldName the field name to check for.
-	 * @param node Any node that represents the Type (JCClassDecl) to look in, or any child node thereof.
-	 */
-	public static MemberExistsResult fieldExists(String fieldName, JavacNode node) {
-		while (node != null && !(node.get() instanceof JCClassDecl)) {
-			node = node.up();
-		}
-		
-		if (node != null && node.get() instanceof JCClassDecl) {
-			for (JCTree def : ((JCClassDecl)node.get()).defs) {
-				if (def instanceof JCVariableDecl) {
-					if (((JCVariableDecl)def).name.contentEquals(fieldName)) {
-						JavacNode existing = node.getNodeFor(def);
-						if (existing == null || !existing.isHandled()) return MemberExistsResult.EXISTS_BY_USER;
-						return MemberExistsResult.EXISTS_BY_LOMBOK;
-					}
-				}
-			}
-		}
-		
-		return MemberExistsResult.NOT_EXISTS;
-	}
-	
-	/**
-	 * Checks if there is a method with the provided name. In case of multiple methods (overloading), only
-	 * the first method decides if EXISTS_BY_USER or EXISTS_BY_LOMBOK is returned.
-	 * 
-	 * @param methodName the method name to check for.
-	 * @param node Any node that represents the Type (JCClassDecl) to look in, or any child node thereof.
-	 */
-	public static MemberExistsResult methodExists(String methodName, JavacNode node) {
-		while (node != null && !(node.get() instanceof JCClassDecl)) {
-			node = node.up();
-		}
-		
-		if (node != null && node.get() instanceof JCClassDecl) {
-			for (JCTree def : ((JCClassDecl)node.get()).defs) {
-				if (def instanceof JCMethodDecl) {
-					if (((JCMethodDecl)def).name.contentEquals(methodName)) {
-						JavacNode existing = node.getNodeFor(def);
-						if (existing == null || !existing.isHandled()) return MemberExistsResult.EXISTS_BY_USER;
-						return MemberExistsResult.EXISTS_BY_LOMBOK;
-					}
-				}
-			}
-		}
-		
-		return MemberExistsResult.NOT_EXISTS;
-	}
-	
-	/**
-	 * Checks if there is a (non-default) constructor. In case of multiple constructors (overloading), only
-	 * the first constructor decides if EXISTS_BY_USER or EXISTS_BY_LOMBOK is returned.
-	 * 
-	 * @param node Any node that represents the Type (JCClassDecl) to look in, or any child node thereof.
-	 */
-	public static MemberExistsResult constructorExists(JavacNode node) {
-		while (node != null && !(node.get() instanceof JCClassDecl)) {
-			node = node.up();
-		}
-		
-		if (node != null && node.get() instanceof JCClassDecl) {
-			for (JCTree def : ((JCClassDecl)node.get()).defs) {
-				if (def instanceof JCMethodDecl) {
-					if (((JCMethodDecl)def).name.contentEquals("<init>")) {
-						if ((((JCMethodDecl)def).mods.flags & Flags.GENERATEDCONSTR) != 0) continue;
-						JavacNode existing = node.getNodeFor(def);
-						if (existing == null || !existing.isHandled()) return MemberExistsResult.EXISTS_BY_USER;
-						return MemberExistsResult.EXISTS_BY_LOMBOK;
-					}
-				}
-			}
-		}
-		
-		return MemberExistsResult.NOT_EXISTS;
-	}
-	
-	/**
-	 * Turns an {@code AccessLevel} instance into the flag bit used by javac.
-	 */
-	public static int toJavacModifier(AccessLevel accessLevel) {
-		switch (accessLevel) {
-		case MODULE:
-		case PACKAGE:
-			return 0;
-		default:
-		case PUBLIC:
-			return Flags.PUBLIC;
-		case PRIVATE:
-			return Flags.PRIVATE;
-		case PROTECTED:
-			return Flags.PROTECTED;
-		}
-	}
-	
-	/**
-	 * Adds the given new field declaration to the provided type AST Node.
-	 * 
-	 * Also takes care of updating the JavacAST.
-	 */
-	public static void injectField(JavacNode typeNode, JCVariableDecl field) {
-		JCClassDecl type = (JCClassDecl) typeNode.get();
-		
-		type.defs = type.defs.append(field);
-		
-		typeNode.add(field, Kind.FIELD).recursiveSetHandled();
-	}
-	
-	/**
-	 * Adds the given new method declaration to the provided type AST Node.
-	 * Can also inject constructors.
-	 * 
-	 * Also takes care of updating the JavacAST.
-	 */
-	public static void injectMethod(JavacNode typeNode, JCMethodDecl method) {
-		JCClassDecl type = (JCClassDecl) typeNode.get();
-		
-		if (method.getName().contentEquals("<init>")) {
-			//Scan for default constructor, and remove it.
-			int idx = 0;
-			for (JCTree def : type.defs) {
-				if (def instanceof JCMethodDecl) {
-					if ((((JCMethodDecl)def).mods.flags & Flags.GENERATEDCONSTR) != 0) {
-						JavacNode tossMe = typeNode.getNodeFor(def);
-						if (tossMe != null) tossMe.up().removeChild(tossMe);
-						type.defs = addAllButOne(type.defs, idx);
-						break;
-					}
-				}
-				idx++;
-			}
-		}
-		
-		type.defs = type.defs.append(method);
-		
-		typeNode.add(method, Kind.METHOD).recursiveSetHandled();
-	}
-	
-	private static List<JCTree> addAllButOne(List<JCTree> defs, int idx) {
-		List<JCTree> out = List.nil();
-		int i = 0;
-		for (JCTree def : defs) {
-			if (i++ != idx) out = out.append(def);
-		}
-		return out;
-	}
-	
-	/**
-	 * In javac, dotted access of any kind, from {@code java.lang.String} to {@code var.methodName}
-	 * is represented by a fold-left of {@code Select} nodes with the leftmost string represented by
-	 * a {@code Ident} node. This method generates such an expression.
-	 * 
-	 * For example, maker.Select(maker.Select(maker.Ident(NAME[java]), NAME[lang]), NAME[String]).
-	 * 
-	 * @see com.sun.tools.javac.tree.JCTree.JCIdent
-	 * @see com.sun.tools.javac.tree.JCTree.JCFieldAccess
-	 */
-	public static JCExpression chainDots(TreeMaker maker, JavacNode node, String... elems) {
-		assert elems != null;
-		assert elems.length > 0;
-		
-		JCExpression e = maker.Ident(node.toName(elems[0]));
-		for (int i = 1 ; i < elems.length ; i++) {
-			e = maker.Select(e, node.toName(elems[i]));
-		}
-		
-		return e;
-	}
-	
-	/**
-	 * Searches the given field node for annotations and returns each one that matches the provided regular expression pattern.
-	 * 
-	 * Only the simple name is checked - the package and any containing class are ignored.
-	 */
-	public static List<JCAnnotation> findAnnotations(JavacNode fieldNode, Pattern namePattern) {
-		List<JCAnnotation> result = List.nil();
-		for (JavacNode child : fieldNode.down()) {
-			if (child.getKind() == Kind.ANNOTATION) {
-				JCAnnotation annotation = (JCAnnotation) child.get();
-				String name = annotation.annotationType.toString();
-				int idx = name.lastIndexOf(".");
-				String suspect = idx == -1 ? name : name.substring(idx + 1);
-				if (namePattern.matcher(suspect).matches()) {
-					result = result.append(annotation);
-				}
-			}
-		}	
-		return result;
-	}
-	
-	/**
-	 * Generates a new statement that checks if the given variable is null, and if so, throws a {@code NullPointerException} with the
-	 * variable name as message.
-	 */
-	public static JCStatement generateNullCheck(TreeMaker treeMaker, JavacNode variable) {
-		JCVariableDecl varDecl = (JCVariableDecl) variable.get();
-		if (isPrimitive(varDecl.vartype)) return null;
-		Name fieldName = varDecl.name;
-		JCExpression npe = chainDots(treeMaker, variable, "java", "lang", "NullPointerException");
-		JCTree exception = treeMaker.NewClass(null, List.<JCExpression>nil(), npe, List.<JCExpression>of(treeMaker.Literal(fieldName.toString())), null);
-		JCStatement throwStatement = treeMaker.Throw(exception);
-		return treeMaker.If(treeMaker.Binary(JCTree.EQ, treeMaker.Ident(fieldName), treeMaker.Literal(TypeTags.BOT, null)), throwStatement, null);
-	}
-	
-	/**
-	 * Given a list of field names and a node referring to a type, finds each name in the list that does not match a field within the type.
-	 */
-	public static List<Integer> createListOfNonExistentFields(List<String> list, JavacNode type, boolean excludeStandard, boolean excludeTransient) {
-		boolean[] matched = new boolean[list.size()];
-		
-		for (JavacNode child : type.down()) {
-			if (list.isEmpty()) break;
-			if (child.getKind() != Kind.FIELD) continue;
-			JCVariableDecl field = (JCVariableDecl)child.get();
-			if (excludeStandard) {
-				if ((field.mods.flags & Flags.STATIC) != 0) continue;
-				if (field.name.toString().startsWith("$")) continue;
-			}
-			if (excludeTransient && (field.mods.flags & Flags.TRANSIENT) != 0) continue;
-			
-			int idx = list.indexOf(child.getName());
-			if (idx > -1) matched[idx] = true;
-		}
-		
-		List<Integer> problematic = List.nil();
-		for (int i = 0 ; i < list.size() ; i++) {
-			if (!matched[i]) problematic = problematic.append(i);
-		}
-		
-		return problematic;
-	}
-}
diff --git a/src/lombok/javac/handlers/package-info.java b/src/lombok/javac/handlers/package-info.java
deleted file mode 100644
index b08d6af3..00000000
--- a/src/lombok/javac/handlers/package-info.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/**
- * Contains the classes that implement the transformations for all of lombok's various features on the javac v1.6 platform.
- */
-package lombok.javac.handlers;
diff --git a/src/lombok/javac/package-info.java b/src/lombok/javac/package-info.java
deleted file mode 100644
index 0df2f050..00000000
--- a/src/lombok/javac/package-info.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/**
- * Includes the javac v1.6-specific implementations of the lombok AST and annotation introspection support.
- */
-package lombok.javac;